gentoo auto-resync : 21:04:2023 - 00:01:05

11 files changed, 8 insertions, 108 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 6f8460ec535e..b7347cc75396 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/javax-servlet-api/Manifest b/dev-java/javax-servlet-api/Manifest
index c98b1279f5e2..8f5d9df11af7 100644
--- a/dev-java/javax-servlet-api/Manifest
+++ b/dev-java/javax-servlet-api/Manifest
@@ -5,5 +5,5 @@ DIST servlet-api-2.5-sources.jar 158114 BLAKE2B 84997b9cc2122f49a850ac32089eb484
 EBUILD javax-servlet-api-2.2.ebuild 912 BLAKE2B 31c71df6d3676a163c09c2845a3ce212c73317d674872423df3dd7bb27bfaa60631e36365829b259607c0cdb001690cc148acfedce8f893c5bce45828a582eef SHA512 43bdd35820faaa016efe76de64d798109d8638f32ce70f31ed4b1837d9712623ee02644a5abb97dd51ebc3c2bdca7c0a94474677962217c52f0935acbd9e681c
 EBUILD javax-servlet-api-2.5.ebuild 823 BLAKE2B bcaf0319d4c3850eafad51d759445aca57ff37912167e606749ee17d201b8e08e6e6516868643dc9a4150389357b3332456f6edfbe7bb6846a7e99de4a9af317 SHA512 5d6002c43e7e2bacc55303615610e18d176257f0fd1a74e937b5f57952208ebc1b64c03060dd8bcf1c9680cdb3ee13eb0c0b17c601a3b21588634ca6523f004a
 EBUILD javax-servlet-api-3.0.1.ebuild 940 BLAKE2B fbec8f7bddfce3dadc7df788c8f65bb71760e2ddff6afffe155e12e984319d504078643ad1d5b139fcdfea23c476a776f96cc8a0ace230b7d6e4251fdec8cbf8 SHA512 3bce74b77a92102085eb6e5243af6aa17e6767fc8649542cf81f73e2c6406c55969e1dee5e1a63f27b12d412daf9ae67781f87dc0b88d6ec589fdc0d123035a8
-EBUILD javax-servlet-api-3.1.0.ebuild 946 BLAKE2B be00c47d8d6c922af92b1f9e65483f0959437180e88d3d0386a3d49742ed56fb4478f60dfa496d2aa635d39d879a7f225ccad7ef27679a996568ca1517a2d8c4 SHA512 1fff69bbd79ef7d4f08d6b971fdb8b28829507cf77c5b2f8d5222137d093bf529a0e4b0884f0cf16f1e1dd63b2ced819432f52953b7b1405f41736a4b7156d38
+EBUILD javax-servlet-api-3.1.0.ebuild 944 BLAKE2B 77cce0a9e0c46aa0a65a25fd2492d1cc2dfcbae1daed4d2893954c8db839d5a887781585c7c6dbf140c41056ea901b489ad4bac390d3a4bd2a877e3a16d3768d SHA512 2501ff4b9bc33c7ca68294798397fc60f2661bcca4f0b27003bb3a7b4f66c4f5d05293ac995665701901f8ad781b088d8e3565a78b0f80d863c761ee135d6e2a
 MISC metadata.xml 805 BLAKE2B 1659a31c44ce401f65c117482a31b28da3e065f5b2f5ef9c0343e14e9151899b1c49838d1135ce5b0faab49082424d440c125f6a312d8c07366e0e54bd4d5386 SHA512 7b5386f0415198641ee8c4d93a1d0607f376f836297559cc361ab428be1ad02c02b700d465a69bd6ceb98f9e77118dc45d4542aa872018c7b2f910c2d7adc05a
diff --git a/dev-java/javax-servlet-api/javax-servlet-api-3.1.0.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-3.1.0.ebuild
index c9698cd87f04..33cf4d4b54b0 100644
--- a/dev-java/javax-servlet-api/javax-servlet-api-3.1.0.ebuild
+++ b/dev-java/javax-servlet-api/javax-servlet-api-3.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/${PV}/ja
 
 LICENSE="CDDL GPL-2"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/shrinkwrap-api/Manifest b/dev-java/shrinkwrap-api/Manifest
index c3b32d612c71..84d97d5e80b7 100644
--- a/dev-java/shrinkwrap-api/Manifest
+++ b/dev-java/shrinkwrap-api/Manifest
@@ -1,3 +1,3 @@
 DIST shrinkwrap-1.2.6.tar.gz 987090 BLAKE2B 0c837b6fae6c3e9c7155b6ddf1923b14320d39ee3fd45af5436f967535e8c3ab290b62b6ca67aafc146558466e8c161fa6527055e48a55b5456fce728c5618f9 SHA512 8d91e265f60f1ead931166da836106412ecb861112a65e4976f63df0e351d7cb2d1f64bc2633c5df1052eb39541906ac17d6c886d7d25cb1600799d17637a58c
