gentoo auto-resync : 05:03:2023 - 23:52:45

4 files changed, 12 insertions, 13 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index e4bcbdb53c52..c357a18787ba 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -11,12 +11,12 @@ AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b44
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
 DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
-DIST apache-tomcat-10.1.6-src.tar.gz 6073924 BLAKE2B debc363395becd96a856a03ffd5846e786c27781318b9c08c428498a010dc77e334e6fd15ffea1545dc15b1c226fdd73f24d15f70361b39d37316c48a0c5e66e SHA512 54df5784fbbe9c29b5569783c836e1490a6c08610ffe3c98123cc8bee8b483fcb73f46a15487dc5a6c9c7926ba63bab79e1794b07c00c22798ea0984e56f12f5
-DIST apache-tomcat-10.1.6-src.tar.gz.asc 849 BLAKE2B 71f512c0def69b9c23d4440a988f1f889c57c55e731fc00080a6c919c13360ad2b8a7bbdc65b0e632b5e4b66eb96e58301d720fb433b3b3b50e107de17fd6fe6 SHA512 51d560236ebdc9f9c6e77e6ac98306ec8e9e3079efda7f0a2b6cb0cc3256571881acd891668d606d873d0b5a1be3ba3cd5a095d44cba6e852f1cd5fd8e1e9d41
+DIST apache-tomcat-10.1.7-src.tar.gz 6075723 BLAKE2B ef00c3c43a6cd6c68b09930fd7dc8f822b49f5cec3a0c2b3dad1cb20e5f37ff17f35dfd48c5a8537dedbb9c3887620b6e0ec29272a002df46aa8fa0e5ccbaaa7 SHA512 3daeb5cb3650382224ba4b5cf830c7288531b7f565fdde4a8acca1ee66bebbbfafb4790a6ce50b965e176e9669203e90342e61d42d1656fd12f656d9394c3283
+DIST apache-tomcat-10.1.7-src.tar.gz.asc 849 BLAKE2B 79d5d6885dd3304999a3ec1e16ffeca95df0b0b135ad6733b932b745e248bfd84be06f7eb70588167e7a8b74c4fa1db93cfba99dee10b8ebc00b7ce46226e128 SHA512 ae5c9238ea33743ed40dc74e47e6441f52437322376df94b770dd00e354dc67851cedeb2b4b1148262bdb12b15f7ded49d0f5ee050d451006fa81c5c86b20768
 DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736
 DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5
-DIST apache-tomcat-8.5.86-src.tar.gz 6038952 BLAKE2B b57a203fb2e215f0a07485d5ae70398e0e2d56b37cd7172f33680c8b57faa97929904349ee93b3d975cb24ac2c9e2d15240d59d4a3295d0a7deb96b8069269ef SHA512 fbc57d314fb8885e9986a26515b6536f2bffdb3476af71417eb9dab1623f36ea80da431bc1dc8874aa99dd6575919a0d3a828d84a87404a73ed22de601097e12
-DIST apache-tomcat-8.5.86-src.tar.gz.asc 849 BLAKE2B ff388f97a189c9b45eaac42a1e670c8cddf52903421f053ec1df0518937f3c8b0bc650009cc93bb0a7440aa0607f955bbc219d80a34ab050851554b5736f3235 SHA512 85e961b6569e6c8421b83246653c86a53843232dc7a3eb5d466e6f11fb4b4f1a5dcee43403a43c8950774395acf7f576f7184c7dfa84084f08ff9a203b6104fd
+DIST apache-tomcat-8.5.87-src.tar.gz 6041463 BLAKE2B 2b41e324be028b9bf4db3fcd32a45ad6a84644535c20c5a46c7850c8b0ee054130a7fa5091009928b71c8ece2f24f49530845727cc3f1b6d5907de07d7ad3703 SHA512 cd15fc27c781a0835ec5c35726832f51abfc8bba9b647e690b3dadb7141b5c96b5014f0d6ebf46277d43cf10e2839ef0229dccf87c0449f2004ae90041ef10b6
+DIST apache-tomcat-8.5.87-src.tar.gz.asc 849 BLAKE2B 05a5911b344b5ffdcb392189b64dc4c4d31d000a8b653338780e74ab569a3b024a13b491ba4946bbf68b5955af65df05bfe7b4795a120977f1b26a2bcff0c96d SHA512 fb56af00d3f9302251e65a08d852992192137eeed0eecf100bcfafb778e01dfb92fc024f47ef41ca71f01eebb3622fcaa53fcb776403939313502039080a2b4c
 DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
 DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
 DIST apache-tomcat-9.0.73-src.tar.gz 6229040 BLAKE2B 97b1348e532eea75c4d0723c314cc24a9c13bd4a948a8eea4d1ee1c5121472f2fedec7d30c240b2617a51ef57898fbd96c254f9d84c9e943ebe808f1dba4cf16 SHA512 1691a0087ceaf2100ce17fe9b9a973d079c39b20effbe0c0d68f92d2684a681e001b0c2b8bde40c289754ac02ba02f9eb4dfac617fccb8f451c96dfdd4741237
