gentoo auto-resync : 19:07:2024 - 12:29:09

5 files changed, 9 insertions, 13 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index cccd346bef66..ee0360f073d9 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 83eaae80f1ae..4b30aa1ac38b 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -3,15 +3,15 @@ AUX apache-2.4.59-dh-regression.patch 3066 BLAKE2B 7c4577d8d79d67745d43775e8273c
 AUX apache.conf 94 BLAKE2B b0330849adfc5fc048622b3a256ecb727f3bfa339e6cc7f50843597d3e8d7b6d4463986d8f9a73f3580c93ce571d01f9ba571e0328356b62e5680ede913acc4b SHA512 e954c66da825fd6f84753cd7a50ae2da86daf5da27b37dba484019e8e1adaeb57122ba9a8fd1222e80edac04ca78d807265ef8b275278e4eeef12feb6043597b
 AUX apache2.4-hardened.service 933 BLAKE2B 60cbe1a55ded29299ba7fc453a6f13c456bc702ec77a31ede0904a52c9d726d57ec4d477df74d46e4edab157a2bf930750620c8d369a0b6900b049d9a4619a5c SHA512 711899777ea59995cecda007dca8d9ff6d0650b80990ea3b387f914e923df703e0c71ebaee5d967590c46fc5c588d35390d7c34023ef673c1791a60850efd0e8
 AUX libxmlv212.patch 1033 BLAKE2B 514879d60f8e8799c298c63a871a589e1982c458a6f99a3b48597af2d4bc91803ff8bfc29c57b076efb100f6c5f7cb396589b2e5cd91269ff834575a41c4a963 SHA512 09ea8df9613bcd1f09f87522145c4dd19c8a17d8f3529a5fdff0b0ee42816d26fe01af97037687bbf95b4e1b6454566be19f27427cafb2aa85bce848cb9a56e3
-DIST gentoo-apache-2.4.58-20231019.tar.bz2 26224 BLAKE2B 370f36dcbe9d10ed0dd415c2e28016c7897246b5c3f830e849e765c18a08be145c8a363f122dff2c4b8d5b1e53ff504a79d7512a58135899a539136b580524ed SHA512 60f68eb4168a86ee33525e7c90cf5af8da586ed31d12cc294ea6bf3bcb9f254ea7e1a4ca5db4846a0e92b97c1326f095aa3a9d5fdb9ed92c1c4726c5a825ab36
 DIST gentoo-apache-2.4.59-20240405.tar.bz2 26196 BLAKE2B 370b0264756c950ed36a0b9abe144742f0638ca616b347ce252fcc8c8cbf326422883771f33f822e03792cf37cb4cea8f95180c989e9a7ed868e2f235c642dca SHA512 cb312c632026d06cdce4e4fc2eb3a51366a8b63782878673781840774b46a72c7e756f9fa3d49aecbfcdbaf939a23a65146358f8523edb5a89ed97fd8b3a79c1
 DIST gentoo-apache-2.4.59-r3-20240511.tar.bz2 31426 BLAKE2B 741b9b76c8fc9a3ae31a5054123e78a47414c5308aefc014ce6ec1ec2cbcf9dea50c5ea0d3b0291132c0b2bd40450ba9480feee279c9f162ef3d8ef75f5025e4 SHA512 b1d4099c2288099493a6baff58127a8b2605bdacf62a66dc5d2ee27368dea81bf8fea2fe878d26c073610ef6bda1c7c0783c1a4af01c0208957abed908cb1df6
 DIST gentoo-apache-2.4.61-20240703.tar.bz2 26189 BLAKE2B 0acfe0c6be0df31f24719b46bd18e2407971b221c654d27120228215cb342f7b69f6912d6f3894fa1cad2b4d7ee657e7fe35064d7c9dc60899bd829b8a7fdd36 SHA512 d6d8ce711a4bdb9017e1e0d6e45c6411f2bf5fd2d72e4ad5e55b23cb8e7216a31273cfd9d9c2cda7fb2bfeee1e9b7ba271ce4344be078af5b01d5e9481be643f
-DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1
+DIST gentoo-apache-2.4.62-20240719.tar.bz2 26207 BLAKE2B 0c0b52620d27f9f96643f8f18221e04c97a80849470f21695359f569be4cebcea0e1588bfce0744ffb86267185fe7a235c3f7b4976a6b68cd8c30c1ac0cb966a SHA512 689362c5171e72afb439dae57c73750ac1cd559a15d2b6fe57a08cc7b489f6921d0265f90e3d4551b75269f60b7222fe20c792c0c14ff5ff3303c9fc974d43f8
 DIST httpd-2.4.59.tar.bz2 7503198 BLAKE2B 836e3538a120d71c016149397a4efd61ae6acd8a8fb9d2ce117c7d86209c4b40c0be3c464007891f28c58182e9d40a8793abe9e94e642354492954af91d9878c SHA512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2
 DIST httpd-2.4.61.tar.bz2 7512908 BLAKE2B 9299ef5843888829143732b3a60d1713aff688ed2f6c2b7f154be16bc075ec747a5b116716f188491ebc9947ff2dfe09dfc71f5245d98a4be3ba27ada28ec8a5 SHA512 00656220ecc2b80788f539536553f0a3a57602fb981be22e63af87d0f98ffe5da3056e722ce52ae8cf9c2111ad1922b3aaea1fd7d69d0ed76795199203d593ff
