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

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     5e554b5f850115f621d25cc56261aacab235f3ef
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Nov  3 07:31:12 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Nov  8 08:59:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e554b5f

www-servers/tomcat: min java 1.8 (slot 8.5)

Closes: https://bugs.gentoo.org/916705
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33643
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../tomcat/files/tomcat-8.5.95-min.java.patch      | 37 ++++++++++++++++++++++
 www-servers/tomcat/tomcat-8.5.95.ebuild            |  5 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch b/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch
new file mode 100644
index 000000000000..9198ff3a1911
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch
@@ -0,0 +1,37 @@
+diff --git a/build.xml b/build.xml
+index 723be26..3cf7bb7 100644
+--- a/build.xml
++++ b/build.xml
+@@ -112,8 +112,8 @@
+ 
+   <!-- Java EE 7 platform requires Java 7+ -->
+   <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
+-  <property name="compile.release" value="7"/>
+-  <property name="min.java.version" value="7"/>
++  <property name="compile.release" value="8"/>
++  <property name="min.java.version" value="8"/>
+   <property name="build.java.version" value="11"/>
+ 
+   <!-- Locations to create the JAR artifacts -->
+--- a/webapps/docs/tomcat-docs.xsl
++++ b/webapps/docs/tomcat-docs.xsl
+@@ -39,7 +39,7 @@
+   <xsl:param    name="version"             select="'8.5.x'"/>
+   <xsl:param    name="majorversion"        select="'8'"/>
+   <xsl:param    name="majorminorversion"   select="'8.5'"/>
+-  <xsl:param    name="minjavaversion"      select="'7'"/>
++  <xsl:param    name="minjavaversion"      select="'8'"/>
+   <xsl:param    name="buildjavaversion"    select="'11'"/>
+   <xsl:param    name="antversionrequired"  select="'1.9.10'"/>
+   <xsl:param    name="build-date"          select="'MMM d yyyy'"/>
+--- a/modules/jdbc-pool/build.properties.default
++++ b/modules/jdbc-pool/build.properties.default
+@@ -40,7 +40,7 @@ version.suffix=
+ # contexts by the various build scripts.
+ base.path=${basedir}/includes
+ 
+-compile.release=7
++compile.release=8
+ compile.debug=true
+ 
+ # Do not pass -deprecation (-Xlint:deprecation) flag to javac

diff --git a/www-servers/tomcat/tomcat-8.5.95.ebuild b/www-servers/tomcat/tomcat-8.5.95.ebuild
index d4b11f790044..7c3cee7e4014 100644
--- a/www-servers/tomcat/tomcat-8.5.95.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.95.ebuild
@@ -47,7 +47,10 @@ DEPEND="${COMMON_DEP}
 BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
 
-PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-8.5.86-build.xml.patch"
+	"${FILESDIR}/${PN}-8.5.95-min.java.patch"
+)
 
 S=${WORKDIR}/${MY_P}