summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin55206 -> 55532 bytes
-rw-r--r--dev-java/mockito/Manifest2
-rw-r--r--dev-java/mockito/mockito-1.9.5-r3.ebuild2
-rw-r--r--dev-java/objenesis/Manifest2
-rw-r--r--dev-java/objenesis/objenesis-3.2.ebuild44
-rw-r--r--dev-java/tomcat-el-api/Manifest5
-rw-r--r--dev-java/tomcat-el-api/metadata.xml7
-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-9.0.68.ebuild36
-rw-r--r--dev-java/tomcat-jsp-api/Manifest5
-rw-r--r--dev-java/tomcat-jsp-api/metadata.xml7
-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-9.0.68.ebuild43
-rw-r--r--dev-java/tomcat-servlet-api/Manifest4
-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.0.ebuild98
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68.ebuild43
17 files changed, 274 insertions, 146 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 5cef45950289..3d43e0a05e79 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index b35f03a7c7db..b864583505da 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -2,6 +2,6 @@ DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08
DIST mockito-4.8.0.tar.gz 1044264 BLAKE2B cbd8fa0db3b652ad882c6bb8c5f86116cf21772869814ddabe88532ff2522e399e8d7e9d68935b10844c0c496755834dee66c88dc7b2e0231757f7c79233c1fb SHA512 1f1ea9aac907d8ba42874eb6a6870cd5cb46b80a4a9f841c7eca8ff8f651e13baa92a4c3512d95d6596dd7da60e627a606c74e4b1dc56d11b06a14f44e3d53f3
DIST mockito-core-1.9.5-sources.jar 723074 BLAKE2B e553a923542a1a2574ee0cda5979d168cc3e9644dbbc9fceed2301ae1bac150c4e35dbc4432d50e2479efea2a6cd35ec19c62c3598f61709f1f5dc8959cc0155 SHA512 271e626c3b5be9a7d7c82a2f0bf44077aabd51924b0956a88633ace7fe8c134d8cd1f89ce348ce0d15ccce55a50027e303836d2d2f430500317b6136d308d3d4
EBUILD mockito-1.9.5-r2.ebuild 892 BLAKE2B 5efb72fdf28d793ad9cfd14ee41b58b4ef9d9bdd21b638657ea9ea77444443a68e51177a992b2f3f48e13c56ab68a3821368fd6eb287182d2f60ada628cf6ff0 SHA512 44e08dcbe481a4bcf964227cf2c741403aa799ef98065b7f8f490451d15daa286f01cc944546875cfbc92844427ad2ccb305e44ed5dfa06fa5f04e673146c8a1
-EBUILD mockito-1.9.5-r3.ebuild 691 BLAKE2B c51cb984d0fcf563733fbe6f43fb7cd4d8547b224cd04c497f7dcff990a4d02ca44245b9ee665b4529b513ac2070ceee64ed2a9473e398b8019f79d619098158 SHA512 1b915161c8c24ff4bf307e474106753ddf3d4e38f0386e25bfd56672a80da70ecda8348fa43841e54fdad216cc3aa281418316442d8460266b720fc786ed1896
+EBUILD mockito-1.9.5-r3.ebuild 717 BLAKE2B 604bda2b8dd07260e2ad329f783998a36aad4b1f3c0ce52b28305f6402b7f9fdcac120b2e6224e3f34dd81a503851c68741a2b2416eeed16be340ccc9c991a0b SHA512 17c1adeddc1c0ec4b96f92040464be4ecc4834a0da82ed65124537648423ee2756a2bada388e25f5d41d1f5cc54f4faa83973116e7ccd661dfe064ddb6ef5226
EBUILD mockito-4.8.0.ebuild 1262 BLAKE2B 9098784d33a42e9a43693c75a845d02fd681df71c402f163e121ea70f9f7f30d1383a3eb70c1ec5ca5cc72bc2353659b7f47dab6148dc983513716321825da3f SHA512 3be5f8404cc604eeb1af0aba9d0c78f3d08d43f98f9ab73d3a7175fbe5f0ac7fa2f1aed08c62ae2055e2029a5ad611e031353fadd7c5afb204d794c353da9509
MISC metadata.xml 317 BLAKE2B 209b27a429c1fdeca71c1e215f8fc43bfc66c961b1a3ad3dfcda16d5ea1df51e54cea248f4f152966aa1f91059b91c21fb734c6995f8033150dbda5e1813d121 SHA512 1f7be64d432b4004d2bbf1ec2c6776ec8618875356ea0308b8409f322d48bf3440d692732406ddb3fa7a273c9754c4cc5a6f6cd9808348d0ba8beb7159887a5b
diff --git a/dev-java/mockito/mockito-1.9.5-r3.ebuild b/dev-java/mockito/mockito-1.9.5-r3.ebuild
index 14eb55169855..2da0a0c15242 100644
--- a/dev-java/mockito/mockito-1.9.5-r3.ebuild
+++ b/dev-java/mockito/mockito-1.9.5-r3.ebuild
@@ -27,3 +27,5 @@ DEPEND=">=virtual/jdk-1.8:*
RDEPEND=">=virtual/jre-1.8:*
${CP_DEPEND}"
BDEPEND="app-arch/unzip"
+
+JAVADOC_ARGS="-source 8"
diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest
index 577161922e3b..af3d2ed3d5fd 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1,5 +1,3 @@
-DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
DIST objenesis-3.3.tar.gz 125400 BLAKE2B 36cff7cb5a2dca9a81f3ca07d56995f68d9c61c9d2b7caeac5f87bb13da02b0494053927e2221c776edef0bafb862f5c97dfc0e79cf991c6c970b5b9206a5aa3 SHA512 786fe0d2d1dba0f006d5218101578d8fd23616765f5cdb4df190d138fd10dd675b9189887c27a40b63f09ed5e1dac1324b2936c7ac24a655e6f63d53b9cd7c01
-EBUILD objenesis-3.2.ebuild 1209 BLAKE2B 5dd9a097b3bdf8b84af29c6f5944ddd9b338eb9138fe9f3f4605fb6acc33d1ba7553bf47d6a82b02ca75fb682c1079c8a62a2e3a3e11de6b196ed44347b89139 SHA512 30892a8275f87b6a2c3101d1391da7c1991f1e5110e427a519521af57d287ad632c0879c6ca869d54b00de643350443984da3352a932b21c7983e352b2cab614
EBUILD objenesis-3.3.ebuild 1187 BLAKE2B 1b3c57649d665b976dc49f858288cc98464da660fc5e11fb304e4efd6abd36588332e78b7262911facfb71693c0500cda64f90515b62f9d147b5638d064c0e77 SHA512 52a1170f4f944da9e4c14bfa7f1f00d1ddcd7f68ad17c90a1aaff6be342a9e828b611193fa46c2c30ced767dfb5865285b612a8db354c2762cf85190b88fa013
MISC metadata.xml 386 BLAKE2B 1015a40cbff1c5726a54996b8e0387b287ad70fbe45f732f399f4ef90c1839f0bfd0531139d9a304232fd6a49decd4bf287f746993ee7a1258b8bd3b920f2483 SHA512 e293fd7928f753745c69bb0357cc8140574c632d9a35e353df7dbbbc524855db423ac0cfc505b7bef2f98875cf5c05ed1144251702a0b932b6e1630d4be7ec95
diff --git a/dev-java/objenesis/objenesis-3.2.ebuild b/dev-java/objenesis/objenesis-3.2.ebuild
deleted file mode 100644
index b752785e109c..000000000000
--- a/dev-java/objenesis/objenesis-3.2.ebuild
+++ /dev/null
@@ -1,44 +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 objenesis-3.2/main/pom.xml --download-uri https://github.com/easymock/objenesis/archive/refs/tags/3.2.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild objenesis-3.2.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.objenesis:objenesis:3.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A library for instantiating Java objects"
-HOMEPAGE="http://objenesis.org/"
-SRC_URI="https://github.com/easymock/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: ${P}/main/pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# test? org.objenesis:objenesis-test:3.2 -> >=dev-java/objenesis-test-3.2:0
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- >=dev-java/objenesis-test-3.2:0
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="${P}/main/src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,objenesis-test"
-JAVA_TEST_SRC_DIR="${P}/main/src/test/java"
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
new file mode 100644
index 000000000000..24383a1c320d
--- /dev/null
+++ b/dev-java/tomcat-el-api/Manifest
@@ -0,0 +1,5 @@
+DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
+DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
+EBUILD tomcat-el-api-10.1.0.ebuild 1082 BLAKE2B adc315817fed7b3e6a1a45b27b25b0e957c429635afd31e49175c82cbaa47b5a4174bab46e41dd82d01e60a682fc81b42d96284a5a7512759f67afcd74343a52 SHA512 6d282345502bb66b6382b4fa3d8ccdb6ed76433a82a434affb05b455eead27c4665e5ee1481ea55317d2d9b5b887da63b298cdfc4536bb3e2508b1e76451cf3b
+EBUILD tomcat-el-api-9.0.68.ebuild 1076 BLAKE2B 45700d1bc3ed251e678a22e6a1bff5a4b868adc0ec00041c19cf172dae7e2bcf6893295d47f574a1a19088d61fda870281259cf9def483dd5f950f3077ec4d24 SHA512 5066ba19d61dec2d1bc18f9843947f8f041b134d82a415b9ec7592a1df7cb4682e985dcf57e74c65bfb71decda5fda3cf16901990fc7838d629c93543248e94b
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-el-api/metadata.xml b/dev-java/tomcat-el-api/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/tomcat-el-api/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..ad9a1a45f60b
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.0.ebuild
@@ -0,0 +1,36 @@
+# 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-9.0.68.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.68.ebuild
new file mode 100644
index 000000000000..5aa4a644ef09
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-9.0.68.ebuild
@@ -0,0 +1,36 @@
+# 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:9.0.68"
+
+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="3.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/javax/el"
+
+src_prepare() {
+ default
+ # remove anything related to "el" or "jsp"
+ find java/javax \( -name 'jsp' -o -name 'servlet' \) \
+ -exec rm -rf {} + || die "removing jsp failed"
+
+ mkdir resources || "creating \"resources\" failed"
+ cp -r java/javax resources || "cannot copy to \"resources\" dir"
+ find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
new file mode 100644
index 000000000000..d878e46e5e1a
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -0,0 +1,5 @@
+DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c
+DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
+EBUILD tomcat-jsp-api-10.1.0.ebuild 1125 BLAKE2B 5c59fe6a146a1540ee6bacdb34d80b3d171f97a7c902b5cbb0e7a49fb04f2d6baaec3561dabb3a7c95d9411629bf5b0ed654535d09bd59553b2653a3456695a7 SHA512 3162b038a1dcce3557941f850e430f55d95acdbaa9916c4b5c59cb12f9afebb9bad2fbdedfb59e3cbdfb43f409dea9baaa5051ce5f94a48d889a54d091b9595b
+EBUILD tomcat-jsp-api-9.0.68.ebuild 1119 BLAKE2B 1273b3f1f9c82d68e2f4cf035f009342921c02175f4f1431ac36920cbb48975688e26b3ee5b556280e680a6005398168c32611717c71175ae774f19370069752 SHA512 eb9c5994b8459e4c2baf9a0bf843e953d841165998499600afef7d591d12b1dddb1733810763ea7c19ba65f61b23940b78c2e680e20ed9cb426f4f70886bde31
+MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-jsp-api/metadata.xml b/dev-java/tomcat-jsp-api/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..f488e2afebd2
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.0.ebuild
@@ -0,0 +1,43 @@
+# 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-9.0.68.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68.ebuild
new file mode 100644
index 000000000000..9bc55855a97f
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68.ebuild
@@ -0,0 +1,43 @@
+# 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:9.0.68"
+
+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="2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+ ~dev-java/tomcat-el-api-${PV}:3.0
+ ~dev-java/tomcat-servlet-api-${PV}:4.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/javax/servlet/jsp"
+
+src_prepare() {
+ default
+ mkdir -p resources/javax/servlet || "creating \"resources\" failed"
+ cp -r {java,resources}/javax/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-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 0f2476f2a63f..32c1d67a0550 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -11,9 +11,10 @@ DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a88
DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
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.23.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a
EBUILD tomcat-servlet-api-10.0.26.ebuild 3025 BLAKE2B 2198be652150c8c8d0cb4c7dab9beca30094e184e1812038df79b193a8c3c148d076fe8164a9d0b746b667dfbe9b261da266513573352229980b3481faf4fb56 SHA512 5ea6ad3fba96aef3ff05897fb1a13f58b7b106a6b9a8dc265851747719592dda261fa6b7fca1640c1dc1b3aa4e4e75b5ba8e22d4a2797a66f8b708bdfb5ed32b
-EBUILD tomcat-servlet-api-10.1.0.ebuild 3023 BLAKE2B 53295a63ac3daab543803c970f5ad23177f7c4299c8cc0a75b770054c3effd23105669a2a5e7e5db6eba6fe2168d854a56452d82d80ef8c70d30413aaa3621de SHA512 f4033ad46e70449c756cba28521baee9772aa04255a2f4ad727b90675dcfb7f45976567ba8b94025ea9cc8644b7124939f8bae77d6de2dfde5e9c0c501a67608
+EBUILD tomcat-servlet-api-10.1.0-r1.ebuild 1172 BLAKE2B 4f7067a7e31c04bf55c66c0fa25c10a3744bc6e010db04ad922739b4ad57130e667da67c3513636ecbd61f126866e9edafa0c05dedaed2a60ce4adc875183971 SHA512 73640743378e8914d06fd4ab02cb7418356b03b152e24272a3600a14eaaaa85045c8e4f47378c3bb397a6bf08a9366fe13aa3f2bf574cdc6cc33ed1ed10756e6
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
@@ -21,4 +22,5 @@ EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf
EBUILD tomcat-servlet-api-8.5.82.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
EBUILD tomcat-servlet-api-9.0.65.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
EBUILD tomcat-servlet-api-9.0.67.ebuild 3013 BLAKE2B 642b4fd0b2c0703f48dc9b0354dc9df887d149485ca538a9450ee2110cee17dc145be54538d27c21da079db942543cc7e7ffa4206cb3e2c8f755b2dbf0159012 SHA512 adb2ef89bfa5e7b111b0135ae318ea5989d0f5350ccaa23053108a1c53a17aa2b908eab00879c3e384edb22630dec79d582ed682ffd8fff6eba58470d77e977d
+EBUILD tomcat-servlet-api-9.0.68.ebuild 1166 BLAKE2B 718a2cc124743c9fdb34cffad24dcd1590a12e5617bb2b4c69e9a204bd7c08c534487aa6aa92d1946747d994ab4d1182c45122d7645bafb274571b44350620ec SHA512 8de007c84239c733ce28fc7480daeeb1a8cb489a2deb0176318b113cbdcbeabc0c2d1be32830fccac46d46ecae78bed9d8e70d61f35df37946556f070955a955
MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
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
new file mode 100644
index 000000000000..d02b51329361
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.0-r1.ebuild
@@ -0,0 +1,43 @@
+# 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.0.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.0.ebuild
deleted file mode 100644
index cb931c0af8c5..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.0.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 6.0/JSP API 3.1/EL API 5.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="6.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-11:*"
-
-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-9.0.68.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68.ebuild
new file mode 100644
index 000000000000..7a5b784fa0df
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68.ebuild
@@ -0,0 +1,43 @@
+# 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:9.0.68"
+
+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="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="~dev-java/tomcat-el-api-${PV}:3.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/javax/servlet"
+
+src_prepare() {
+ default
+ # remove anything related to "el" or "jsp"
+ find java/javax \( -name 'el' -o -name 'jsp' \) \
+ -exec rm -rf {} + || die "removing jsp failed"
+
+ mkdir resources || "creating \"resources\" failed"
+ cp -r java/javax resources || "cannot copy to \"resources\" dir"
+ find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 17:24:38 +0000