Adding metadata

10 files changed, 4 insertions, 200 deletions

diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
index 23bc227e0ef0..aeac8c929ed5 100644
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://icedtea.classpath.org/download/source/${P}.tar.xz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 IUSE="+doc"
 
diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index 1a1afc9212b3..ec7396f362e7 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1,2 +1 @@
-DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
 DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild
deleted file mode 100644
index bf1ff2d20242..000000000000
--- a/dev-java/slf4j-api/slf4j-api-1.7.32.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.32.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-api-1.7.32.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-api:1.7.32"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The slf4j API"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-BDEPEND="app-arch/zip"
-
-DOCS=( LICENSE.txt ../README.md )
-
-S="${WORKDIR}/slf4j-v_${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-JAVA_TEST_EXCLUDES=(
-	# java.lang.InstantiationException - not run by upstream anyway
-	"org.slf4j.helpers.MultithreadedInitializationTest"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	# remove org/slf4j/impl/ from the jar file
-	zip -d ${PN}.jar org/slf4j/impl/\* || die "Failed to remove impl files"
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest
index 1a1afc9212b3..ec7396f362e7 100644
--- a/dev-java/slf4j-nop/Manifest
+++ b/dev-java/slf4j-nop/Manifest
@@ -1,2 +1 @@
-DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
 DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild
deleted file mode 100644
index db043c55fe30..000000000000
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.32.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.32.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-nop-1.7.32.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-nop:1.7.32"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SLF4J NOP Binding"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0
-
-CP_DEPEND="
-	~dev-java/slf4j-api-${PV}:0
-"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( LICENSE.txt ../README.md )
-
-S="${WORKDIR}/slf4j-v_${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest
index 1a1afc9212b3..ec7396f362e7 100644
--- a/dev-java/slf4j-simple/Manifest
+++ b/dev-java/slf4j-simple/Manifest
@@ -1,2 +1 @@
-DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
 DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild
deleted file mode 100644
index a98ef1a0d287..000000000000
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.32.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/refs/tags/v_1.7.32.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-simple-1.7.32.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.slf4j:slf4j-simple:1.7.32"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="SLF4J Simple binding"
-HOMEPAGE="https://www.slf4j.org"
-SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0
-
-CP_DEPEND="
-	~dev-java/slf4j-api-${PV}:0
-"
-
-# Compile dependencies
-# POM: slf4j-v_${PV}/${PN}/pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
-# test? org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		~dev-java/slf4j-api-${PV}:0
-	)"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( LICENSE.txt ../README.md )
-
-S="${WORKDIR}/slf4j-v_${PV}/${PN}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	# java.lang.InstantiationException
-	"org.slf4j.helpers.MultithreadedInitializationTest"
-
-	# java.lang.AssertionError: 1284 < 1263+16
-	"org.slf4j.helpers.SimpleLoggerMultithreadedInitializationTest"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-	cp "../slf4j-api/src/test/java/org/slf4j/helpers/MultithreadedInitializationTest.java" \
-		"${JAVA_TEST_SRC_DIR}/org/slf4j/helpers/" || die
-	cp "../slf4j-api/src/test/java/org/slf4j/LoggerAccessingThread.java" \
-		"${JAVA_TEST_SRC_DIR}/org/slf4j/" || die
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
index 8e150d3d2590..85932d9cf7d3 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild
index 9aed30f65a2e..e750432a83bb 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.77.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
index c53c20eb8511..7e30009f94dc 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"