-EBUILD shrinkwrap-api-1.2.6.ebuild 1379 BLAKE2B 7df90053ba217fc5903c925a9fbd712674c460e80c65370e804ccdbffffc2462187c974a80255853bf94c7c662d1818c3086f7c026cfcd3605b5722aaf2575a9 SHA512 13eb41c5780f16488b0a6ce5501ff056adfcccd4b6a174de2fcb6bfa58c4d1e74049090d7d8b139390f584db33eeb2a1cc7344692bab54854d17220d780234b6
+EBUILD shrinkwrap-api-1.2.6.ebuild 1377 BLAKE2B 62dde7231903df9b32934a53e4f3267ba2342ee532ecd6ac84edc97abaa773c5d1f5c2678373ca993ee452a1f8cf4ba7827cfb7c20006fbf3ad1d0ec5d09126a SHA512 d580501758548c7f72554c1d53a2d7469e63df5956a1b7a015067044b1d36a75f7e08096366bd9ea8b9fc682908e29dac309455ffefda891b89eeab584fbb365
 MISC metadata.xml 303 BLAKE2B 9befb02178286b65db97b836897ace4dab5c9ccccbc4d2a98242960b18acbf9cf0e8ade440125332cbc6555c92b6813a141c2fa61d0ca1db911e625844178543 SHA512 a7417fe5d51ab1a5871cfd2ac6c8d0ae8190cc7bea21f8d2f43b99fab72c73a58fd88ccea32ed59871d043aa6ac4eefb5a1493f1a204d1f3c427d1809c3a5f39
diff --git a/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild b/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild
index 832b90a96594..9fecf155482e 100644
--- a/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild
+++ b/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/shrinkwrap-${PV}/api"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 
 # Restrict to jdk:1.8 - otherwhise one test would fail:
 # 1) shouldCreateDefensiveCopyOfURLOnConstruction(org.jboss.shrinkwrap.api.asset.UrlAssetTestCase)
diff --git a/dev-java/shrinkwrap-impl-base/Manifest b/dev-java/shrinkwrap-impl-base/Manifest
index 931e4b14ebe6..9e77e9c823ed 100644
--- a/dev-java/shrinkwrap-impl-base/Manifest
+++ b/dev-java/shrinkwrap-impl-base/Manifest
@@ -1,3 +1,3 @@
 DIST shrinkwrap-1.2.6.tar.gz 987090 BLAKE2B 0c837b6fae6c3e9c7155b6ddf1923b14320d39ee3fd45af5436f967535e8c3ab290b62b6ca67aafc146558466e8c161fa6527055e48a55b5456fce728c5618f9 SHA512 8d91e265f60f1ead931166da836106412ecb861112a65e4976f63df0e351d7cb2d1f64bc2633c5df1052eb39541906ac17d6c886d7d25cb1600799d17637a58c
-EBUILD shrinkwrap-impl-base-1.2.6.ebuild 2341 BLAKE2B a82415dde4f71254eff7ba291df8ee18e833322f6e862760a2be71d1fac8d6c67410eb6024c66f638b8b55240e4fcc119f5ac4c657f1f9a2f635eec4d270ffe4 SHA512 beb6da2935d86504748bbe8f8e5d645686ce963962a35f166588e4b19fab4d08dab197b8372f3eb2bd63ebc92448b82eb28ab6c8f6348f0dd351e7df6297c130
+EBUILD shrinkwrap-impl-base-1.2.6.ebuild 2339 BLAKE2B 4cf121bb993237954ac48d299533c0d5413d5de221011d9f2bf87a7ac5da05f1c6ac58a6906835dff775e5e1cd18f38ab7a797cb9feb9c51819448bef05d8fb4 SHA512 1442b9b5899a2051f17ebb0130d9bcdb9343c0ff8a75e25cc12ae4252286ee3ba22276b59ed3e180cd9345627cef8ac87c0a7871c0da283c3ea6e8c2271b86cb
 MISC metadata.xml 303 BLAKE2B 9befb02178286b65db97b836897ace4dab5c9ccccbc4d2a98242960b18acbf9cf0e8ade440125332cbc6555c92b6813a141c2fa61d0ca1db911e625844178543 SHA512 a7417fe5d51ab1a5871cfd2ac6c8d0ae8190cc7bea21f8d2f43b99fab72c73a58fd88ccea32ed59871d043aa6ac4eefb5a1493f1a204d1f3c427d1809c3a5f39