@@ -26,9 +26,9 @@ DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd
 DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174 SHA512 7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608
 DIST biz.aQute.bndlib-6.4.0.jar 3200265 BLAKE2B c8b8c1d0ff398e2a701edc4431cd8d65671a5e5daa0ef04be6b02eabb570768e0202640c15ce1290a5ae21bb31700a89f2822826851d7dc026267cb31da9f1ef SHA512 15a20751d879291c31b6530cb0d51652bf5bb33bf944ed703369eada439df6464190c01e2872ea6e7535209abd0b4692ea8980499d4b43edfffcc5729633c85d
 EBUILD tomcat-10.1.5.ebuild 6535 BLAKE2B 5af622a02ce2b9efcbba0949dd617ae1c2b53155765d164f26a6172097f1b67f9605132804f4370788e4a8ea39f6b9e5e8d03956bc0a14fb4ff263bbb41f333a SHA512 f64bd088116ce2ffe04b3c53f98872ce5cf580b90351272b4751be52658c9995c2be636497e2a54c8f77ac15d2341ce1fcedf245e6a66bf42e323af20bd90f71
-EBUILD tomcat-10.1.6.ebuild 5783 BLAKE2B 5300d363f89d12e35da7b0fffab29e01d92e84998af99fd57f08472002d1bbdc3bd2ce26813c7001d4a32b3fd86f6d9ffaf65a5de90fac364b3fb28e95e39acc SHA512 f09246b33310d1f69040134c231d9be84953060ac6901ae37a1303396b9a803286cadc16fa1fd443c5ff22ecfd0371aa419b65b47b9cb982c14e33c7226acd13
+EBUILD tomcat-10.1.7.ebuild 5787 BLAKE2B c75a963504b636477be460f2fb1938b5ebd2aa757c563a2dab47c075b86ce9dbae54ac17f01fb88c4b53daf3a6b04b15567e6c6e3f06bc2dee5657683bf94f1c SHA512 1d3f73161a73c3a5513bc78b391eec20a4a332529fc9f2370581015a83404edd7e01f767c3126b4cd25392985d0b84a05f1825c70ed431af4c5056ee9734e92f
 EBUILD tomcat-8.5.85.ebuild 5433 BLAKE2B 23d065fe01d845eea65eb05b826d84423e9e90fe9bc19077f0fe84765e3bf37ca0b1996276effdc701a8b7a87f23fadb322eb93d26cd65112128499172d48918 SHA512 d3e1cd656754f5e2bd02fba376c08ad2fdcae4aea6235c973cf525a59fe0436c2e20e47bf10503898ae3e1cd16f1673e310739d40af155ff5393d93cdc36f601
