commit:     03cff42061aa36175731effdd883f0a13d824a91
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Nov  7 17:04:19 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 10:06:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03cff420

dev-java/jsch-agent-proxy: style update, update EAPI 7 -> 8

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: 
https://github.com/gentoo/gentoo/pull/39233/commits/90e96eded00d5e2286ec0bbcf9c20e7a8974cb4e
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 ...0.9.ebuild => jsch-agent-proxy-0.0.9-r1.ebuild} | 35 +++++++++++-----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild 
b/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9-r1.ebuild
similarity index 73%
rename from dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild
rename to dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9-r1.ebuild
index 1f9a9d46adbc..ffeb3451e62a 100644
--- a/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild
+++ b/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9-r1.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom 
jsch-agent-proxy-12c3d64fc2b0a4fd37659369edfdee26e48954e2/jsch-agent-proxy-jsch/pom.xml
 --download-uri 
https://github.com/ymnk/jsch-agent-proxy/archive/12c3d64fc2b0a4fd37659369edfdee26e48954e2.tar.gz
 --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jsch-agent-proxy-0.0.9.ebuild
-
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="com.jcraft:jsch.agentproxy.jsch:0.0.9"
@@ -15,31 +12,32 @@ MY_COMMIT="12c3d64fc2b0a4fd37659369edfdee26e48954e2"
 DESCRIPTION="a proxy to ssh-agent and Pageant in Java"
 HOMEPAGE="http://www.jcraft.com/jsch-agent-proxy/";
 SRC_URI="https://github.com/ymnk/jsch-agent-proxy/archive/${MY_COMMIT}.tar.gz 
-> ${P}.tar.gz"
+S="${WORKDIR}/jsch-agent-proxy-${MY_COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc64"
 
-# Common dependencies
-# POM: ${PN}-12c3d64fc2b0a4fd37659369edfdee26e48954e2/${PN}-jsch/pom.xml
-# com.jcraft:jsch:0.1.49 -> >=dev-java/jsch-0.1.54:0
-# com.jcraft:jsch.agentproxy.core:0.0.9 -> 
>=dev-java/jsch-agentproxy-core-0.0.9:0
-
-CDEPEND="
+CP_DEPEND="
        dev-java/jna:4
        dev-java/jsch:0
 "
-DEPEND="${CDEPEND}
-       >=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-       >=virtual/jre-1.8:*"
 
-DOCS=( LICENSE.txt README README.md )
+DEPEND="
+       ${CP_DEPEND}
+       >=virtual/jdk-1.8:*
+"
 
-S="${WORKDIR}/jsch-agent-proxy-${MY_COMMIT}"
+RDEPEND="
+       ${CP_DEPEND}
+       >=virtual/jre-1.8:*
+"
+
+DOCS=( LICENSE.txt README README.md )
 
 JAVA_GENTOO_CLASSPATH="jna-4,jsch"
-JAVA_GENTOO_CLASSPATH_EXTRA="jsch-agentproxy-core.jar:jsch-agentproxy-pageant.jar:jsch-agentproxy-sshagent.jar:jsch-agentproxy-usocket-jna.jar:jsch-agentproxy-usocket-nc.jar"
+JAVA_GENTOO_CLASSPATH_EXTRA="jsch-agentproxy-core.jar:jsch-agentproxy-pageant.jar:jsch-agentproxy-sshagent.jar"
+JAVA_GENTOO_CLASSPATH_EXTRA+=":jsch-agentproxy-usocket-jna.jar:jsch-agentproxy-usocket-nc.jar"
 JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}"
 JAVADOC_SRC_DIRS=(
        "${PN}-core"
@@ -104,6 +102,7 @@ src_install() {
                java-pkg_dojavadoc target/api
        fi
        if use source; then
-               java-pkg_dosrc "${PN}-core" "${PN}-jsch" "${PN}-pageant" 
"${PN}-sshagent" "${PN}-usocket-jna" "${PN}-usocket-nc" 
"${PN}-connector-factory"
+               java-pkg_dosrc "${PN}-core" "${PN}-jsch" "${PN}-pageant" 
"${PN}-sshagent" "${PN}-usocket-jna" \
+                       "${PN}-usocket-nc" "${PN}-connector-factory"
        fi
 }

Reply via email to