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 \
