Skip to content

Commit

Permalink
dev-java/javahelp: switch from java-virtuals to tomcat-servlet-api
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Miroslav Šulc <[email protected]>
  • Loading branch information
vaukai authored and fordfrog committed Feb 5, 2023
1 parent a0a520e commit 5f74461
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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}"
Expand All @@ -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 \
Expand Down

0 comments on commit 5f74461

Please sign in to comment.