gentoo auto-resync : 08:11:2023 - 10:24:46

3 files changed, 43 insertions, 2 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 20179e7c43c5..eb5ce5d01e9c 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,6 @@
 AUX tomcat-10.1.6-build.xml.patch 4856 BLAKE2B ed44d53877c96f06cab6354b034f88ba3382c34eaf504f10c9fcaaaf2b0c812901f3bfca8114f2aab4faa2604800f81f18932ac12065d09846f879edc1eaad96 SHA512 005d0b3fe6e14dca303bc3d5c4ab1fbf35a309be9a8ffcebd24e739301f33f202616e17973dd954bd1bd1ae89978c3147593d42ee2508c56026579d37722470b
 AUX tomcat-8.5.86-build.xml.patch 4164 BLAKE2B 27aba54a5a8e570a9e73ff1133dcdc43ac9536bb2cb8b2542fe3eb12c2c92145066c8d742ff35a6b320515cb91ce9a17a1b0e7954623a68326677b42547f1027 SHA512 7f924be4b979178fc92d7a3b63224c87860ae1795b2cc10e734ff8518d6ab3b15138718ed392b1fb747457d4abf5acf9b5fac13f321cd7e8dd7fe832c0e82577
+AUX tomcat-8.5.95-min.java.patch 1435 BLAKE2B 016eff198e0da7a9659a96e31fd50a0da51841a44920f39eadfb87c634485db843e45ca5fca581c2fe19ac20e2b206099fa6c6820bb3502d3d5011417fe2a83e SHA512 8fa4ec05f2dcfd919abf3b0ef5b33351d22bb882bf11df43742c28ead7c8f868bfc9792f77f3b17dbd38baa5c68c60d1e4e7f4a8c2472f889592975cf45295e2
 AUX tomcat-9.0.37-fix-build-rewrite.patch 448 BLAKE2B 323a726c80b04a225e47b04506969116bccda3fdddca6e00bab85a8a758b58b5461792b8419d56e3f55742218a9dd36ab11e14d7af49ba1be4c8543f1a6c1fb3 SHA512 58413426f3997af610819f55a63c161b5ae2953337fdaddd854b3f4fb239f198434731598d23858cf5911d7506387907a14c0f1cca0df5801767c1f868bf9a07
 AUX tomcat-9.0.50-insufficient-ecj.patch 2747 BLAKE2B d229acd5e0e90323e75eb44e575c893759884df526a8aebb92b648ad3c15b29312153d701472d86406e4be6d7fa646b7b4c2952a01fd42a52dcc8980c6540cfe SHA512 2327b26213a507c91e9bad5a224c2a3925b97cb41a54ddd58bd901266dcb72b355f4378f5ec9911cd3ca1ba5456a98012adfb185cb7d501c4865d414b51355dc
 AUX tomcat-9.0.72-build.xml.patch 3794 BLAKE2B 886bf69f4c78f385249e02e1f91ed91065cd242a4b17db0b852ea6ef5561bf3c5de18a9590ef78c40296075975c92b8620a36224b8e7902dd8f61acba016e197 SHA512 ffa15a7c8ae2a11aab89f4070bf4d2d1eec636fceebedc62a7191449e8e3c5e0e2e969e600b2771762452156c479750af63fe705d20b888159fe59bf59f88b74
@@ -14,6 +15,6 @@ DIST apache-tomcat-9.0.82-src.tar.gz 6285653 BLAKE2B 026a3f5ec58ff78c1fe0a30507f
 DIST apache-tomcat-9.0.82-src.tar.gz.asc 833 BLAKE2B 9874c7ee35d5d4d3ec352799bfc7cfb4b866d3f7da4e2619ac48c212de46dd90510ec36b44409602967bff1c863b60428ec8ca60689814adbb12e83f7ecba695 SHA512 fdb9c5f0004bbf3192cafd4b66bb479de251934a0b82eaaac9bb77894abad3269b383032220ef076f4327e6ddd5b1e76a78917b6b46f467a030351eb5fd5f749
 DIST biz.aQute.bnd-6.4.1.jar 16296222 BLAKE2B d2229eb221dcd87ddadccc48d83f1d86c95f7fd2e551b0523d58d1e14dcf0899201f96cb09c60ada9cd9cb3b6fe5201a68e8a9bb93258d06ed29baebb4fd9260 SHA512 a9b53265fffe48934666b26e5075cb96fac4c3d4cf7273358e551e741adbb58b469eb718022e9b31088d80961c649fb23027a3fde50db1ee0a72ada55df0e96c
 EBUILD tomcat-10.1.15.ebuild 5424 BLAKE2B 2fb20290a6706f500188c997d40a631ddde7e3e0237802e94c3dbb8a57a470a3b822810df404c2a0b1a2f151129c800ec38656792aebf474963b2778d3e52c35 SHA512 db8f9cd36802bf0f197b920b3ea7e85d97609ccad12943fa59d68352b9d46c05dadc04d59cc2e3e59cd68b9b6de73e8305ad39d47c8b4a642b4761c997d0926f
-EBUILD tomcat-8.5.95.ebuild 4628 BLAKE2B 56d062abe716ea52b6bf30a863cfc7097d4b5ed0f4e7dc318fe2717cf1f2728a7d88a2b4cde06794feafd25f7a382e7b902b23fd8a2b4e3c7a1a3388a17efa1c SHA512 cb5106a3c42444990da739c5f6611aad35eee580d0ec91cab1e0c9e812f2563df57cffbf444171467c6ea54467e477fc6fe23e996f76863b6f3bb3a8eac81d74
+EBUILD tomcat-8.5.95-r1.ebuild 4672 BLAKE2B fadb9b875c785d70aababb62125d9046e123bb9d451be6dcb01d43b5b292fe0f247a6215008ac902855857f0a30c43c2ed2672fda17860c4aa5b139fbe08f3d6 SHA512 4cb2c3da06f98200f40b087e7221740ceb88bc1536d9272fabc67cfe66cbbe4a27ea3a05a7d36720893d518bf7f45a3c735d629b03bca5835db2400056575415
 EBUILD tomcat-9.0.82.ebuild 5273 BLAKE2B d294e06ed9ea0119cf52c0d558d2811383c8a95ca92ec67818c612219913310c0bd04df03677c21e6b741d2263d9746d4453b9551c8235014e24798c2951bd85 SHA512 51c47f409080be92e247714bc1d754dc3c088e307099a6d2a57123135a414df1d103f8a5184c54341e20dc56d7baf7ab5d8aff8d0be3c8f0e5a94bba09362361
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
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-r1.ebuild
index d4b11f790044..7c3cee7e4014 100644
--- a/www-servers/tomcat/tomcat-8.5.95.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.95-r1.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}