Adding metadata

6 files changed, 46 insertions, 57 deletions

diff --git a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild b/dev-java/brotli-dec/brotli-dec-0.1.2-r1.ebuild
index b13aaba8aa9b..08422aa22fde 100644
--- a/dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
+++ b/dev-java/brotli-dec/brotli-dec-0.1.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="org.brotli:dec:${PV}"
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild
index 954a5e07b1ea..4dacae9bd323 100644
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -13,19 +13,18 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Library of matchers for building test expressions"
 HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
 SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x64-solaris"
 
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
 DEPEND="
 	>=virtual/jdk-1.8:*
-	source? ( app-arch/zip )"
+	source? ( app-arch/zip )
+"
 
-S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
+RDEPEND=">=virtual/jre-1.8:*"
 
 JAVA_SRC_DIR="${PN}/src"
 
@@ -35,6 +34,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	default
+	default #780585
+	java-pkg-2_src_prepare
 	java-pkg_clean
 }
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r6.ebuild
index 02739db122db..c693ee8dc78d 100644
--- a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r6.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source examples"
 MAVEN_ID="oro:oro:2.0.8"
 
 inherit java-pkg-2 java-pkg-simple
 
-MY_J=${PN%%-*}
-MY_O=${PN##*-}
-
 DESCRIPTION="A set of text-processing Java classes"
 HOMEPAGE="https://jakarta.apache.org/oro/"
-SRC_URI="https://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
+SRC_URI="https://archive.apache.org/dist/jakarta/oro/source/jakarta-oro-${PV}.tar.gz"
+S="${WORKDIR}/${P}"
 
 LICENSE="Apache-1.1"
 SLOT="2.0"
@@ -22,12 +20,11 @@ KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-s
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
-S="${WORKDIR}/${P}"
-
 JAVA_SRC_DIR="src"
 
 src_prepare() {
-	default
+	default #780585
+	java-pkg-2_src_prepare
 	java-pkg_clean
 	mv src/java/examples examples || die
 }
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
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
 }
diff --git a/dev-java/jzlib/jzlib-1.1.3-r2.ebuild b/dev-java/jzlib/jzlib-1.1.3-r3.ebuild
index eabbd3f4d542..1984d1245054 100644
--- a/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="examples source test"
 MAVEN_ID="com.jcraft:jzlib:1.1.3"
@@ -11,28 +11,20 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="JZlib is a re-implementation of zlib in pure Java"
 HOMEPAGE="http://www.jcraft.com/jzlib/"
 SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
-RDEPEND="
-	>=virtual/jre-1.8:*"
-DEPEND="
-	>=virtual/jdk-1.8:*"
-#	test? (
-#		dev-lang/scala
-#		dev-java/junit:4 )"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 # Restrict test due to missing keywords for scala
 RESTRICT="test"
 
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
+DOCS=( README ChangeLog )
 
-src_prepare() {
-	default
-	rm pom.xml || die
-}
+JAVA_SRC_DIR="src/main/java"
 
 src_test() {
 	local CP TESTS
@@ -46,6 +38,5 @@ src_test() {
 
 src_install() {
 	java-pkg-simple_src_install
-	dodoc README ChangeLog
 	use examples && java-pkg_doexamples example
 }
diff --git a/dev-java/swingx/swingx-1.6.4-r1.ebuild b/dev-java/swingx/swingx-1.6.4-r2.ebuild
index 6a6c4b071f66..a769957a8545 100644
--- a/dev-java/swingx/swingx-1.6.4-r1.ebuild
+++ b/dev-java/swingx/swingx-1.6.4-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -16,12 +16,14 @@ LICENSE="LGPL-2.1"
 SLOT="1.6"
 KEYWORDS="~amd64"
 
-CDEPEND="dev-java/metainf-services:0"
+CP_DEPEND="dev-java/metainf-services:0"
 
-RDEPEND="virtual/jre:1.8
-	${CDEPEND}"
+DEPEND="
+	${CP_DEPEND}
+	virtual/jdk:1.8
+"
 
-DEPEND="virtual/jdk:1.8
-	${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="metainf-services"
+RDEPEND="
+	${CP_DEPEND}
+	virtual/jre:1.8
+"