-EBUILD tomcat-8.5.86.ebuild 4646 BLAKE2B 237aebb86a0e312b7532560919cb7f776193006ea2579d56ffa7f0f30227593d24aa612c8024c124dd474e81bc6bd15f5bbd632a6bcfa8d58e0075bcb0cfb65d SHA512 d8bb2566960bcc3bad739170a5d7b70a305bf72a558e657da4dd06a88a08ee6740228dec14f374510bd6b68d4b9e231489c0ca4dffb45334e524c4247b4d1317
+EBUILD tomcat-8.5.87.ebuild 4650 BLAKE2B c16f87d43ded61e661d3ac4031e2372cbcdf6fca64afb0f7a76d1ab71bcf2fd73096b8afe5239b6efb103c2763b52805d52571ff3f9f133e6a8ffc1dc2e011e5 SHA512 7e213a31359181a6f2cae5e6c9836b0825fd2fd51a130daf83cd44b74f48374fea451bc48822da85128173e336438b6f0b1145aec9fd0606f6d03b0ea6515f0e
 EBUILD tomcat-9.0.71-r1.ebuild 6424 BLAKE2B 2189fb588d1e9d65c7ba6e00acc2db9bf747af77693011e9333be410a217c4c6aea6836e168f3b2929edbd63d32d5d45ed443f4e950702ee8b80482f9409ddff SHA512 64bd43df27bad8e5119e1e42d5af81a9a8381a108be27dcb3f143ad4755215aeab7424acf3a389a237cc139603a8c38603dda81f961e34c1a509e3d136bd2766
-EBUILD tomcat-9.0.73.ebuild 5674 BLAKE2B f761a20ce3dc21024b5ff0df6cf4a4e2cff84ebe6517ac5279a0f15ac98a9178068abc2d6441f5e4e8b2cec28cc111ef070384d8c58a6991c863a9f8556ef0d3 SHA512 798ea957cd803b4c0b0003c5694f92ec1ce4788e1fd620a7891143df3ea967708771098b2be66c2146be0d7724f1279f154cf39c459d52cad8f2ad150abe9515
+EBUILD tomcat-9.0.73.ebuild 5666 BLAKE2B 203fe318dfca6ce7d3d0ef6a5466f42296379ceeed332fe9f0d51c0e89ab118f3004da430d818acd35b10bddcc7b281a7725b072284bbaaeb0b882f32dbec9e6 SHA512 c4f1936a987e8e340c4ff34628cb6c84bffc1ed822a7a9a6f3707d86556e489163a2a6f46d80083aab87eff9cf4b2a88fc11b7e915b228e3f54b82f09becd05b
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-10.1.6.ebuild b/www-servers/tomcat/tomcat-10.1.7.ebuild
index 17af3cdb9074..a2d0614c3733 100644
--- a/www-servers/tomcat/tomcat-10.1.6.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.7.ebuild
@@ -51,6 +51,8 @@ DEPEND="${COMMON_DEP}
 BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
 
+PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" )
+
 S=${WORKDIR}/${MY_P}
 
 BND_HOME="${S}/tomcat-build-libs/bnd"
@@ -75,8 +77,6 @@ src_prepare() {
 
 	find -name '*.jar' -type f -delete -print || die
 
-	eapply "${FILESDIR}/${PN}-10.1.6-build.xml.patch"
-
 	local vm_version="$(java-config -g PROVIDES_VERSION)"
 
 	# For use of catalina.sh in netbeans
diff --git a/www-servers/tomcat/tomcat-8.5.86.ebuild b/www-servers/tomcat/tomcat-8.5.87.ebuild
index e1506972d167..6f5f1a7f9687 100644
--- a/www-servers/tomcat/tomcat-8.5.86.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.87.ebuild
@@ -47,6 +47,8 @@ DEPEND="${COMMON_DEP}
 BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
 
+PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.patch" )
+
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
@@ -54,8 +56,6 @@ src_prepare() {
 
 	find -name '*.jar' -type f -delete -print || die
 
-	eapply "${FILESDIR}/${PN}-8.5.86-build.xml.patch"
-
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
 		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
diff --git a/www-servers/tomcat/tomcat-9.0.73.ebuild b/www-servers/tomcat/tomcat-9.0.73.ebuild
index 106615a65169..3a87d1e05600 100644
--- a/www-servers/tomcat/tomcat-9.0.73.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.73.ebuild
@@ -57,6 +57,7 @@ S=${WORKDIR}/${MY_P}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+	"${FILESDIR}/${PN}-9.0.72-build.xml.patch"
 )
 
 BND_HOME="${S}/tomcat-build-libs/bnd"
@@ -81,8 +82,6 @@ src_prepare() {
 
 	find -name '*.jar' -type f -delete -print || die
 
-	eapply "${FILESDIR}/${PN}-9.0.72-build.xml.patch"
-
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
 		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \