From 5f744617f4eed9f14b586e5cf94565095244b3cf Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Sun, 29 Jan 2023 16:13:45 +0100 Subject: dev-java/javahelp: switch from java-virtuals to tomcat-servlet-api MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Miroslav Šulc --- .../javahelp/javahelp-2.0.05_p20170719-r1.ebuild | 70 ---------------------- .../javahelp/javahelp-2.0.05_p20170719-r2.ebuild | 70 ++++++++++++++++++++++ 2 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild create mode 100644 dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild (limited to 'dev-java/javahelp') diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild deleted file mode 100644 index d617465487ec..000000000000 --- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# 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 -} diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild new file mode 100644 index 000000000000..19a57920dc55 --- /dev/null +++ b/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild @@ -0,0 +1,70 @@ +# 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 +} -- cgit v1.2.3