gentoo auto-resync : 22:03:2023 - 06:41:43

7 files changed, 72 insertions, 6 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 5c886c7310a9..50bf002646eb 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 bd7f93606464..6c694d5220e7 100644
--- a/dev-java/javax-servlet-api/Manifest
+++ b/dev-java/javax-servlet-api/Manifest
@@ -1,3 +1,7 @@
+DIST javax.servlet-api-3.0.1-sources.jar 212871 BLAKE2B aea63157c3c0af5a40b7245ed0cab312b6d21419087d269374446e1c5f13200fb726a4533bf8d843a7e30d26266e4d9ae6c5e0b05004165ffcef14a7d179cf7b SHA512 9a955e4c8973af31f421f5651b0ae0c00fe4966318ef1849af97aa525736e262fa88b312c0acad093f25d7fa2c0903549d3e53b0cbc45afa7a2436b2c2282e7d
+DIST javax.servlet-api-3.1.0-sources.jar 223386 BLAKE2B ca472d1312e3ebb86ac1f0d1971dbaa607143f856e56a5544cf30daa3c23745e0b338ca10f518300627a53adccf284da91c6f70a25001c5a030b3308b23cb89d SHA512 15c9e497a67c1702ff9f987713553ade10ddfc722ea69377e721b8b094491184efc5801aad420fdbbdffd1d23691328c6eb768d5ad580fc00f3a7eaa6411749c
 DIST servlet-api-2.5-sources.jar 158114 BLAKE2B 84997b9cc2122f49a850ac32089eb484bc4f68c4e73c7541cf70f453f0a0eaa0c037d6f2b8c8270d4122502f224a6943011f6a964da406093d0ad4bb173dc71e SHA512 6590adea214ba7f59e033b8f450ca8fd3a0764ac6aaf2789d5824ddeecc4c520d004242e42e3a058517d5f556a41a970f782dfde35b2cf184874a77063dc0fef
 EBUILD javax-servlet-api-2.5.ebuild 827 BLAKE2B b8dfafdf2bc1537acfb941d323b7cf93dfb5987c90161ce1ca0283258b7d400e740ff80daacb271ecb5d23840b954a8c4e9e91d4abc4d67b90f2fa614e3a5ced SHA512 f48c0780a2d792890e1ba48c586c67af2da055771a2519f814dd91b6f1d486318a5adaf554da483c3607e2b90d900dfc3c95a96e6ffe386089ee2ccb697c922c
-MISC metadata.xml 542 BLAKE2B 4c8e24b40b90209b41b13761347e663404e8bd858f600bbed4f64e949deb305c0f4b2c3cd7d765f3a9004a69773b716c0d6ad4354521ab34c0c728d4e06f1ec0 SHA512 f28157173cc061684f1df3a1543c7154ae77d2b87dfc5814268c868c7c5973f3ee513167ae9f786a765a6e10be4a3840061452d8ef9295c5aa4e256633ea278a
+EBUILD javax-servlet-api-3.0.1.ebuild 942 BLAKE2B cd0f994af65398d0a6c96cbc51eeb2cb9b25a8dcb2bdfbfd35b9bbdc82ddec8006a7ea8781a7a3763bd7415ba7e93dc9810e07fbc321007c1c5936294ae67a10 SHA512 e231654d8d6c0884ed6c8f769585a226630a7d7b4dfbf39890677caa21f37cd41b41e337bb4c100b2dac6b16b25ebb874b8e624399e3338f9d552724455861c1
+EBUILD javax-servlet-api-3.1.0.ebuild 946 BLAKE2B be00c47d8d6c922af92b1f9e65483f0959437180e88d3d0386a3d49742ed56fb4478f60dfa496d2aa635d39d879a7f225ccad7ef27679a996568ca1517a2d8c4 SHA512 1fff69bbd79ef7d4f08d6b971fdb8b28829507cf77c5b2f8d5222137d093bf529a0e4b0884f0cf16f1e1dd63b2ced819432f52953b7b1405f41736a4b7156d38
+MISC metadata.xml 716 BLAKE2B 9d83587a19d52fb72bcec32e1d6e0c096ce5dae07085163e7d193342fc81c82d19fd403297db4b2ad07924127397ebd90576ef3d8427dd1e103e83289445ea2a SHA512 e21915025ff8fb317902a55d3d91597b10747fcf5539b3ff277a34a63bcb59ea6238b891596d5478ef56cff515ee1c3d517ae39700e5eb15db274d21936d6da5
diff --git a/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild
new file mode 100644
index 000000000000..6361a7a227f3
--- /dev/null
+++ b/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="javax.servlet:javax.servlet-api:3.0.1"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JavaServlet(TM) Specification JSR-000315"
+HOMEPAGE="https://javaee.github.io/servlet-spec/"
+SRC_URI="https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/${PV}/javax.servlet-api-${PV}-sources.jar"
+
+LICENSE="CDDL GPL-2"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
+	find . -type f ! -name '*.java' | xargs cp --parent -t resources || die
+	echo "Implementation-Version: 3.0.1" > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF"
+	echo "Specification-Version: 3.0" >> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF"
+}
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
new file mode 100644
index 000000000000..c9698cd87f04
--- /dev/null
+++ b/dev-java/javax-servlet-api/javax-servlet-api-3.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="javax.servlet:javax.servlet-api:3.1.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JavaServlet(TM) Specification JSR-000340"
+HOMEPAGE="https://javaee.github.io/servlet-spec/"
+SRC_URI="https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/${PV}/javax.servlet-api-${PV}-sources.jar"
+
+LICENSE="CDDL GPL-2"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
+	echo "Implementation-Version: 3.1.0" > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF"
+	echo "Specification-Version: 3.1" >> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF"
+	find . -type f -name '*.properties' | xargs cp --parent -t resources || die
+}
diff --git a/dev-java/javax-servlet-api/metadata.xml b/dev-java/javax-servlet-api/metadata.xml
index 8295711f93e1..e6e90687d73f 100644
--- a/dev-java/javax-servlet-api/metadata.xml
+++ b/dev-java/javax-servlet-api/metadata.xml
@@ -7,7 +7,9 @@
 	<longdescription>
 		Java Servlet is the foundation web specification in the Java Enterprise Platform. Developers can build web applications using the Servlet API to interact with the request/response workflow.
 	</longdescription>
