gentoo auto-resync : 12:11:2022 - 09:31:40

6 files changed, 8 insertions, 46 deletions

diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index ac58c6c68438..b69893ab5c2c 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -1,11 +1,9 @@
 DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
-DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
-EBUILD tomcat-el-api-10.0.27-r1.ebuild 1082 BLAKE2B e3ab23bc75c3a22df153d579fa2df8ba8caab9e0ff89f9c91845aca77daf487c6716714e5cbb158b9514a42ea48d84d22ec6eecf173630c7bd09905d8c8ffb4f SHA512 d1198a7e8850448fd4fa9b88e956555d1c1ffca9b02548c8c977d95af7ecb293b62fbe51a50f08c0916f177b34ffe006e21f023b7bffc5cc2681945749965d5e
-EBUILD tomcat-el-api-10.1.0.ebuild 1082 BLAKE2B adc315817fed7b3e6a1a45b27b25b0e957c429635afd31e49175c82cbaa47b5a4174bab46e41dd82d01e60a682fc81b42d96284a5a7512759f67afcd74343a52 SHA512 6d282345502bb66b6382b4fa3d8ccdb6ed76433a82a434affb05b455eead27c4665e5ee1481ea55317d2d9b5b887da63b298cdfc4536bb3e2508b1e76451cf3b
-EBUILD tomcat-el-api-10.1.1.ebuild 1079 BLAKE2B 5f3e82a4dd4d9fa42d4d926bd0a7244888be6663f91fd733dcc6ea3ad419f5b03238685e3271c7e8f113b7248c5277a3950a3ee78f1f344e860f90d67f988e0e SHA512 33dc2897df3fd52ed7f8b2a5cdd646198a595137eed847b97dd94c19c9b2ec0a913b5a4ef45b6530cd34531083af77e3a488484fb1866e2e9a555410f501ed0f
-EBUILD tomcat-el-api-8.5.83-r1.ebuild 1075 BLAKE2B cf00a380adf5f15c5144a54dcf6109bf6a9609bbeadfc647e25bd592dd502bf3c765965e44152c359e91eda7c682257c6e3ec25e6fb6fec228964a944e5a24ea SHA512 116536d0310d6a6e020cf773991917c5fa6996b5a950e955ee2f57f87682fde9193d82f8b4bdcaded914827bffb0b78b9d5b7a1b08f6902f419d6907423e7ebc
-EBUILD tomcat-el-api-9.0.68-r1.ebuild 1075 BLAKE2B 39156983cb5f2c1a20b2df52fec6f401496531626e6635ce35b8d3545d777353b13672bdf87ec835fd6147e1c7427c63c729752a9118dad1e2fc937689c7572a SHA512 c7a42de01bc4ced6bd6036b1b007cdc223a8f6d757de22ed667ec0c7c5e3d8a8e12cd4ac576088f760dfb36743de8d9767b8b4d33239cedaccbec693c7d6d392
+EBUILD tomcat-el-api-10.0.27-r1.ebuild 1081 BLAKE2B 6857d00f026a30c1ead3172c2ef5e14bc3ad1ecb654664fb497592fefec76348fdf2ff33be25b3dcb0053cc12a7eb7370be6df54e2a8e95d73fd7e73a4ec60db SHA512 4486b915b1fec57e9ae076377267c9232d20a47d835144173157fb2bb25682c93e846add000e7d9cc1b00c74d1c9526fdbcb10fe7e5ae7242f4d37945b78799d
+EBUILD tomcat-el-api-10.1.1.ebuild 1078 BLAKE2B 102936dff87a81ba38b59eb82a4e6643021278e203d5a1f929d0d59affe5664b28c9be24b71e87a19c67547c33d20717a1bdd4d1d688336978cbb46ec7db1603 SHA512 d5b14c813a66af8ef01b30b515f524c1adfedace4b82fa6b8761cd9c7c8ffcee3522ad063d0a7432f9482501af532dff71123602e1cd43a0a4d8c3f429ec5a4d
+EBUILD tomcat-el-api-8.5.83-r1.ebuild 1074 BLAKE2B 0265263b3c8ffb18c4f298f37825077154ff548e36a02817752826d603c35e1b47b58d099253d5f8b23e5c194c2157947970faa52459809c0136fdbb00a3193d SHA512 bb5dfb679a825e5d7cc69d37871ef541dab45d3c234d39baf373745528c5dbeaf5388b3c63407d606cda053a07ae867f25347f88dda7acaf6f49467020fcb61a
+EBUILD tomcat-el-api-9.0.68-r1.ebuild 1074 BLAKE2B 6c7857d992e45f72ea22e6aa1cbd149ab0e163418ebf49d576b0f2fcb0ab5c47f63993bb8ac892611205d33a1895128892d4e570c513b252120665b347b87d66 SHA512 988472477469d03e307ff4c36461ac024d76e8e7e05cb209dc5111f9d118aead88a41e930583b1a5bb56f45de7fd7dbcf6203d51fc271a1435870d62ca5d7a1a
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild
index 25430da1b258..c2a0c5f7aabb 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 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"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.0.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.0.ebuild
deleted file mode 100644
index ad9a1a45f60b..000000000000
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.0.ebuild
+++ /dev/null
@@ -1,36 +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"
-MAVEN_ID="org.apache.tomcat:tomcat-el-api:10.1.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Tomcat's EL API 5.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-11:*"
-
-S="${WORKDIR}/apache-tomcat-${PV}-src"
-
-JAVA_RESOURCE_DIRS="resources"
-JAVA_SRC_DIR="java/jakarta/el"
-
-src_prepare() {
-	default
-	# remove anything related to "el" or "jsp"
-	find java/jakarta \( -name 'jsp' -o -name 'servlet' \) \
-		-exec rm -rf {} + || die "removing jsp failed"
-
-	mkdir resources || "creating \"resources\" failed"
-	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
-	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
-}
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
index 41a70a360455..f6571a0cfc3f 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="5.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"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-11:*"
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild
index 59af388465f1..9e82b9224ef2 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="3.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"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild
index ba265fe14333..c62e311cee21 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="3.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"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"