[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/

[Miroslav Šulc]

commit:     b87c0eda0227000d475abfcefbe371d578764d6d
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 10:46:39 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 15:30:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b87c0eda

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 <AT> gentoo.org>

 www-servers/tomcat/tomcat-10.0.16.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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\