public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2018-03-20 22:27 James Le Cuirot
  0 siblings, 0 replies; 20+ messages in thread
From: James Le Cuirot @ 2018-03-20 22:27 UTC (permalink / raw
  To: gentoo-commits

commit:     fd444703a13ebcb49682e729b3ab4c94533d53c2
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 20 22:26:19 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 20 22:26:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd444703

dev-java/javahelp: Bump to 2.0.05_p20170719, EAPI 6

I dropped the doc flag because the javadocs don't build under Java 8.

Bug: https://bugs.gentoo.org/643318
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-java/javahelp/Manifest                         |  1 +
 dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild | 68 ++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index 5e9af92892e..90cce4e3a76 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1 +1,2 @@
+DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
 DIST javahelp2-src-2.0.05_svn63.zip 3747088 BLAKE2B 80f0fd45741d313fd47ccb9874d31636d12f452ff012dc010de2879bf67a22bd58f6fbde7df86117f463a949f7897ec5e1e3721b1fdd1ee0fc794f30152e188f SHA512 ed795dad98f8d80f4cd4cda40b6aea0978cda621b131b1563016c1ddc02afeb37f3626a28003dac26d7fe996274fb9a97e741a500b15d06b1e5a93342020abc3

diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
new file mode 100644
index 00000000000..5c067b1698f
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~x86-macos ~x64-solaris"
+
+CDEPEND="java-virtuals/servlet-api:2.4"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	${CDEPEND}"
+
+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
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2018-04-05  3:29 Aaron Bauman
  0 siblings, 0 replies; 20+ messages in thread
From: Aaron Bauman @ 2018-04-05  3:29 UTC (permalink / raw
  To: gentoo-commits

commit:     a32b22df250c417d9f6128ce903893b8dc5a6978
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  5 03:26:32 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Apr  5 03:26:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a32b22df

dev-java/javahelp: amd64 stable

Bug: https://bugs.gentoo.org/643318
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
index 5c067b1698f..0b4e4289698 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719.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 ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 CDEPEND="java-virtuals/servlet-api:2.4"
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2018-04-15 13:58 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2018-04-15 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     47291699203298c6fb71c450f2e9e228cd790ba2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 13:57:38 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 13:57:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47291699

dev-java/javahelp: Remove 2.0.05_p63

Closes: https://bugs.gentoo.org/642636
Bug: https://bugs.gentoo.org/643318
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-java/javahelp/Manifest                   |  1 -
 dev-java/javahelp/javahelp-2.0.05_p63.ebuild | 86 ----------------------------
 2 files changed, 87 deletions(-)

diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index 90cce4e3a76..3c7c14bb613 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,2 +1 @@
 DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
-DIST javahelp2-src-2.0.05_svn63.zip 3747088 BLAKE2B 80f0fd45741d313fd47ccb9874d31636d12f452ff012dc010de2879bf67a22bd58f6fbde7df86117f463a949f7897ec5e1e3721b1fdd1ee0fc794f30152e188f SHA512 ed795dad98f8d80f4cd4cda40b6aea0978cda621b131b1563016c1ddc02afeb37f3626a28003dac26d7fe996274fb9a97e741a500b15d06b1e5a93342020abc3

diff --git a/dev-java/javahelp/javahelp-2.0.05_p63.ebuild b/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
deleted file mode 100644
index bd11008d4d6..00000000000
--- a/dev-java/javahelp/javahelp-2.0.05_p63.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-WANT_ANT_TASKS="ant-nodeps"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit versionator java-pkg-2 java-ant-2
-
-DESCRIPTION="The JavaHelp system online help system"
-HOMEPAGE="https://javahelp.dev.java.net/"
-
-MY_PV="${PV/_p/_svn}"
-MY_PN="${PN}2"
-SRC_URI="https://${PN}.dev.java.net/files/documents/5985/145533/${MY_PN}-src-${MY_PV}.zip"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-COMMON_DEP="
-	java-virtuals/servlet-api:2.4"
-RDEPEND="
-	>=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND="
-	>=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}/"
-BDIR="${S}/javahelp_nbproject"
-
-src_unpack() {
-	unpack ${A}
-	# jdic does not currently build out of the box against the browsers we have
-	cd "${S}/jhMaster/JavaHelp/src/new/" || die
-	rm -v javax/help/plaf/basic/BasicNativeContentViewerUI.java || die
-	mkdir "${BDIR}/lib" && cd "${BDIR}/lib" || die
-	java-pkg_jar-from --virtual servlet-api-2.4
-	java-pkg_filter-compiler jikes
-}
-
-_eant() {
-	cd ${BDIR} || die
-	eant \
-		-Dservlet-jar="$(java-pkg_getjar --virtual servlet-api-2.4 servlet-api.jar)" \
-		-Djsp-jar="$(java-pkg_getjar --virtual servlet-api-2.4 jsp-api.jar)" \
-		-Djdic-jar-present=true \
-		-Djdic-zip-present=true \
-		-Dtomcat-zip-present=true \
-		-Dservlet-jar-present=true \
-		${@}
-}
-
-src_compile() {
-	_eant release $(use_doc)
-}
-
-#Does not actually run anything
-#src_test() {
-#	_eant test
-#}
-
-src_install() {
-	pushd jhMaster/JavaHelp >/dev/null || die
-	java-pkg_dojar "${BDIR}"/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 doc && java-pkg_dojavadoc "${BDIR}/dist/lib/javadoc"
-	popd >/dev/null || die
-
-	use source && java-pkg_dosrc \
-		./jhMaster/JSearch/*/com \
-		./jhMaster/JavaHelp/src/*/{javax,com}
-	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
-}
-
-pkg_postinst() {
-	elog "Native browser integration is disabled because it needs jdic"
-	elog "which does not build out of the box. See"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=53897 for progress"
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2020-06-17 19:39 Rick Farina
  0 siblings, 0 replies; 20+ messages in thread
From: Rick Farina @ 2020-06-17 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     57e51c3bf0a3d83f0d299aab9ff72d5b3c5a7511
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 17 19:39:19 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 19:39:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e51c3b

dev-java/javahelp: fix build when system-vm :11

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
index 0caa6c36ddf..60d65c15cbf 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ CDEPEND="java-virtuals/servlet-api:2.4"
 RDEPEND=">=virtual/jre-1.4
 	${CDEPEND}"
 
-DEPEND=">=virtual/jdk-1.4
+DEPEND="virtual/jdk:1.8
 	${CDEPEND}"
 
 S="${WORKDIR}/${PN}-${COMMIT}"


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2020-06-17 20:12 Rick Farina
  0 siblings, 0 replies; 20+ messages in thread
From: Rick Farina @ 2020-06-17 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f5890f65ed72b4b5ce95fc6779d8866a5610f117
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 17 20:12:33 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 20:12:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5890f65

dev-java/javahelp: commit the whole fix

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
index 60d65c15cbf..1ad3e64a20b 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild
@@ -24,6 +24,8 @@ RDEPEND=">=virtual/jre-1.4
 DEPEND="virtual/jdk:1.8
 	${CDEPEND}"
 
+JAVA_PKG_NV_DEPEND="virtual/jdk:1.8"
+
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 _eant() {


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2022-05-09 19:13 Florian Schmaus
  0 siblings, 0 replies; 20+ messages in thread
From: Florian Schmaus @ 2022-05-09 19:13 UTC (permalink / raw
  To: gentoo-commits

commit:     00be693d25c9f34657f940befca45f6630e088b1
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat May  7 11:13:36 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon May  9 19:13:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00be693d

dev-java/javahelp: update EAPI 6 -> 8

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 .../javahelp/javahelp-2.0.05_p20170719-r1.ebuild   | 70 ++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
new file mode 100644
index 000000000000..bfedce9fba1b
--- /dev/null
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 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 ~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
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2022-06-08  8:42 Agostino Sarubbo
  0 siblings, 0 replies; 20+ messages in thread
From: Agostino Sarubbo @ 2022-06-08  8:42 UTC (permalink / raw
  To: gentoo-commits

commit:     c2a3a9cc0bf5345f030bdcd2b6e6a09a6da6a61d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 08:41:57 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 08:41:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2a3a9cc

dev-java/javahelp: amd64 stable wrt bug #850517

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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..2786faf8f314 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"
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2022-06-08  8:46 Agostino Sarubbo
  0 siblings, 0 replies; 20+ messages in thread
From: Agostino Sarubbo @ 2022-06-08  8:46 UTC (permalink / raw
  To: gentoo-commits

commit:     cdc464549986a28ec101b1076346437f60b9c236
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 08:46:43 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 08:46:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc46454

dev-java/javahelp: x86 stable wrt bug #850517

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2786faf8f314..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"
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2022-06-09  6:45 Sam James
  0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2022-06-09  6:45 UTC (permalink / raw
  To: gentoo-commits

commit:     62f66ad1b69fb6ac66c5789abb384a5b5a2347d3
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jun  8 09:33:58 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 06:45:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f66ad1

dev-java/javahelp: drop 2.0.05_p20170719

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/javahelp/javahelp-2.0.05_p20170719.ebuild | 70 ----------------------
 1 file changed, 70 deletions(-)

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
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2023-02-05  9:53 Miroslav Šulc
  0 siblings, 0 replies; 20+ messages in thread
From: Miroslav Šulc @ 2023-02-05  9:53 UTC (permalink / raw
  To: gentoo-commits

commit:     a0a520e59adc25eae015bd7e87f8ced6ff2b4715
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Jan 29 18:05:40 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 09:52:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a520e5

dev-java/javahelp: add github upstream metadata

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/javahelp/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-java/javahelp/metadata.xml b/dev-java/javahelp/metadata.xml
index 308f2cfd932c..1bce4ec84d8e 100644
--- a/dev-java/javahelp/metadata.xml
+++ b/dev-java/javahelp/metadata.xml
@@ -12,4 +12,7 @@
 		implementation of that specification. The JavaHelp system open source
 		project includes the source to the reference implementation.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">javaee/javahelp</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2023-02-05  9:53 Miroslav Šulc
  0 siblings, 0 replies; 20+ messages in thread
From: Miroslav Šulc @ 2023-02-05  9:53 UTC (permalink / raw
  To: gentoo-commits

commit:     5f744617f4eed9f14b586e5cf94565095244b3cf
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Jan 29 15:13:45 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 09:52:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f744617

dev-java/javahelp: switch from java-virtuals to tomcat-servlet-api

Using resin-servlet-api:2.4 which is the second provider in
java-virtulas/servlet-api:2.4 causes compile errors because it does not
provide jsp-api.

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 ...05_p20170719-r1.ebuild => javahelp-2.0.05_p20170719-r2.ebuild} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild
similarity index 86%
rename from dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
rename to dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild
index d617465487ec..19a57920dc55 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ 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"
+CDEPEND="dev-java/tomcat-servlet-api:2.4"
 
 RDEPEND=">=virtual/jre-1.4
 	${CDEPEND}"
@@ -30,8 +30,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)
+		servlet_jar=$(java-pkg_getjar tomcat-servlet-api-2.4 servlet-api.jar) \
+		jsp_jar=$(java-pkg_getjar tomcat-servlet-api-2.4 jsp-api.jar)
 
 	eant \
 		-f javahelp_nbproject/build.xml \


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2023-03-01  7:17 Miroslav Šulc
  0 siblings, 0 replies; 20+ messages in thread
From: Miroslav Šulc @ 2023-03-01  7:17 UTC (permalink / raw
  To: gentoo-commits

commit:     d1d003671a518b454608ec4e2aed248dae13a6e0
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Feb 28 09:07:02 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Mar  1 07:17:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d00367

dev-java/javahelp: use javax-{jsp,servlet}-api instead of tomcat-*

- min jre-1.8:*
- drops keywords, dependencies are not yet keyworded.

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29851
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../javahelp/javahelp-2.0.05_p20170719-r3.ebuild   | 73 ++++++++++++++++++++++
 1 file changed, 73 insertions(+)

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
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2023-03-03 17:17 Arthur Zamarin
  0 siblings, 0 replies; 20+ messages in thread
From: Arthur Zamarin @ 2023-03-03 17:17 UTC (permalink / raw
  To: gentoo-commits

commit:     9d5725ab13f0851aef8dd9fe684e4a3ca7e81f7c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  3 17:17:19 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar  3 17:17:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d5725ab

dev-java/javahelp: Keyword 2.0.05_p20170719-r3 x86, #898518

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild
index 22bd218ccce3..ddc5d9fcad3e 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.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"
+KEYWORDS="~amd64 ~x86"
 
 CDEPEND="
 	dev-java/javax-jsp-api:2.0


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2023-03-30 17:11 Sam James
  0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2023-03-30 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     123c51d64c1ccb6c442bdd1043a3f901e0b5ad34
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 17:10:47 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 17:10:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123c51d6

dev-java/javahelp: Stabilize 2.0.05_p20170719-r3 x86, #903601

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild
index ddc5d9fcad3e..d02848a727ac 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.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"
+KEYWORDS="~amd64 x86"
 
 CDEPEND="
 	dev-java/javax-jsp-api:2.0


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2023-03-30 17:11 Sam James
  0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2023-03-30 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     fe3f3c5b78f9e540c10151c2c3ff83042ba2d63f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 17:10:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 17:10:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3f3c5b

dev-java/javahelp: Stabilize 2.0.05_p20170719-r3 amd64, #903601

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild
index d02848a727ac..73a927bee381 100644
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.ebuild
+++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r3.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"
+KEYWORDS="amd64 x86"
 
 CDEPEND="
 	dev-java/javax-jsp-api:2.0


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2023-03-31  6:36 Miroslav Šulc
  0 siblings, 0 replies; 20+ messages in thread
From: Miroslav Šulc @ 2023-03-31  6:36 UTC (permalink / raw
  To: gentoo-commits

commit:     4ba0074a51053308cf9970c4dbd6a9a1942be3a8
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Mar 30 17:18:01 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 06:36:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba0074a

dev-java/javahelp: drop 2.0.05_p20170719-r2

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../javahelp/javahelp-2.0.05_p20170719-r2.ebuild   | 70 ----------------------
 1 file changed, 70 deletions(-)

diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild
deleted file mode 100644
index 19a57920dc55..000000000000
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild
+++ /dev/null
@@ -1,70 +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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CDEPEND="dev-java/tomcat-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 tomcat-servlet-api-2.4 servlet-api.jar) \
-		jsp_jar=$(java-pkg_getjar tomcat-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
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2024-08-08 10:29 Miroslav Šulc
  0 siblings, 0 replies; 20+ messages in thread
From: Miroslav Šulc @ 2024-08-08 10:29 UTC (permalink / raw
  To: gentoo-commits

commit:     9bcc97ab5311bf2326f92aff61400ba16386729a
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Jul 16 09:25:31 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug  8 10:24:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bcc97ab

dev-java/javahelp: rewrite with java-pkg-simple

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37592
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../javahelp/javahelp-2.0.05_p20170719-r4.ebuild   | 56 ++++++++++++++++++++++
 1 file changed, 56 insertions(+)

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..453dcfef7068
--- /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
+}


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2024-09-06 17:48 Sam James
  0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2024-09-06 17:48 UTC (permalink / raw
  To: gentoo-commits

commit:     37365bb7440aa942c073f682f23780284c3c2387
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  6 17:47:55 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  6 17:47:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37365bb7

dev-java/javahelp: Stabilize 2.0.05_p20170719-r4 x86, #939180

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9d8f0f6247b8..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


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2024-09-06 17:48 Sam James
  0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2024-09-06 17:48 UTC (permalink / raw
  To: gentoo-commits

commit:     464a520de73b6afbe30e71d21efcf0f391d431aa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  6 17:47:54 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  6 17:47:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464a520d

dev-java/javahelp: Stabilize 2.0.05_p20170719-r4 amd64, #939180

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/javahelp/javahelp-2.0.05_p20170719-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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..9d8f0f6247b8 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


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/
@ 2024-09-07  7:28 Miroslav Šulc
  0 siblings, 0 replies; 20+ messages in thread
From: Miroslav Šulc @ 2024-09-07  7:28 UTC (permalink / raw
  To: gentoo-commits

commit:     f7d4c595e5d9583d46a698fc0e729ba8b918f366
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Sep  6 18:49:01 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Sep  7 07:28:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d4c595

dev-java/javahelp: drop 2.0.05_p20170719-r3

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/38492
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../javahelp/javahelp-2.0.05_p20170719-r3.ebuild   | 73 ----------------------
 1 file changed, 73 deletions(-)

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
-}


^ permalink raw reply related	[flat|nested] 20+ messages in thread
end of thread, other threads:[~2024-09-07  7:28 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-20 22:27 [gentoo-commits] repo/gentoo:master commit in: dev-java/javahelp/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2018-04-05  3:29 Aaron Bauman
2018-04-15 13:58 Johannes Huber
2020-06-17 19:39 Rick Farina
2020-06-17 20:12 Rick Farina
2022-05-09 19:13 Florian Schmaus
2022-06-08  8:42 Agostino Sarubbo
2022-06-08  8:46 Agostino Sarubbo
2022-06-09  6:45 Sam James
2023-02-05  9:53 Miroslav Šulc
2023-02-05  9:53 Miroslav Šulc
2023-03-01  7:17 Miroslav Šulc
2023-03-03 17:17 Arthur Zamarin
2023-03-30 17:11 Sam James
2023-03-30 17:11 Sam James
2023-03-31  6:36 Miroslav Šulc
2024-08-08 10:29 Miroslav Šulc
2024-09-06 17:48 Sam James
2024-09-06 17:48 Sam James
2024-09-07  7:28 Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox