| 1 |
commit: b87c0eda0227000d475abfcefbe371d578764d6d |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 21 10:46:39 2022 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 21 15:30:47 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b87c0eda |
| 7 |
|
| 8 |
www-servers/tomcat: fixed qa warning in 10.0.16 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 12 |
|
| 13 |
www-servers/tomcat/tomcat-10.0.16.ebuild | 4 +++- |
| 14 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/www-servers/tomcat/tomcat-10.0.16.ebuild b/www-servers/tomcat/tomcat-10.0.16.ebuild |
| 17 |
index d629e593150b..39f9b89f0c29 100644 |
| 18 |
--- a/www-servers/tomcat/tomcat-10.0.16.ebuild |
| 19 |
+++ b/www-servers/tomcat/tomcat-10.0.16.ebuild |
| 20 |
@@ -77,7 +77,9 @@ src_prepare() { |
| 21 |
rm -rv java/jakarta/{el,servlet} || die |
| 22 |
|
| 23 |
eapply "${FILESDIR}/${PN}-10.0.16-build.xml.patch" |
| 24 |
- java-pkg_is-vm-version-eq 1.8 && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch" |
| 25 |
+ |
| 26 |
+ local vm_version="$(java-config -g PROVIDES_VERSION)" |
| 27 |
+ [[ "${vm_version}" == "1.8" ]] && eapply "${FILESDIR}/${PN}-10.0.16-build.xml-strip-html5.patch" |
| 28 |
|
| 29 |
# For use of catalina.sh in netbeans |
| 30 |
sed -i -e "/^# ----- Execute The Requested Command/ a\ |
Archives