-EBUILD apache-2.4.58-r2.ebuild 7903 BLAKE2B cf571e99bc324f5b37f2d1b2d213eabf0ec30df3b01cce867e8162d47de1ace6a27f60386e0baaeca473602ca816498f08725d0e8b56bd575f860ffef645999d SHA512 d29b384504ec1e918cb1a313d84411cc017f22007b35c66a0b9b4abed45de966b6a6e620cdbb5d15045b4bd908e498b769265dd3ba8fdf600ef32a0e3957f2e8
+DIST httpd-2.4.62.tar.bz2 7521661 BLAKE2B 0e5c3b05819771e6ff72933ad715695199a32c384f63de6598e179ff5803580f04639437829305150305c9a2b7d309178552d8c9a2d7248a034c98f445193b95 SHA512 7db1876805d5c0f60f49bcb51f75cdf567120f2ff6349e68f084e9a86ae38265d9f1c67e7fca0082c9db136f3c408a88501ee11f26b1b68724ba240867171d77
 EBUILD apache-2.4.59-r1.ebuild 7910 BLAKE2B 51fb61174be88f22b8846c61b0a0215e74023e26e3f52547eedc8addfbe8ae9b9a7505dd06e11584b444c8f75b09a82fdae914666b185f5bc14944a03c50696c SHA512 c77496408a2a0ed322ee0de7d5e6181049c9822ed30171bc9fd334fa04be63ede5b8e0035ab04182c09d77e1d2a3ce80690f1426a075158a44736517b0639f48
 EBUILD apache-2.4.59-r3.ebuild 7845 BLAKE2B b8b5bc4af5ca53ced9b0cde392e74ef9b76c508a5a864742289ab3c4703257ff2683914fdf75468ab6f4ed210f2411a20c0df97083e6a1e34fa5f6c3b2b99e12 SHA512 4d4d5f995782b0a03b3a19d3930a692bb11c13f1efce5b36a04aa50ef0da196402821d1f262f237f8c3e4f1b1db1aecbbaa26b3b193ade94cb90f5289a0cd844
 EBUILD apache-2.4.61.ebuild 7842 BLAKE2B f5e43adcb71b95896082b30b5615f4c03f9a4642f621bbb11181487f6fee5a3fe2a2701611d33b02f02b9cb337d1af2c4c881a75f9d96cf23ee6e97093e2530b SHA512 e5b1ee6f6851294303dc1828092d057d0a11067e9f7a2c23f123470cfb7126606f429c6b4a9e30150c238c8ce65358c9091fd0413f4f247784a4767bec546422
+EBUILD apache-2.4.62.ebuild 7842 BLAKE2B b18e7e674a93402e5befa31332d3a7ab9491d7e23f9d2b61ec3051ee0233c98baf03f08eba418044e4e4b76a1d9f0c04675a4b7a719360cd1f6a8b5150d87d94 SHA512 cc57266ea0afd2c20a4240335413fa1641e07a19b8ba25a922a2dce0cf53df01acbc118ec93dc7f4e49f3499f055bc635996a9f1692867aeab612027f4dcc550
 MISC metadata.xml 978 BLAKE2B 2b2b82339fb2419da3d4e9d77f2c4495235b04a8f5006e61316bf638f307227ea26e2f9eaa26fca5d10118ebdd0bff9fac7319687ae62e2440b49e509e7080e0 SHA512 4a1842f1754473f7168fd38ef4ac2720fddf0f4ad8bfc5df3215b7a50f454cb3fc372e5a84d030a2b84e9744d599f8a38caf3ad5688a93cee7d52bac3d89b43b
diff --git a/www-servers/apache/apache-2.4.58-r2.ebuild b/www-servers/apache/apache-2.4.62.ebuild
index d41733f53db2..4231962a8e60 100644
--- a/www-servers/apache/apache-2.4.58-r2.ebuild
+++ b/www-servers/apache/apache-2.4.62.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20231019"
+GENTOO_PATCHSTAMP="20240719"
 GENTOO_DEVELOPER="graaff"
