gentoo resync : 29.12.2022

3 files changed, 2 insertions, 73 deletions

diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index 425bec062390..04a734b9287f 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-r1.ebuild 1677 BLAKE2B 4cc26c9f82d310c8afe60e7829a2308a6f7c9bfb9bd8da1833b8dfe1ff8e4aea0586e25a1713f697ef01d8d56f61dc84e0b7d27f93822670b0333832048428b1 SHA512 142694a8723240321a55c4a2c28c50f90767c4bf5e18a8bc6f7ee82d2936fc696e8d30e1cde535cfb57c367023ea1df683197d47c1669abfed454f8c98ad5d54
-EBUILD javahelp-2.0.05_p20170719.ebuild 1675 BLAKE2B f34208c7916f586887ec1aaa8406f901b13091e39cc95968c79b8edaf9a24fe95d1e87ebd3e0b98b8f0aac1b830a77dbb40abd87edd4d68877e06e9492e63b05 SHA512 096d8d05f423741b3b7cacbe672c6b2d42a44ede611cff8aaa3252da75f0a0c391f184a8a9f7a93266d5054c0e39c708afdd251a1b984efdacf246de7df2b8fe
+EBUILD javahelp-2.0.05_p20170719-r1.ebuild 1675 BLAKE2B 0c59fde199d25bdcb85ea6eab3b8c49ba18328bd07323262d19aaaee0ec7fe9b1203ddb807f4fc765e007873043081adf21940189c0d4c6cb34e53f70fd48251 SHA512 e873859d2f6bfbf531dd231bde326fbf151b1fba085c1156a497447456b837b82acb62b65bd99850124ab8044b2d848c650c48d5cf2c2456055f32f2c2b4478a
 MISC metadata.xml 625 BLAKE2B b63396d9a8f628c5965eb8eb15071f56456605ce28d247fc191ef808db0f14c464149d3d3bcee746d058addf3d9eed7d12ae59ac94a1d7b0ac4a45f75ccb8b68 SHA512 a1878d27bdb64c2d1ecf2c8107158f8852486d22a5473d852e7a993c63475be17cd13a47de1fd5b29cdcc72dacf09259473b253822c10cddbf2e8dfea8a1fa82
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
index bfedce9fba1b..d617465487ec 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
@@ -14,7 +14,7 @@ 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 CDEPEND="java-virtuals/servlet-api:2.4"
 
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
deleted file mode 100644
index 4761d095147b..000000000000
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CDEPEND="java-virtuals/servlet-api:2.4"
-
-RDEPEND=">=virtual/jre-1.4
-	${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_getjar --virtual servlet-api-2.4 servlet-api.jar) \
-		jsp_jar=$(java-pkg_getjar --virtual servlet-api-2.4 jsp-api.jar)
-
-	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
-}