Adding metadata

10 files changed, 19 insertions, 112 deletions

diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index abc027c836b5..b0b69200df87 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,4 +1,3 @@
-DIST asm-ASM_3_3_1.tar.gz 14406355 BLAKE2B 4f2634f1cefa3d7342682eba41ac035b0c2ad60457cd976ad194d9a3b728f0ea904ae4f35620116fa81e0095c40d7a30bd95f4f317a118b79fe2a80e1708f16a SHA512 24a48b5a84baeae64dbc587ca4acc2c9a37993a17e0651cdd4881e73567be79b87b50057fa4d0eb2ad5dcdd975566fddf426749ca560ce0453c444aacff3592e
 DIST asm-ASM_4_0.tar.gz 14789505 BLAKE2B 62b49d904f1ef2d32379f4f5d644cdc274b30f292ee4f64ad02be7d2226a90965f7b12421700e79dcd1e67a46e6a8543d5e353486a1577313616688ddc57f3b3 SHA512 e654623a882d9fe414e71861183f64840f7b6629231864872497d4bf9274e8ac05e05496593fa54a90d8c6a2e6d701b9a6f3876df611637f7d2079c5519def1e
 DIST asm-ASM_5_1.tar.gz 16258842 BLAKE2B bd7d717cdfa6ff652c96b88d7b7d33fae614acba390c256ea72ecfbb3edc48382621a076dedf9b8728fdb1d0961cda943f165f99de840824b766c9af45a49339 SHA512 4bb32ce6eba267928261238f8f13cd2365ab374780039ad1df31698cd791645a370aca58c44270ec05f8377d6aa0a0d00f9f3890961cbd32a10cbd2e79e2d518
 DIST asm-ASM_6_2_1.tar.gz 1509237 BLAKE2B fb287ff5346b2fd0a016e7744d44387d2973f89c4d1cfe7b46b864019a56443e71ea0a847940f49db2a2b359651297b65feca236cb1c847e0a9217117f9300b9 SHA512 93e2e4c386b5ae8f459830cf708d62bf96aa35353e93ae9c07005467afc684596281ecc32e4a9441aa9787731c0e8f8967ec9c797c4392f80ee3e828f5c39cff
