Adding metadata

13 files changed, 8 insertions, 330 deletions

diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild
deleted file mode 100644
index fb178f374e64..000000000000
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Avalon Framework"
-HOMEPAGE="https://avalon.apache.org/"
-SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-CDEPEND="dev-java/avalon-logkit:2.0
-	dev-java/log4j:0"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/4.2.0-enum.patch )
-
-src_prepare() {
-	default
-	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
-
-	dodoc NOTICE.TXT
-	use doc && java-pkg_dojavadoc target/docs
-	use source && java-pkg_dosrc impl/src/java/*
-}
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild
index 2aced74c8361..306dcc7b36cd 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 CP_DEPEND="
 	dev-java/avalon-logkit:2.0
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild
index bb168ac6f9d8..ca7b6c624e4f 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Easy-to-use Java logging toolkit"
 HOMEPAGE="https://avalon.apache.org/closed.html"
 SRC_URI="https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-${PV}-src.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="2.0"
 
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
deleted file mode 100644
index 3a719687e700..000000000000
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-# NB: this project is dead and we should look into removing it from the tree.
-# Take a look at the homepage.
-DESCRIPTION="Easy-to-use Java logging toolkit"
-HOMEPAGE="https://avalon.apache.org/closed.html"
-SRC_URI="https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-${PV}-src.tar.gz"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="2.0"
-IUSE=""
-
-CDEPEND="
-	dev-java/log4j:0
-	java-virtuals/jms:0
-	dev-java/oracle-javamail:0
-	java-virtuals/servlet-api:3.0"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit:0
-	)"
-
-src_prepare() {
-	default
-	# Doesn't like 1.6 / 1.7 changes to JDBC
-	eapply "${FILESDIR}/${P}-java7.patch"
-
-	java-ant_ignore-system-classes
-
-	java-ant_xml-rewrite \
-		-f build.xml \
-		-c -e available \
-		-a classpathref \
-		-v 'build.classpath' || die
-
-	java-pkg_filter-compiler jikes
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="oracle-javamail,jms,log4j,servlet-api-3.0"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
deleted file mode 100644
index 4635bb99ffe2..000000000000
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-logging:commons-logging:1.2"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
-HOMEPAGE="https://commons.apache.org/logging/"
-SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="avalon-framework avalon-logkit log4j servletapi test"
-REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
-RESTRICT="!test? ( test ) !servletapi? ( test )"
-
-CDEPEND="
-	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
-	avalon-framework? ( dev-java/avalon-framework:4.2 )
-	log4j? ( dev-java/log4j:0 )
-	servletapi? ( dev-java/tomcat-servlet-api:4.0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src"
-
-EANT_BUILD_TARGET="compile"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
-
-DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	eapply "${FILESDIR}/${P}-servletapi.patch"
-
-	# bug #208098
-	echo "jdk.1.4.present=true" > build.properties || die
-
-	if use avalon-framework; then
-		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
-	fi
-	if use avalon-logkit; then
-		echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
-	fi
-	if use log4j; then
-		echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties || die
-	fi
-
-	if use servletapi; then
-		echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die
-	fi
-}
-
-src_install() {
-	local pkg=org.apache.commons.logging
-	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
-	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
-	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
-
-	einstalldocs
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/main/java/org
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
index 97e47eb67520..b3a0f8533760 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
diff --git a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
index 38274be97d07..5c35d1fb5ad7 100644
--- a/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
+++ b/dev-java/httpcomponents-client/httpcomponents-client-4.5.13-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: httpcomponents-client-${PV}/httpclient/pom.xml
diff --git a/dev-java/httpcore/httpcore-4.4.14.ebuild b/dev-java/httpcore/httpcore-4.4.14.ebuild
index 016fad82327b..ff51d1ba0fdb 100644
--- a/dev-java/httpcore/httpcore-4.4.14.ebuild
+++ b/dev-java/httpcore/httpcore-4.4.14.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: httpcore/pom.xml
diff --git a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
index ba2380ecc2b4..7208360988be 100644
--- a/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
+++ b/dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/jackrabbit/${PV}/jackrabbit-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/netty-common/netty-common-4.0.36-r1.ebuild b/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
deleted file mode 100644
index dadd4d4a6f1e..000000000000
--- a/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="https://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="test"
-
-# Same test failures as before the revbump still occur. See https://bugs.gentoo.org/827221
-RESTRICT="test"
-
-CDEPEND="dev-java/commons-logging:0
-	dev-java/javassist:3
-	dev-java/log4j:0
-	dev-java/slf4j-api:0"
-
-RDEPEND="virtual/jre:1.8
-	${CDEPEND}"
-
-# It does not build with java 11, https://bugs.gentoo.org/788364
-# src/main/java/io/netty/util/internal/Cleaner0.java:44: error: cannot find symbol
-#                Cleaner cleaner = (Cleaner) cleanerField.get(direct);
-#                ^
-#  symbol:   class Cleaner
-#  location: class Cleaner0
-DEPEND="virtual/jdk:1.8
-	${CDEPEND}
-	test? (
-		dev-java/asm:4
-		dev-java/cglib:3
-		dev-java/easymock:3.2
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-		dev-java/mockito:0
-		dev-java/objenesis:0
-		dev-java/slf4j-simple:0
-	)"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="commons-logging,javassist-3,log4j,slf4j-api"
-
-src_prepare() {
-	default
-	# Needs Mockito 1.10.
-	rm -v src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java || die
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},asm-4,cglib-3,easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito,objenesis,slf4j-simple)"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
index 8ce50e91dc26..3b2e51daa692 100644
--- a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="test"
 
 # Same test failures as before the revbumps still occur. See https://bugs.gentoo.org/827221
diff --git a/dev-java/netty-common/netty-common-4.0.36.ebuild b/dev-java/netty-common/netty-common-4.0.36.ebuild
deleted file mode 100644
index 6abc0507c74b..000000000000
--- a/dev-java/netty-common/netty-common-4.0.36.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 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-pkg-simple
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="https://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/commons-logging:0
-	dev-java/javassist:3
-	dev-java/log4j:0
-	dev-java/slf4j-api:0"
-
-RDEPEND=">=virtual/jre-1.7
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	test? (
-		dev-java/asm:4
-		dev-java/cglib:3
-		dev-java/easymock:3.2
-		dev-java/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-		dev-java/mockito:0
-		dev-java/objenesis:0
-		dev-java/slf4j-simple:0
-	)"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="commons-logging,javassist-3,log4j,slf4j-api"
-
-java_prepare() {
-	# Needs Mockito 1.10.
-	rm -v src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java || die
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},asm-4,cglib-3,easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito,objenesis,slf4j-simple)"
-	local TESTS=$(find * -name "*Test.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild b/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild
index 5e7e31472bdb..80b9d802bee5 100644
--- a/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild
+++ b/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"