7 files changed, 4 insertions, 147 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 3118469fd116..30127747487a 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index 4b736c1b8b08..86c115a089f1 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -3,6 +3,5 @@ AUX fec-1.0.4-libfec8path.patch 1091 BLAKE2B 4e19c8615b20694f26d3ee5bd83e33ec342
 AUX fec-1.0.4-remove-concurrent-util-imports.patch 3146 BLAKE2B 8716fcc73a5e1030d12709c12d15adb2462c40da5ab896806e4dc8b572fc6d952b6b09c550f1ba4511a84b9a75306804b67526ee34fac33d2f3d4bf453c807f9 SHA512 592cfd6502a000cc1ac02e534e5436cb3d621855cc682a4588a5fd6f17c8d7f4811743fa9dbcd30851221ba55ab2adb188f6dc9e32f8735651edd28e032803a6
 AUX fec-1.0.4-soname.patch 790 BLAKE2B 852ef6ec83d42a15bfb1d67b05364d15c3027a8579d5e90dab4dec4cc99273383d89f5d5174ec8a6e2ab3cb09986d3fd60f39aedec6ae2da3f893325f88756c4 SHA512 1586fc0408274fff7eb3ba2cd95cfac8a94dad9981e2e01e8e11642692d2a27068936b673364c9c2cc70ca848d364648a66c728dc41d85c605a25b7fe79e2ec3
 DIST fec-1.0.4.tar.gz 449406 BLAKE2B 132bb87ff0da35b9a1830d014c46fb82209b344d159b88c6dbf36c706de668cdb2dfc10894690009e9a47f461100beaf9cf25ad1c75a3b18194e5499457bcb6b SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343
-EBUILD fec-1.0.4-r4.ebuild 1545 BLAKE2B a79eb3864e6a6af9ec3d80314d246b4d06a040f6d08ffaa5ad5cf539a928320bd7dd55caefd598744078b74fe01406648405b8e16fc083d5ec67a7826703154f SHA512 53b032dfe28bddce60b3af59a9c41e6241478574f40820cfcbe2f4ecacf8bcf0de00c9fec4d3f83b70843d4bc189853304960e3d98e84384cb216112633b092b
-EBUILD fec-1.0.4-r5.ebuild 1567 BLAKE2B ce1f459c5baf27e4666c2fc326a61df3c74118ec5f18a376ddffcba81769958ff85cae56d04486b530c0c0f35132e7cd60b84611dfc39997c1e632309cc51d15 SHA512 8cced82ee80ea14f4769ae04e0d65fc70fe77eaca776a3a789bf23c5cb8c7e3f2bdd001a2108db6a27cdd8cda9d2693466b7b8701a3195b1912dae5bdee06b70
+EBUILD fec-1.0.4-r5.ebuild 1565 BLAKE2B 54ef981d6d8f1071ac1d28bd4da7b80e8234f89745766d813b84ab3cee04216e2021ff1cd89280d3854a096dafdcc1a5db1577056993cd38fa133db09b59b8d4 SHA512 4330a5fd33fece3ea302a01abe627cb9d643f2e7b12411bc9afa5658a74aa140e8f96a942a2194ad040c1b0162d71141dbb65d3f2ffaae70e369c8a597341b88
 MISC metadata.xml 318 BLAKE2B 463fade62b1a73b7fc75e7bd39e0e8f2d6d2450225af9001519bd14aeb48cf6bb8914f33b075388c683869d282f41ab2a1b2eba634ad43ac5c57d21be965dd22 SHA512 2434a4abc9ba27242e805fde38b3bce7785b44c3c9f9f89dcb8cec0b08776c0a4d64e0c9a3be0d86fd600256c8523d4020a3702b753b8f7b3770e6a73983ac7a
diff --git a/dev-java/fec/fec-1.0.4-r4.ebuild b/dev-java/fec/fec-1.0.4-r4.ebuild
deleted file mode 100644
index 62b81cfdee9d..000000000000
--- a/dev-java/fec/fec-1.0.4-r4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-JAVA_PKG_IUSE="doc source"
-
-inherit flag-o-matic toolchain-funcs java-pkg-2 java-ant-2
-
-DESCRIPTION="Forward Error Correction library in Java"
-HOMEPAGE="https://github.com/hyphanet/contrib/blob/master/README"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-CDEPEND="dev-java/log4j-12-api:2"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-PATCHES=(
-	"${FILESDIR}"/"${P}-libfec8path.patch"
-	"${FILESDIR}"/"${P}-build.patch"
-	"${FILESDIR}"/"${P}-soname.patch"
-	"${FILESDIR}"/"${P}-remove-concurrent-util-imports.patch"
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
-EANT_GENTOO_CLASSPATH="log4j-12-api-2"
-EANT_BUILD_TARGET="jars"
-
-# There seems to be unit tests, but they are in such a state.
-RESTRICT="test"
-
-src_prepare() {
-	# Apply patches.
-	default
-
-	# In fact, we'll wipe tests altogether.
-	rm -rf tests || die
-
-	# Get rid of bundled jars.
-	java-pkg_clean
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-	einfo "Sucessfully compiled Java classes!"
-
-	cd "${S}"/src/csrc || die
-	append-flags -fPIC
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)"
-	einfo "Sucessfully compiled C files!"
-}
-
-src_install() {
-	java-pkg_newjar "lib/onion-${PN}.jar" "${PN}.jar"
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/com
-	dolib.so src/csrc/libfec{8,16}.so
-}
diff --git a/dev-java/fec/fec-1.0.4-r5.ebuild b/dev-java/fec/fec-1.0.4-r5.ebuild
index e55373ea5fdb..65c72bd07d18 100644
--- a/dev-java/fec/fec-1.0.4-r5.ebuild
+++ b/dev-java/fec/fec-1.0.4-r5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 CP_DEPEND="dev-java/log4j-12-api:2"
 
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index dd2d7ee10eb7..7805d0664f28 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,4 +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 1372 BLAKE2B 3bf3aa00c677ce323d193097db305bfb67e38059e59076b14d4748f7975838166010ba9f72c08fd4ec399f98b5375ef14a8661125eb733ac456b8784fdbb1db6 SHA512 9e6375e10264cfcd62dc1239e9ea9fe71b38f6723cc7737a840475f00b026e5037eae6e2d98d519b34b6489a8cc7074521230e52cb73165d60526995d083aae9
+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
index 453dcfef7068..fdebeaa445de 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CP_DEPEND="
 	dev-java/javax-jsp-api:2.0