diff --git a/dev-java/asm/asm-3.3.1-r2.ebuild b/dev-java/asm/asm-3.3.1-r2.ebuild
deleted file mode 100644
index f5b828c6d603..000000000000
--- a/dev-java/asm/asm-3.3.1-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_ANT_TASKS="ant-owanttask"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="https://asm.ow2.io"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 ppc64 x86 ~sparc-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/asm-${MY_P}"
-
-# Needs deps we don't have yet
-RESTRICT="test"
-
-EANT_DOC_TARGET="jdoc"
-
-# Fails if this property is not set
-EANT_EXTRA_ARGS="-Dobjectweb.ant.tasks.path=foobar"
-
-src_install() {
-	for x in output/dist/lib/*.jar ; do
-		java-pkg_newjar ${x} $(basename ${x/-${PV}})
-	done
-	use doc && java-pkg_dojavadoc output/dist/doc/javadoc/user/
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index 1675c6b2b47f..4766781ae621 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -1,2 +1 @@
-DIST avalon-framework-4.1.5.src.tar.gz 99475 BLAKE2B c57c89661042137dd0f5b8d6fe4295030a861499b300d84a8c2dc6364d6bdca443cda96e954816da0351fda3d3ce70d47734656949bffba8d823f7e1c9f4ead9 SHA512 7a15dc2f7c691d7daaa5cbb589eb21e23ef8d6232b5bd1b6b3bb1d6962f4a4dd2dff0c0a1793309d7e8f3aaf4e75de65a9705431e1103c2e33c575770131471b
 DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
deleted file mode 100644
index 55985d937eb6..000000000000
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Avalon Framework"
-HOMEPAGE="http://avalon.apache.org/"
-SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}.src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux"
-IUSE=""
-
-CDEPEND="dev-java/avalon-logkit:2.0
-	dev-java/log4j:0"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	cp "${FILESDIR}"/build.xml ./build.xml || die "couldn't copy build.xml"
-	local libs="log4j,avalon-logkit-2.0"
-	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/dist/avalon-framework.jar
-
-	use doc && java-pkg_dojavadoc "${S}"/target/docs
-	use source && java-pkg_dosrc impl/src/java/*
-}
diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
index b127e357b051..99b8239fa929 100644
--- a/dev-java/commons-collections/commons-collections-3.2.2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index 209897ce3f33..69c582fbdfe1 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,3 +1,2 @@
 DIST commons-net-3.2-src.tar.gz 378351 BLAKE2B f40ad73ef7d9865cdbe9da94a458f0c9ce636b0b71dcab3b48b52716aa141de3215581b75b9283d4d918ad0dbbd2761c9b0d9eee1703a2bbc545718c129511d5 SHA512 2152b0c524320702c336b21308bb8166e00487938430b83e08d65b836ab775c372c9251957c674e0bccff6815fc3ed3bdb7113a0d2a140c53f64c2f557eef2ba
-DIST commons-net-3.6.jar 435798 BLAKE2B a8c28909715d76469ad4760ece6f7b3515c56badf8ce19fcadb5b776e0cf341b3f970689a22267d19f22dc12fc8d5e2a071347df1850f290231747d0712263b7 SHA512 50006ebef259c9d4f514bfd4e6b4578f8867e2a105edfcf30542a039e385a02e9c48dfeee0b287c39c375e1418817290713f7d0792b357267723a977a07062c5
 DIST commons-net-3.8.0.jar 437325 BLAKE2B 92bdbf2f95cc54f6a791a9de0a56878fe12b6d956d47a4116ae21df35f3dcc4d7b10f5c03c081fc7012a06416f5f9f6555060784bfe22ec9c8d70b17ee7ea215 SHA512 a16ed8c2966541cc052fe963338efcc6f9c42ccd6fefe246547e66d9f46c35cf42bc6d13cb983a1829a378ebd7a676bcb812acbc3aa0ed30e6fa206748dae620
diff --git a/dev-java/commons-net/commons-net-3.6-r1.ebuild b/dev-java/commons-net/commons-net-3.6-r1.ebuild
deleted file mode 100644
index c3f63eea666f..000000000000
--- a/dev-java/commons-net/commons-net-3.6-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${P}-sources"
-
-DESCRIPTION="Client-oriented Java library to implement many Internet protocols"
-HOMEPAGE="https://commons.apache.org/net/"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ini4j/ini4j-0.5.2.ebuild b/dev-java/ini4j/ini4j-0.5.2.ebuild
index 326469e272bd..4b16b11ca777 100644
--- a/dev-java/ini4j/ini4j-0.5.2.ebuild
+++ b/dev-java/ini4j/ini4j-0.5.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
-inherit epatch java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Simple Java API Windows style .ini file handling"
 HOMEPAGE="https://sourceforge.net/projects/ini4j/"
@@ -21,7 +21,12 @@ RDEPEND="
 DEPEND="
 	>=virtual/jdk-1.6"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-remove.patch
+)
+
 src_prepare() {
 	default
-	epatch "${FILESDIR}"/"${P}-remove.patch"
+
+	java-pkg-2_src_prepare
 }
diff --git a/dev-java/joni/joni-2.1.0.ebuild b/dev-java/joni/joni-2.1.0-r1.ebuild
index 3b88d67b34f0..cf7f00117692 100644
--- a/dev-java/joni/joni-2.1.0.ebuild
+++ b/dev-java/joni/joni-2.1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="source"
 
@@ -15,20 +15,20 @@ LICENSE="MIT"
 SLOT="2.1"
 KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
-CDEPEND="dev-java/asm:3
+CDEPEND="dev-java/asm:9
 	dev-java/jcodings:1"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.8:*"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
+	>=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${PN}-${PN}-${PV}"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_BUILD_TARGET="build"
-EANT_GENTOO_CLASSPATH="asm-3 jcodings-1"
+EANT_GENTOO_CLASSPATH="asm-9 jcodings-1"
 
 src_install() {
 	java-pkg_dojar target/${PN}.jar
diff --git a/dev-java/xerces/xerces-2.12.0.ebuild b/dev-java/xerces/xerces-2.12.0.ebuild
index f69990046251..638b1ea00e7f 100644
--- a/dev-java/xerces/xerces-2.12.0.ebuild
+++ b/dev-java/xerces/xerces-2.12.0.ebuild
@@ -41,8 +41,12 @@ JAVA_GENTOO_CLASSPATH="
 
 S="${WORKDIR}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-overrides.patch"
+)
+
 src_prepare() {
 	default
 
-	epatch "${FILESDIR}/${P}-overrides.patch"
+	java-pkg-2_src_prepare
 }