From 5f744617f4eed9f14b586e5cf94565095244b3cf Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Sun, 29 Jan 2023 16:13:45 +0100 Subject: [PATCH] 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 --- ...0719-r1.ebuild => javahelp-2.0.05_p20170719-r2.ebuild} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename dev-java/javahelp/{javahelp-2.0.05_p20170719-r1.ebuild => javahelp-2.0.05_p20170719-r2.ebuild} (86%) 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 d617465487ec1..19a57920dc553 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 \