-GENTOO_PATCHNAME="gentoo-apache-2.4.58"
+GENTOO_PATCHNAME="gentoo-apache-2.4.62"
 
 # IUSE/USE_EXPAND magic
 IUSE_MPMS_FORK="prefork"
@@ -146,17 +146,13 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
 
 RDEPEND="
-	apache2_modules_tls? ( >=net-libs/rustls-ffi-0.9.2:= <net-libs/rustls-ffi-11 )
+	apache2_modules_tls? ( >=net-libs/rustls-ffi-0.13.0:= )
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/libxmlv212.patch
-)
-
 pkg_setup() {
 	# dependent critical modules which are not allowed in global scope due
 	# to USE flag conditionals (bug #499260)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index de4971a6bd28..05b40842e6a2 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -23,6 +23,6 @@ EBUILD tomcat-10.1.25.ebuild 5433 BLAKE2B 6fb5e32c417ff83e4d353c1ee39e2a09ed020c
 EBUILD tomcat-10.1.26.ebuild 5390 BLAKE2B 4e763cf6e5f4ae77c245bc574962c1290396bb08ed77bc19eadabc0c7f72f676b6ac61c2156eb947c92decbacc0d21bdc77907e85dbcf5def3a2148115f2bd98 SHA512 b19d4c462dea2b30d9a6ecf2341bc50f84f6f678d6f902a3e46adc0c4f8c9f7ff4d6511d9f955d9ecc160350178f529e1ec4326bf00a2d5b72fa050672d5a4e5
 EBUILD tomcat-9.0.89.ebuild 5017 BLAKE2B ae1262dfd897258a71616cbf732c9ebf609380fbb674e10ae53aef3d71174f0655578be5f2c985367df6ccf0eeb96b8907e0e7f3025b0a4db8f55f899ab33152 SHA512 443117958bc417f019b4e32a300b528a86abd77c32b1abba305ca4940fb159eaa31b80ae4c6862baf827948b7c761ca554e6070a4b495abac00660a0ab8d9eb8
 EBUILD tomcat-9.0.90-r1.ebuild 4975 BLAKE2B c385929c798e8bebc7b5d0aa9066eb7dcfddc4c00bbec221232e5728a4a21fb54afcc141cc47f2b49ee5d8a6348447b17406142b4a377452fcbdb30c414c53f3 SHA512 e67ee75ddfd8aa955efc9678f56567643a51efcce7e768c393e742d44af61c4496bdde8c56de93d44c9b1dc0d9e0009a7ed64b8072afd54083d7b7abb1e2303c
-EBUILD tomcat-9.0.90.ebuild 5018 BLAKE2B 18aa3279abebfcbcfeb8e6c09ea0a36ab61a8041ce1105770739a79646de699089ffe530b6e85e6b07f9c7c007ba921f722dcce3d25a4a8e45bc2a988c32aa6c SHA512 e69a060a97ffeb2aae1428e87630d9ce87bb31681eb6b04d5723a32afda44e21d4996babd4f98bb42e0abe5f0a1851a46b95982d4d75b45dcd605a6acd2f2584
+EBUILD tomcat-9.0.90.ebuild 5017 BLAKE2B ae1262dfd897258a71616cbf732c9ebf609380fbb674e10ae53aef3d71174f0655578be5f2c985367df6ccf0eeb96b8907e0e7f3025b0a4db8f55f899ab33152 SHA512 443117958bc417f019b4e32a300b528a86abd77c32b1abba305ca4940fb159eaa31b80ae4c6862baf827948b7c761ca554e6070a4b495abac00660a0ab8d9eb8
 EBUILD tomcat-9.0.91.ebuild 4975 BLAKE2B c385929c798e8bebc7b5d0aa9066eb7dcfddc4c00bbec221232e5728a4a21fb54afcc141cc47f2b49ee5d8a6348447b17406142b4a377452fcbdb30c414c53f3 SHA512 e67ee75ddfd8aa955efc9678f56567643a51efcce7e768c393e742d44af61c4496bdde8c56de93d44c9b1dc0d9e0009a7ed64b8072afd54083d7b7abb1e2303c
 MISC metadata.xml 699 BLAKE2B 66aff1137e5d4ad92749176a5375c1c27c1e6cde936e05ce904d965eb71a985c421235917742d4065765e1ebf9f9e3faa51c3de109a9e5a169000b4263c3cd97 SHA512 b50874d1e741835bf8cb839517241465018254eba1ddb0e691f2b5b188eca97dd27394c29d2082654049d9ee0898c1e5e4e625666cf8abe029b8e6085122d9a0
diff --git a/www-servers/tomcat/tomcat-9.0.90.ebuild b/www-servers/tomcat/tomcat-9.0.90.ebuild
index ca10cc20e118..416b71be8c5d 100644
--- a/www-servers/tomcat/tomcat-9.0.90.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.90.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="9"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?