diff --git a/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild b/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild
index 6e632195e605..59128dbd1709 100644
--- a/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild
+++ b/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/shrinkwrap-${PV}/impl-base"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 
 CP_DEPEND="
 	dev-java/jakarta-activation:1
diff --git a/dev-java/shrinkwrap-spi/Manifest b/dev-java/shrinkwrap-spi/Manifest
index 9ceeeff9de23..3fa62ce76f6d 100644
--- a/dev-java/shrinkwrap-spi/Manifest
+++ b/dev-java/shrinkwrap-spi/Manifest
@@ -1,3 +1,3 @@
 DIST shrinkwrap-1.2.6.tar.gz 987090 BLAKE2B 0c837b6fae6c3e9c7155b6ddf1923b14320d39ee3fd45af5436f967535e8c3ab290b62b6ca67aafc146558466e8c161fa6527055e48a55b5456fce728c5618f9 SHA512 8d91e265f60f1ead931166da836106412ecb861112a65e4976f63df0e351d7cb2d1f64bc2633c5df1052eb39541906ac17d6c886d7d25cb1600799d17637a58c
-EBUILD shrinkwrap-spi-1.2.6.ebuild 748 BLAKE2B 1a9f2308992c8747d704b00aeb69e5f7f85691609104972402b59c93cf2ddc77dfac63fb984d247ead800558781fd5a5ba0b417cdb7d3f1648c09bbe81c9eb1a SHA512 398fac49ee12bee5204c0fd43ffda0ccc212df9b168b333920b38c325094c2ad3c3786218ba200d4cf2e53810fac93386729b59179cadcd9a8276dc0608ff682
+EBUILD shrinkwrap-spi-1.2.6.ebuild 746 BLAKE2B d2ea2d9862d5b3dba84615b9cbc4d2e668e8b75061862f71aa63b785f0a1a069564f2d2d6a140992a348d2c43e791acb626f08dc08e9e9d4e656090059620971 SHA512 8693e2c51e1d8766100038ae4ea3561fbdb3b6223a4513c0dfea6a176450d31699093b8130abe3fe6b9451744a8237c2dd6c82fb18152e15cfe5e1ed3d4003f8
 MISC metadata.xml 303 BLAKE2B 9befb02178286b65db97b836897ace4dab5c9ccccbc4d2a98242960b18acbf9cf0e8ade440125332cbc6555c92b6813a141c2fa61d0ca1db911e625844178543 SHA512 a7417fe5d51ab1a5871cfd2ac6c8d0ae8190cc7bea21f8d2f43b99fab72c73a58fd88ccea32ed59871d043aa6ac4eefb5a1493f1a204d1f3c427d1809c3a5f39
diff --git a/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild
index 745c185260f3..b6377dae6ae1 100644
--- a/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild
+++ b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/shrinkwrap-${PV}/spi"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
 
 CP_DEPEND="~dev-java/shrinkwrap-api-${PV}:0"
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index a616c35522e4..0a6e68bc9348 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,5 +1,3 @@
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
-DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
-EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild
deleted file mode 100644
index 0a4f99352d99..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.109.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}/"
-
-JAVA_TEST_SRC_DIR="src/test"
-
-SERVLET_API_JAR="servlet-api.jar"
-SERVLET_API_SRC="src/main/servlet-api"
-SERVLET_API_RESOURCES="src/resources/servlet-api"
-EL_API_JAR="el-api.jar"
-EL_API_SRC="src/main/el-api"
-EL_API_RESOURCES="src/resources/el-api"
-JSP_API_JAR="jsp-api.jar"
-JSP_API_SRC="src/main/jsp-api"
-JSP_API_RESOURCES="src/resources/jsp-api"
-
-src_prepare() {
-	default
-
-	# The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
-
-	mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
-		${EL_API_SRC} ${EL_API_RESOURCES} \
-		${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
-		${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
-
-	pushd java || die "Failed to cd to java dir"
-
-	cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
-	mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
-	cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
-
-	popd
-
-	for file in $(find src -type f | grep -vE "\.java$"); do
-		target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
-		mkdir -p ${target_dir} || die "Failed to create resource directory"
-		mv $file ${target_dir} || die "Failed to move resource file"
-	done
-
-	mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_compile
-	rm -fr target || die "Failed to remove compiled files"
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="${SERVLET_API_SRC}"
-	JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${EL_API_SRC}"
-	JAVA_JAR_FILENAME="${EL_API_JAR}"
-	java-pkg-simple_src_install
-
-	JAVA_SRC_DIR="${JSP_API_SRC}"
-	JAVA_JAR_FILENAME="${JSP_API_JAR}"
-	java-pkg-simple_src_install
-}