3 files changed, 57 insertions, 74 deletions
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index f7825464b1a5..7805d0664f28 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,3 +1,3 @@
 DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
-EBUILD javahelp-2.0.05_p20170719-r3.ebuild 1612 BLAKE2B 200c30695215557ec36930715715a0dd758b7b49d09b670a7c705b53c6ddf69e9a28b4f865fa1c341c1815d26d9fd9337c8ed61ce3a904a5b7aba05aeff93a2c SHA512 cd34ea7328258e5d9a36aaff43b17e5734bbcaca80c8bb9bd9a12b114be8713f1883faf4ddda209d0d85afe28c655ead198ed5a267a164d0b14be5f31bc2ca31
+EBUILD javahelp-2.0.05_p20170719-r4.ebuild 1370 BLAKE2B fad8ed894b86fac5a30f36049d5298d61ba1ac448e502ab3eefaa0a52092cefa9e90961554b079f5ce0d9645adde80a2fbb02527dc88e977d24b92fcf0b269ad SHA512 377ee198ce0ae36b3881a89c150c39651ff12371115c1b67c75a3c5f68c4489251b9e99726729d8598322cda07f27cf2e680958201a19828afbe1617cc09e5d0
 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
deleted file mode 100644
index 73a927bee381..000000000000
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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 x86"
-
-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/javahelp/javahelp-2.0.05_p20170719-r4.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
new file mode 100644
index 000000000000..fdebeaa445de
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The JavaHelp system online help system"
+HOMEPAGE="https://javaee.github.io/javahelp/"
+COMMIT="3ca862d8626096770598a3a256886d205246f4a4"
+SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CP_DEPEND="
+	dev-java/javax-jsp-api:2.0
+	dev-java/javax-servlet-api:2.5
+"
+
+DEPEND="${CP_DEPEND}
+	virtual/jdk:1.8"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_JAR_FILENAME="jhall.jar"
+JAVA_GENTOO_CLASSPATH_EXTRA="javahelp_nbproject/lib/jdic-stub.jar"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR=(
+	jhMaster/JavaHelp/src/{new,impl}
+	jhMaster/JSearch/{client,indexer}
+)
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir res || die
+	pushd jhMaster/JavaHelp/src/new >> /dev/null || die
+		find -type f ! -name '*.java' | xargs cp --parents -t ../../../../res || die
+	popd >> /dev/null || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	java-pkg_dolauncher jhsearch \
+		--main com.sun.java.help.search.QueryEngine
+	java-pkg_dolauncher jhindexer \
+		--main com.sun.java.help.search.Indexer
+
+	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
+}