Adding metadata

13 files changed, 3 insertions, 143 deletions

diff --git a/dev-java/asm-analysis/Manifest b/dev-java/asm-analysis/Manifest
index b2db0a2a834f..20184b840f68 100644
--- a/dev-java/asm-analysis/Manifest
+++ b/dev-java/asm-analysis/Manifest
@@ -1,2 +1 @@
-DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
 DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
diff --git a/dev-java/asm-analysis/asm-analysis-9.1.ebuild b/dev-java/asm-analysis/asm-analysis-9.1.ebuild
deleted file mode 100644
index 4fbdb6554d9e..000000000000
--- a/dev-java/asm-analysis/asm-analysis-9.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.ow2.asm:asm-analysis:9.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Static code analysis API)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-tree:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-commons/Manifest b/dev-java/asm-commons/Manifest
index b2db0a2a834f..20184b840f68 100644
--- a/dev-java/asm-commons/Manifest
+++ b/dev-java/asm-commons/Manifest
@@ -1,2 +1 @@
-DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
 DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
diff --git a/dev-java/asm-commons/asm-commons-9.1.ebuild b/dev-java/asm-commons/asm-commons-9.1.ebuild
deleted file mode 100644
index 66b8a6ec335e..000000000000
--- a/dev-java/asm-commons/asm-commons-9.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.ow2.asm:asm-commons:9.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Common class adaptors)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-tree/Manifest b/dev-java/asm-tree/Manifest
index b2db0a2a834f..20184b840f68 100644
--- a/dev-java/asm-tree/Manifest
+++ b/dev-java/asm-tree/Manifest
@@ -1,2 +1 @@
-DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
 DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
diff --git a/dev-java/asm-tree/asm-tree-9.1.ebuild b/dev-java/asm-tree/asm-tree-9.1.ebuild
deleted file mode 100644
index 01e3400a43ae..000000000000
--- a/dev-java/asm-tree/asm-tree-9.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.ow2.asm:asm-tree:9.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Tree API)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-util/Manifest b/dev-java/asm-util/Manifest
index b2db0a2a834f..20184b840f68 100644
--- a/dev-java/asm-util/Manifest
+++ b/dev-java/asm-util/Manifest
@@ -1,2 +1 @@
-DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
 DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
diff --git a/dev-java/asm-util/asm-util-9.1.ebuild b/dev-java/asm-util/asm-util-9.1.ebuild
deleted file mode 100644
index 8986257ddeec..000000000000
--- a/dev-java/asm-util/asm-util-9.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.ow2.asm:asm-util:9.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Utilities)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index fa74786c1e7c..d11595f87be4 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,4 +1,3 @@
 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_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
 DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd
diff --git a/dev-java/asm/asm-9.1.ebuild b/dev-java/asm/asm-9.1.ebuild
deleted file mode 100644
index f4ae85d5b7d8..000000000000
--- a/dev-java/asm/asm-9.1.ebuild
+++ /dev/null
@@ -1,23 +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"
-MAVEN_ID="org.ow2.asm:asm:9.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-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="9"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND=""
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild
index e1dfbf8c5059..c5339740e594 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.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.70.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.70.ebuild
index 5ae5b0ae4b39..d5d3aa1096eb 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.70.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.70.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.52.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild
index 49d8a7a76253..b008bbac0cd2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.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:*"