summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2022-01-21 11:46:39 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2022-01-21 16:30:47 +0100
commitb87c0eda0227000d475abfcefbe371d578764d6d (patch)
tree0f6269d0f93de03e849384a919fbe1bb81a5922d /www-servers
parentapp-emacs/racket-mode: install racket files to SITEETC; BDEPEND for raco (diff)
downloadgentoo-b87c0eda0227000d475abfcefbe371d578764d6d.tar.gz
gentoo-b87c0eda0227000d475abfcefbe371d578764d6d.tar.bz2
gentoo-b87c0eda0227000d475abfcefbe371d578764d6d.zip
www-servers/tomcat: fixed qa warning in 10.0.16
Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/tomcat-10.0.16.ebuild4
1 files changed, 3 insertions, 1 deletions
diff --git a/www-servers/tomcat/tomcat-10.0.16.ebuild b/www-servers/tomcat/tomcat-10.0.16.ebuild
index d629e593150b..39f9b89f0c29 100644
--- a/www-servers/tomcat/tomcat-10.0.16.ebuild
+++ b/www-servers/tomcat/tomcat-10.0.16.ebuild
@@ -77,7 +77,9 @@ src_prepare() {
rm -rv java/jakarta/{el,servlet} || die
eapply "${FILESDIR}/${PN}-10.0.16-build.xml.patch"
- java-pkg_is-vm-version-eq 1.8 && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch"
+
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ [[ "${vm_version}" == "1.8" ]] && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\