summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin56005 -> 56005 bytes
-rw-r--r--dev-java/ant-eclipse-ecj/Manifest2
-rw-r--r--dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild2
-rw-r--r--dev-java/eclipse-ecj/Manifest2
-rw-r--r--dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild2
-rw-r--r--dev-java/tomcat-el-api/Manifest10
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild2
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-10.1.0.ebuild36
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild2
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild2
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild2
-rw-r--r--dev-java/tomcat-jsp-api/Manifest10
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild2
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.0.ebuild43
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild2
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild2
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/Manifest16
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild98
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.0-r1.ebuild43
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.82.ebuild99
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild99
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild2
26 files changed, 28 insertions, 458 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 6ecfc244806f..0b1b2afe9190 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index e4c2e354cc14..1a229b4a50f0 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -6,5 +6,5 @@ DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2
DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1265 BLAKE2B 10003921348e6a8c03eb7fb048fdaf391ecfcf2c9a8d45cff57491bc0bd4507462fbba41282c8998aa4b4b50792fc6d374052c1ef1019e4dab30e24f8ff853fa SHA512 2cac62f7e51e2086fcdfbbef59a2e794d165692683d993e6c8aa77f0fb3daf55f0c4c20c117a984edb70b268d2fac1c3742ab674a56e73778ecc4b434242e00a
EBUILD ant-eclipse-ecj-4.22-r2.ebuild 1422 BLAKE2B a0b035a6386747d32ad2197ccb0e6eeb85a24b497236f5cf651dde1e39e81dd54746f4df6f9766e390c72a394b1d10e7cf4b40a86700a0875a59fe5ce469692b SHA512 739b38433d47dbd8e4d6bbf1c663d4001b33614c69c69d6bf146be0777624c55cff6c1d1c869dfa42ed6f8d325d5f8dbcd7eca9e77b18f7ecf89eeefd60f0ab8
-EBUILD ant-eclipse-ecj-4.25.ebuild 1423 BLAKE2B 7766f8237d685cf501fbb0be0cc3122dbc2cb074007d59937b52d06c1e60adf8ac50094d8a930d9ec9b31f8d496969ee98888a173980616ecd4bfde084a1181c SHA512 6061f492452514c6ca2acfe0350e0757257c0cad273a13a122d872cdcfb2767abb4f6aa93840ccd7ed36226473fd6de95fdeff8d30f2932c9bb22eb2b19478a4
+EBUILD ant-eclipse-ecj-4.25.ebuild 1422 BLAKE2B 92bb07a71d76ff089d0c7f478fe307d70855a95c1172f5a4fce14b3ddfb34b046af52b052dd50930de9101a5337dab625baa4e7b85de64fa76c7c1339d0451ec SHA512 2fc3b7fb3d50fe5411992ca8315e30ff348f7f8ebe5cc103c3d9c1b75f8dd666091580243807cff952d57c741a43d3090ea6d945986b935d5f56ec5458776fdd
MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
index 68b185c4ceca..22c9edfdafa4 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.25.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.eclipse.org/"
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
SLOT="4.25"
IUSE=""
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 6df89c94341c..c2b0d68ac507 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -3,5 +3,5 @@ DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2
DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
EBUILD eclipse-ecj-4.15.ebuild 1737 BLAKE2B de3aff3c46cf68494920930ffbf337cc79864d1adaef1c603f1c9ea8ce168823e8ba772a0a616c77ab7dafc596e37687e6460db89ee61c4127c41ed739b2d914 SHA512 6a0bd08a4aac020bc4f299907777d40673128798bd093b3bc03602aa86bb7c3436d7400ba0dc31c58ff0703d6357ac691f909dd2358a773e0b548139d251a8e7
EBUILD eclipse-ecj-4.22-r1.ebuild 1693 BLAKE2B 4b19af6eef3b9626b1451391c09836c764232352071cac79e82064c2a4a9be93b6f689845f38e8ff2c191c81e7a3a230f7927cd1fdb19115a99265f1720dbe5d SHA512 27e74aee2c6c828ed686ef17a82976f3ec6841d878384af29b10c8ee91792446153603cd8e5383b669564122f334310846ce7a72d592b2361ac02a60e64b65d4
-EBUILD eclipse-ecj-4.25.ebuild 1694 BLAKE2B e7a3747da20347847282ec2275c05128c48c910fccb51abf0609a1e621b9e0d7ca84485bcc55beb08d5cd31722dc619f700f2a1443ae8b8761c0c84de29aa2d7 SHA512 f3d6c3da79be824c191a80edd5f514f7efa2dc33b45ce52bde02e55e17dd21384345a0517508519ac80f14c5020c1f672986ed168c531eb4258db23fe132a3e4
+EBUILD eclipse-ecj-4.25.ebuild 1693 BLAKE2B f8aa316f2e366fcf65564005f11c256c3b52608b027981ef93dc344aaba0ab1a7bbd8bc0ccc7b0ddb026c1f1fdafbc5764014069ac6802739382f1b6b0234209 SHA512 9d178cc5e5ec4f5ca35badf455186dd4071ab5b67a53536b9f03ef73c66320c5cdb064b39e3dbc3771a63ad69a8071dc6d8311d682b35b1889ada2c7a3c71e8e
MISC metadata.xml 657 BLAKE2B ed8b1b4598051b4191bad5e92df382f1e0910f7aa6888d9df4dedef6929a3d8933c2951c98e8f8af8750f176ff541608d8db5d311e06c721b14ce1703a95a00e SHA512 ad91b4e46f609db5c5abc145feaea99dc0e6f4297ee1f6532ff1001a991775679e8f53ef91e823d61a614e6d77fbc18637469ea1869d8f82bab352a69c6fbdaf
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
index e10697904fa0..25f270741274 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.25.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.eclipse.org/"
SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
SLOT="4.25"
IUSE="+ant"
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:*"
diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
index ecb5d0152859..a727ccaa45e8 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-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-jsp-api-10.0.27-r1.ebuild 1125 BLAKE2B 01e4c1ee7c5e375d2ed9c2b6be5557a5bcf593db18be2e9c0919b8cdbebec3d8cb57867a68b0aaa25617aed79df5580d38c381edcaffcb43e32fdcbfd69adc0e SHA512 8545d3d0904a3dc0c09e26db55cd2f6b3706a5661dceb744525f27e9ff5b5fe336aad9d21cf755a6a37baf47275d29a84941754395a0652078c6dcd70bffaa76
-EBUILD tomcat-jsp-api-10.1.0.ebuild 1125 BLAKE2B 5c59fe6a146a1540ee6bacdb34d80b3d171f97a7c902b5cbb0e7a49fb04f2d6baaec3561dabb3a7c95d9411629bf5b0ed654535d09bd59553b2653a3456695a7 SHA512 3162b038a1dcce3557941f850e430f55d95acdbaa9916c4b5c59cb12f9afebb9bad2fbdedfb59e3cbdfb43f409dea9baaa5051ce5f94a48d889a54d091b9595b
-EBUILD tomcat-jsp-api-10.1.1.ebuild 1122 BLAKE2B 9ce26dc7c3474cf0304dd7545453939688f36321d68c040b70392e9722c18eb865c511c593caf5ebfc335576f96beb7036704a857fec630638c25f5be15a4631 SHA512 357de0e27c33d644e86b191840edadf9f0964453078134e8fdde1a96254f9f341d4254c27618618f9511a6be05efcc738e2594b368b355cdb31993d72d09f4b1
-EBUILD tomcat-jsp-api-8.5.83-r1.ebuild 1118 BLAKE2B 09c64ba37155dd9c202468adfdd3336808516ab0366dece9523ae8f056c6e3de32a1b12b400145db46f31c5b2e3ca6151f38d6c6d9f0486dd3d3c627ab660ee5 SHA512 eda47f3e527f94bbcd9c2f6f9c9095e91ca20232f439e3354e2fc0ce22c84f549b90499180771096154fa1cb8986f17015afedc381afc95269d6774d25d96588
-EBUILD tomcat-jsp-api-9.0.68-r1.ebuild 1118 BLAKE2B 808b81b02e9bc2aed8d2ad71027bd70d0df05c475fb6461d753254a8bdd4ab98481b6fe00c6bec7db546a7828acabf5df92911afd864b70c42b89fa23bc73b1d SHA512 9d08f074a985c7adb3f68e8e7e348f428d97fe6cdcc0017c913a8a863ebec85bb98e143e174f8d5f508d1366e8e273369fd99ae37b844719834d02aeb9c98437
+EBUILD tomcat-jsp-api-10.0.27-r1.ebuild 1124 BLAKE2B 156423a2485711c72c10edf6617587872ec1ce3f89d4e1722f1969089b90d96cd49153cf9139437a4d08a8980243059a35c27be20345339ff99861bb77fee663 SHA512 e717a54ac7176b45f5a55eed7063a9cc6fa7457029a68f5a3eafd461cd1586d6fb2a36d02d9b98bd0b139232786670680bc2f4f3e8ac91ac82041e20d6e2dc79
+EBUILD tomcat-jsp-api-10.1.1.ebuild 1121 BLAKE2B 28281e634eae4990fda6afdcc45b451eb2fa397ba8f0ef26c0403a67618c1062a77002c051729c9238bfde185be4878bfcca113ff55d36cee3aaa0b9a5082686 SHA512 b476387af9ceeea788ecf9e54243e60533aec90d0f6609b4c86d9bc9860f9bf07d6cf8460ea508be28c1190a9d18c5f4bfb3af1dd3a735150ae80e81b61054b4
+EBUILD tomcat-jsp-api-8.5.83-r1.ebuild 1117 BLAKE2B 5d9eb8bd7e2e79e2f4e7e37d3e9a41ab87a375a9aa72b1a73bead1335a730c3a9c5d3b60526e4b87d7e46f0d25f70b251002b1ecccfe3df40cf9bb96e0dd0d7b SHA512 abadc559103fb67928be0f0a62cdff998248f5843284011556a08c3aaa5f06ba5764cb2e6448a8de05c3dfeff5d276d201c900fa434a145ba6914106839fda5f
+EBUILD tomcat-jsp-api-9.0.68-r1.ebuild 1117 BLAKE2B 80e7bc1fad34ae43c7d84a5caf0fee14d40d2b162398ede8b0eb1faf9f6e7ba5f48765186bb68922dcd163a5a2b4fa6a90b2bd044d530fd331785d7d783c49a2 SHA512 41af601effda53de446251bab678b846b6508fe5e92d2d03d7966f51095d4d907f302ac0c8dee6356b4af35dfd3802f326423515e559313b737d9b573c7f6336
MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild
index a58ca4b310b7..9cdd679d1e99 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-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="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"
CP_DEPEND="
~dev-java/tomcat-el-api-${PV}:4.0
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.0.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.0.ebuild
deleted file mode 100644
index f488e2afebd2..000000000000
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.0.ebuild
+++ /dev/null
@@ -1,43 +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-jsp-api:10.1.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Tomcat's JSP API 3.1 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="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-CP_DEPEND="
- ~dev-java/tomcat-el-api-${PV}:5.0
- ~dev-java/tomcat-servlet-api-${PV}:6.0
-"
-
-DEPEND="
- >=virtual/jdk-11:*
- ${CP_DEPEND}"
-
-RDEPEND="
- >=virtual/jre-11:*
- ${CP_DEPEND}"
-
-S="${WORKDIR}/apache-tomcat-${PV}-src"
-
-JAVA_RESOURCE_DIRS="resources"
-JAVA_SRC_DIR="java/jakarta/servlet/jsp"
-
-src_prepare() {
- default
- mkdir -p resources/jakarta/servlet || "creating \"resources\" failed"
- cp -r {java,resources}/jakarta/servlet/jsp || "cannot copy to \"resources\" dir"
- find resources \( -name '*.java' -o -name 'tagext' \) \
- -exec rm -rf {} + || die "removing *.java files failed"
-}
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild
index f2517df2876a..3e5dbf40ae2a 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-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="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"
CP_DEPEND="
~dev-java/tomcat-el-api-${PV}:5.0
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild
index f7a2a6eadc9c..2b9034bf850e 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-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="2.3"
-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"
CP_DEPEND="
~dev-java/tomcat-el-api-${PV}:3.0
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild
index d744926afba1..7ebb6ebd022f 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-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="2.3"
-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"
CP_DEPEND="
~dev-java/tomcat-el-api-${PV}:3.0
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 51ea4cb33c13..808b3d230005 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,28 +1,20 @@
AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb
AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
-DIST apache-tomcat-10.0.26-src.tar.gz 6153701 BLAKE2B fb16f83cf71dc97f21739c3714d2d3d201aa6b6b4242c351fabfc04ee767e59b6e376c7c8984dcda12d6942835221c55d4451b2d0a1245a2dbb73636c93da47c SHA512 f66387a3ca67b6b3df8504c4ae089e8f30e389811a8d0b7d2241e115b8cf712a38f3d0fea938cef7fa9745f412aa70ad47840e40e2385fbd1435b636e93b45b4
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-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
-DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
-DIST apache-tomcat-9.0.67-src.tar.gz 6211392 BLAKE2B 273b921ce580be6fb76d8567e5b0aec01b936518875f8470c1cee4b159519f723e606680d9986f61fbbab79cea2d027195f3debe9af59dfac786b0d0566d7c02 SHA512 33319d70c50fde71d163f66dc388ed2d5855aa4f087f7e2259adc27cc7ed30ace079d81e52def43a904c88ac670bb0c71667938b931a214470d77679108914cc
DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
-EBUILD tomcat-servlet-api-10.0.26.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a
-EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1172 BLAKE2B 8da897452fa331bb40cb9cf5b95563abf6845e79be2e9484be90d67505ce21622874da30af708c1da2a42f3e2ae0e8253a69330b8afc3b739783f5d8360ebe63 SHA512 99d069b42dcf1f926bde0e51e152a59338be02e3145c98ab6e76f1b2174e93a0b807e77425082d68ee7b9af6c36f90ecb6223c6deda4027d7f2308eaadd1614f
-EBUILD tomcat-servlet-api-10.1.0-r1.ebuild 1172 BLAKE2B 4f7067a7e31c04bf55c66c0fa25c10a3744bc6e010db04ad922739b4ad57130e667da67c3513636ecbd61f126866e9edafa0c05dedaed2a60ce4adc875183971 SHA512 73640743378e8914d06fd4ab02cb7418356b03b152e24272a3600a14eaaaa85045c8e4f47378c3bb397a6bf08a9366fe13aa3f2bf574cdc6cc33ed1ed10756e6
-EBUILD tomcat-servlet-api-10.1.1.ebuild 1169 BLAKE2B fe96fa170d2f84781ca7cba89db6244f0cbd87a6cd9da200dabe17ca784dcbec4ee6974af7ab4d22bc877e2ba595fe19990f8e02fadb1c47b8cad4bfb867290c SHA512 5cac843254102464bf1b8d08fe645816e984b34e0f70f1eeb0e3eee339f6484006197c7ecc0145271e2922fe1e86737ce1e990d85b3e4b83ec43794897416325
+EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1171 BLAKE2B 2e49a8a90f7936385988b221b6a1dd540590bac31a0969f38727441d7f6448236c82b6345f713b285834fcb3a4407fcb661889fe0f95b8d54f35d33d961f33f9 SHA512 cefdd4b9433d4cc16a4c6ba38752911a278bd97a78161755b98b96eb0280826b46300dc0ef26591ae9f28a2df47fcac58bf64b96064008c2cd2e5a4997435655
+EBUILD tomcat-servlet-api-10.1.1.ebuild 1168 BLAKE2B ec65a3778cbc678f576e564fbb99ca990f99bfc6f02eea04beb6525e54e1b7a64fdbbf621df0af3106dfd6f8f0e9508c49e0c31c2f04aecce75138b7cf410cfc SHA512 6b6c241894e17a37eecee863454e98d56a274bafe3ef913aeb139d7aec1f906488a4485604f5178ed404d35a3953c1dd62b51e97c9a8de66b477deb2d5f38695
EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
-EBUILD tomcat-servlet-api-8.5.82.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
-EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1325 BLAKE2B 4f3b205b147964264edeb07314fe3e731680908d90db2ecf696969ecddb93eb0889021fa43a19dfa9734c9c829b9ba5b47948ed91539374d2fb6204b59b1bbc6 SHA512 4fad8cbfa6802ff57df8462830923d641c55a988407a612db215e10a09611225b5b7a29f2448617a12e48e0cb77a3c5ca27822092fc7a216e9f6c45ab111e795
-EBUILD tomcat-servlet-api-9.0.67.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
-EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1165 BLAKE2B eb32c1af1f0fa23f9ba56f040cb47763f622360746aadc63573e48aa1aa2daad93bac59c1182b3ff792825e3445dea099833baeb01649af6d6ed465aced89a9d SHA512 677eae6a195bd6dec5c12a9ac3124012bd8893651478e61a3d83e78c2b2a320ba6c65f2092c51f66cc5a1c6fbecb0b5c5ddad9e1ae3a8ac28f53209ad1a2c7f5
+EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1324 BLAKE2B 079d3ad08580256a30a3d359818e940be01f962be2019c7468f17c1bf6a4e8c8f685056ad4d08419175c4d5983333332b07117ecc07326df63c2de5083ee0cf7 SHA512 122bf1cb7a4ef88481888715d878c5c4bbb117e2214b28722173e60ddf6458e377487679312755105e360bb94b261b77e496f80bcde0e1a8e402794cf8a1cca8
+EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1164 BLAKE2B 89ee54e02f25080b1faa6e2279dbda2394e7efd74465818afb9d6da5a21ff0b6d8dbc0e3e7ba6ebafb8e0979ef7e3950cc4de9e2242df10b67521f1cad1531b0 SHA512 c32dc63e1dfffcb4ddaa3869a9e5b7ead54005f2d316593a0b1ec6dd98014321e9c7f3144830a924ecf88ba9e2cfdc446a76ab47166ed78efd4e4c49e63dbf03
MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild
deleted file mode 100644
index 0d28b0e15cd3..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-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 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 compile and package
- mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
- ${EL_API_SRC} ${EL_API_RESOURCES} \
- ${JSP_API_SRC}/jakarta/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 jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
- mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
- cp --parents -R jakarta/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/jakarta ${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
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild
index 538eb8b86d4d..1b735e8d0da9 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-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="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"
CP_DEPEND="~dev-java/tomcat-el-api-${PV}:4.0"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.0-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.0-r1.ebuild
deleted file mode 100644
index d02b51329361..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.0-r1.ebuild
+++ /dev/null
@@ -1,43 +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-servlet-api:10.1.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Tomcat's Servlet API 6.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="6.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-CP_DEPEND="~dev-java/tomcat-el-api-${PV}:5.0"
-
-DEPEND="
- >=virtual/jdk-11:*
- ${CP_DEPEND}"
-
-RDEPEND="
- >=virtual/jre-11:*
- ${CP_DEPEND}"
-
-S="${WORKDIR}/apache-tomcat-${PV}-src"
-
-JAVA_RESOURCE_DIRS="resources"
-JAVA_SRC_DIR="java/jakarta/servlet"
-
-src_prepare() {
- default
- # remove anything related to "el" or "jsp"
- find java/jakarta \( -name 'el' -o -name 'jsp' \) \
- -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-servlet-api/tomcat-servlet-api-10.1.1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild
index dbd0b6f8cb9a..89d897766496 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-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="6.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"
CP_DEPEND="~dev-java/tomcat-el-api-${PV}:5.0"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.82.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.82.ebuild
deleted file mode 100644
index 888295412849..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.82.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 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.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-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"
-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
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild
index 1fe708fe2364..2e55ca73bcc2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-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.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"
# we can't use the exact same version of el as tomcat 9 implements the same slot and
# it would prevent from installing both tomcat 8.5 and 9 at the same time
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild
deleted file mode 100644
index f1c865a27bec..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.67.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-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"
-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
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild
index 03b8140fd930..a7301a8805cb 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-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="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"
CP_DEPEND="~dev-java/tomcat-el-api-${PV}:3.0"