-	<upstream>
-		<doc>https://jcp.org/aboutJava/communityprocess/mrel/jsr154/</doc>
-	</upstream>
+	<slots>
+		<slot name="2.5">https://jcp.org/aboutJava/communityprocess/final/jsr154/</slot>
+		<slot name="3.1">https://jcp.org/aboutJava/communityprocess/final/jsr340/</slot>
+		<slot name="3.0">https://jcp.org/aboutJava/communityprocess/final/jsr315/</slot>
+	</slots>
 </pkgmetadata>
diff --git a/dev-java/txw2/Manifest b/dev-java/txw2/Manifest
index 39ae9b3ee244..c70a71e36aa4 100644
--- a/dev-java/txw2/Manifest
+++ b/dev-java/txw2/Manifest
@@ -1,3 +1,3 @@
 DIST jaxb-ri-2.3.8.tar.gz 1734411 BLAKE2B e60a7f78f2bfaf23cc0ce6727ee1b1611facdeebd5b456c207260447a508674dcbf934d2c6343cfbb58b93adf3352c8145caa2a8c77e264ae2403351527ff96d SHA512 73fda68e8d936b681d53ec72153cec0f7608517d0f037b4f140e4fd48e26f3e03a88f5b34bb635d0e6c7701121befd7d18a98aebd019a663e08ed9667a39c535
-EBUILD txw2-2.3.8.ebuild 637 BLAKE2B 59946425dd00c35bdc8edcf0edb1ec5af4438d456ed95ebf83a36e27ef115f2a95dd426a43615f75b78b3589725f822251ea514ad3f07eb3a7224d5470719d54 SHA512 aa3762a060e23bbb7712bf26947303712d909f65280a6ddb85e20f9c6fd934528ed47cd2d1178da68e3243379e0c0aa34aa3c959a0cc98978f71c74abbbaf729
+EBUILD txw2-2.3.8-r1.ebuild 636 BLAKE2B 2da7bbb2bdc07954d2b98c89babefd527ddda83c846b530b65f9514ff512f792cb8c9236e33c8e03d44b1b8bf1d908817115ef19aa966a59af9421198ae2d929 SHA512 1f87a0a7fff3c41a0043d9c4634c568c37e4a38e0f2f85cb2756e59a3c45952732c5b0d64522f4240217a16770544361230ab45144987d5c8d695d1dce2a5d2e
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/txw2/txw2-2.3.8.ebuild b/dev-java/txw2/txw2-2.3.8-r1.ebuild
index d2ca3f88b993..81a913a80435 100644
--- a/dev-java/txw2/txw2-2.3.8.ebuild
+++ b/dev-java/txw2/txw2-2.3.8-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="EPL-1.0"
 SLOT="2"
 KEYWORDS="~amd64 ~arm ~ppc64"
 
-DEPEND=">=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
 JAVA_SRC_DIR="src/main/java"