gentoo auto-resync : 01:03:2023 - 10:06:27

7 files changed, 120 insertions, 3 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index eee30165e24a..cde903b302f6 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index 82d05ee7d67d..9be905b57703 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,3 +1,4 @@
 DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
 EBUILD javahelp-2.0.05_p20170719-r2.ebuild 1671 BLAKE2B b888661cec8fb5809bad3659fd3350ffc915b27aa3d9291eed88f0a0194aa702358639c7546840a56b20664565bc9442748b25164bf8418b92cab82e2322dab7 SHA512 f5182e636d07e823fc4314fe077a539e86af3d7e265884b62b42dc176dc13d48924d9491a80dd0bcfcbee7f951f3db770880a14099c11f9fb52135fe515b9fe1
+EBUILD javahelp-2.0.05_p20170719-r3.ebuild 1609 BLAKE2B 4b54c58396bd48ef63c1bd69904afc6f20d774985d12fb6f4e7176b23c2e581c47a85a6dfba4ef904d68f25f6480bd15a4a201bb902791c04c67a271222ceffd SHA512 4ed9d7a65a16dfd1d9f65d8846d1f23ac7a44070a371e8f8a4024f75d1a610d1e02b8a1f8da88fe957ffd9ce83e771f31909565180b5b91bce4ef9c76f5b1ef0
 MISC metadata.xml 705 BLAKE2B 99d50e7e4960fd92f1b9f34d830ee22246f88c5224beb09eb581fa10b128753985c991b22a002eb8cc6ecb599475d0d88a50cfeb76734a4d687fc3c34d88686b SHA512 c20f79d6b27ea89d68d8f9655804986827e4bb5fff86b525047d8b34cb1c30c051af76d732da63a38ee9b311e78fdaaa4e3e2fa1232cde0230b7e75f6af37b6f
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild
new file mode 100644
index 000000000000..22bd218ccce3
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="3ca862d8626096770598a3a256886d205246f4a4"
+JAVA_PKG_IUSE="examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The JavaHelp system online help system"
+HOMEPAGE="https://javaee.github.io/javahelp/"
+SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="
+	dev-java/javax-jsp-api:2.0
+	dev-java/javax-servlet-api:2.5
+"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DEPEND="virtual/jdk:1.8
+	${CDEPEND}"
+
+JAVA_PKG_NV_DEPEND="virtual/jdk:1.8"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+_eant() {
+	local \
+		servlet_jar=$(java-pkg_getjars javax-servlet-api-2.5) \
+		jsp_jar=$(java-pkg_getjars javax-jsp-api-2.0)
+
+	eant \
+		-f javahelp_nbproject/build.xml \
+		-Dfile.reference.servlet-api.jar="${servlet_jar}" \
+		-Dfile.reference.jsp-api.jar="${jsp_jar}" \
+		-Dservlet-jar="${servlet_jar}" \
+		-Djsp-jar="${jsp_jar}" \
+		-Dservlet-jar-present=true \
+		-Djsp-jar-present=true \
+		-Dtomcat-zip-present=true \
+		${@}
+}
+
+src_compile() {
+	_eant release
+}
+
+#Does not actually run anything
+#src_test() {
+#	_eant test
+#}
+
+src_install() {
+	java-pkg_dojar javahelp_nbproject/dist/lib/*.jar
+
+	java-pkg_dolauncher jhsearch \
+		--main com.sun.java.help.search.QueryEngine
+	java-pkg_dolauncher jhindexer \
+		--main com.sun.java.help.search.Indexer
+
+	use source && java-pkg_dosrc \
+		jhMaster/JSearch/*/com \
+		jhMaster/JavaHelp/src/*/{javax,com}
+
+	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
+}
diff --git a/dev-java/javax-jsp-api/Manifest b/dev-java/javax-jsp-api/Manifest
index de84ef7ee128..5aa6a2f5ed4c 100644
--- a/dev-java/javax-jsp-api/Manifest
+++ b/dev-java/javax-jsp-api/Manifest
@@ -1,3 +1,5 @@
+DIST jsp-api-2.0-sources.jar 118348 BLAKE2B d9f615961a6ef2afb1447477d44e4f49eaf9137f62ba596c40d7437c8d4973a68f689189255bcc6bae5e5970b23c8e93fbabcad2fb230f54963dad55eef2a8f7 SHA512 4f38ed56e9e51a979488a26fde36905748674e225a10df82259891fa85f8493575a58babb7620b27a96ab7e83002433ae4ee60f700a866e330642c7dd0a0f7a8
 DIST jsp-api-2.2-sources.jar 163137 BLAKE2B 8bac5428393518cb3edb8488eaaab772d37db51dfbc5b466eabcb5b8ccd90cfa4869ebe65d861c64a6c588c8ede3ab1f5ab0c2e9080dde16c0585a7f774abb05 SHA512 ff79c34904372b722501b4479cbf88796017839d636a31b9343ef9104d93e3554154b3124f366295d05a41dc8320ff8bc83e9f8ee971df35c791220065b70647
-EBUILD javax-jsp-api-2.2.ebuild 658 BLAKE2B 4a9e70c74d73808e85fb01f8902f5aab33ca44193207d9bf5860d37223f8d1ae44893f77f62e70d24ce405866daba6459a0afe24eff7b8c999272cc930a21fe9 SHA512 8b977653675d332f472c50fd1738fed4c35271117d0694fd4d3f21c1edd1b28463a74639cc7c8cc69ee61f9eea6af2f8fec32bab6f9d3c9d3ede864fe277be37
-MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
+EBUILD javax-jsp-api-2.0.ebuild 881 BLAKE2B 891baf449a9ddf2bc0bb08ed1e998b4ec4105aa0698d87e559d22e36cec297d67fd4cd0d9147aaf70bf53ce93ac98fad855b08ad424c7d8627661b0811d70aaa SHA512 4bed609acd8e2a80505ff3b0ab5af0a7bb03cb04e18a1fc9bea0e3541977afa9b5f5129b4daa192ff6873e3ac0b44153a86ac594bad19c16fc6bdac982386786
+EBUILD javax-jsp-api-2.2.ebuild 680 BLAKE2B 1514d4292c0773b0399278b4ef429daf6a8905a642cab40db51294615dc436b8d46cf5bce6e2a5ffc44427affc025b908f6f2d76ed25fa1a16f1a1a5c885cdb3 SHA512 f72a7e8abb70be349f07c250f07918e3b0d3d9424f244012785db10780860128760f454d3b65654a697673ef5b797c8f628cb0d47028ed1e462dab81894eee2b
+MISC metadata.xml 401 BLAKE2B 40264e86d6dff5d7213a7fc268e24ae9ac46766871898ddc6f1bf0ec071b6d15d3440f3b8d4670b9d04699d29c02bd31398b760b9c23ede325a30d2eb12d6c8a SHA512 9d2ed45cc0db1fb816a8efa0540beb092ef9598f044db6352c2b703085bf07c3d82f46fdef3f81bd5784f10db84e86e19821292cb638c0e000293f48def2b999
diff --git a/dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild b/dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild
new file mode 100644
index 000000000000..719f7a2a80d6
--- /dev/null
+++ b/dev-java/javax-jsp-api/javax-jsp-api-2.0.ebuild
@@ -0,0 +1,37 @@
+# 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.jsp:jsp-api:2.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JavaServer Pages(TM) API JSR-000152 JSR-000245"
+HOMEPAGE="https://jcp.org/aboutJava/communityprocess/final/jsr152/"
+SRC_URI="https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/${PV}/jsp-api-${PV}-sources.jar"
+
+LICENSE="CDDL GPL-2-with-classpath-exception"
+SLOT="2.0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+CP_DEPEND="dev-java/javax-servlet-api:2.5"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir -p "${JAVA_RESOURCE_DIRS}/javax/servlet/jsp/resources" || die
+	mv dtd/* "${JAVA_RESOURCE_DIRS}/javax/servlet/jsp/resources" || die
+}
diff --git a/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild b/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild
index 08ba0896f5f7..a4d45d389408 100644
--- a/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild
+++ b/dev-java/javax-jsp-api/javax-jsp-api-2.2.ebuild
@@ -8,7 +8,7 @@ MAVEN_ID="javax.servlet.jsp:jsp-api:2.2"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="JavaServer Pages(TM) API"
+DESCRIPTION="JavaServer Pages(TM) API JSR-000152 JSR-000245"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://repo1.maven.org/maven2/javax/servlet/jsp/jsp-api/${PV}/jsp-api-${PV}-sources.jar"
 
diff --git a/dev-java/javax-jsp-api/metadata.xml b/dev-java/javax-jsp-api/metadata.xml
index 75321cfb5598..882410dd6f2e 100644
--- a/dev-java/javax-jsp-api/metadata.xml
+++ b/dev-java/javax-jsp-api/metadata.xml
@@ -4,4 +4,8 @@
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 	</maintainer>
+	<slots>
+		<slot name="2.0">https://jcp.org/aboutJava/communityprocess/final/jsr152/</slot>
+		<slot name="2.2">https://jcp.org/aboutJava/communityprocess/mrel/jsr245/</slot>
+	</slots>
 </pkgmetadata>