12 files changed, 10 insertions, 262 deletions
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index f91dc74a2e12..faf82607b2ac 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_authnz_external/Manifest b/www-apache/mod_authnz_external/Manifest
index 3abf3ddddb5a..634d4422565e 100644
--- a/www-apache/mod_authnz_external/Manifest
+++ b/www-apache/mod_authnz_external/Manifest
@@ -1,5 +1,4 @@
 AUX 10_mod_authnz_external.conf 993 BLAKE2B 36daed95a23c58abb0749cfd4836f57b7913362f7dd98f18a5e0158b30754392756f9f9e0c3a8158d6e93e40f765ec440fa3f24069746a49ec16db9f2c8ca6b1 SHA512 66de4c74f5f72ee1f0483c8f5bcd0ff461ebcf0a7b2790692a3b6f4c2ac1be8e6510ffcaa7502903d1b5b611a1a8375a845ff14c3147df3614e5d73384a22ce4
 DIST mod_authnz_external-3.3.3.tar.gz 38266 BLAKE2B 03bdfe7efdcd832b7662be70e0e38cdfb4f025d3bdd3baf3e98b4d77efd538605db8f625006246515f427989aca3242626a4115e4534ecb75c09adc967227ea6 SHA512 65b643870dcfc5cdc0343bc606ff74697473617ce9f6fe27cae40ae1b2dca904bb71b6ec8347c6b5c5e3819785432798f6e78820cdf66fd17b245371a41322d2
 EBUILD mod_authnz_external-3.3.3.ebuild 805 BLAKE2B fed678608b027aeb9d8694f6b25b1d6df7c4b4e01260dde9abe28e93aa4791ca14ec529598cc96bae88d86e547f9b6162a469360e35cb2e53b5d7b56700ab493 SHA512 5a1fd2b4cbb2359e8b08be3c724f8630f7d885ab9c1828cd7262eb73c3321ba1a2e1694b7d02d50fc6380be8b5eafc5b1580b46fd9a244bdc5bf272fd0d299b3
-EBUILD mod_authnz_external-9999.ebuild 807 BLAKE2B 55791df0e64af79430204a412fb48b0e39de500d37db76fba7b2e83133fc4198dd18afd87d83a60f04f311d09169f34bb510511ad0ed14ae87e9ad7eca417e51 SHA512 5edf1c9def9dcaa2ceb1d73c421dfce4d5853ef8622f6146522af715178a7baf8518cc934c58a6567b38862193fd75b8fe29d5a4f080cf5f9f7b3edc243ad8d8
 MISC metadata.xml 337 BLAKE2B 98dd71f26a860fea5d25a02ec76292898fcb76adbb3018a377383a99170318b0d3fa48f53248a7bc4b138a0c63d575963ebf1f90d5af5a6020260781fbd1d79d SHA512 63e2117dfdcf645e5d966a36dec31fd92f10a17c9efff9f378803060f91f0344ce76b51fa8eec6eef5dbd7fb7368e33d6a668185cf901bd01d1f99438cad120c
diff --git a/www-apache/mod_authnz_external/mod_authnz_external-9999.ebuild b/www-apache/mod_authnz_external/mod_authnz_external-9999.ebuild
deleted file mode 100644
index a118abb601a5..000000000000
--- a/www-apache/mod_authnz_external/mod_authnz_external-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit apache-module
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/phokz/mod-auth-external.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}/mod_authnz_external"
-else
-	SRC_URI="https://github.com/phokz/mod-auth-external/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/mod-auth-external-${P}"
-fi
-
-DESCRIPTION="An Apache2 authentication DSO using external programs"
-HOMEPAGE="https://github.com/phokz/mod-auth-external"
-
-LICENSE="Apache-1.1"
-SLOT="2"
-IUSE=""
-need_apache2_4
-
-DOCFILES="AUTHENTICATORS CHANGES INSTALL INSTALL.HARDCODE README TODO UPGRADE"
-
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="AUTHNZ_EXTERNAL"
-
-pkg_setup() {
-	_init_apache2
-	_init_apache2_late
-}
diff --git a/www-apache/mod_authz_unixgroup/Manifest b/www-apache/mod_authz_unixgroup/Manifest
index 2c94ea4c4265..82196360f746 100644
--- a/www-apache/mod_authz_unixgroup/Manifest
+++ b/www-apache/mod_authz_unixgroup/Manifest
@@ -1,5 +1,4 @@
 AUX 10_mod_authz_unixgroup.conf 359 BLAKE2B 5dcb3eb6d28c3b2d8aeae65ef109eb56e1781248bec2dbd6a99d5f0f927135dafe249222ae33c89634ca79e74b641677e17a293a7845064ec3ec7ae631639c4f SHA512 172d3ea8e80a77443e16d45c2cc6daf82b88facd145a26b1a196986c000967f861c9ee90cb5c6d3bd1de5c167a74e68039379fb55a9abcb4b32b773d502b8662
 DIST mod_authz_unixgroup-1.1.0.tar.gz 10085 BLAKE2B d7948cf046d58bcf27dfd4310a69ea61395d75f67c782fdbeb3f96015b7df8abebb7c59a244efe37a20e42ed72b501cd757346812144cd66a1cae8dabbd62a42 SHA512 83c767b2eb903964e688658bc4ae4384afd14c99f714c9aafb8c5bdddc855511e0b81f3499411b401865e42028b587dbba4ea2eb5123fe32ac91899327d6bbb8
 EBUILD mod_authz_unixgroup-1.1.0.ebuild 734 BLAKE2B c28033779369bc334c5c4d8476461470d1b2910a768773a346e6bce2afe14f72ae6ec9da2031007340fdf6eb392d975f0f10ef483e6dec1d61647cbc98da6dca SHA512 a7a7bef6c17aa59c55d6645309a0af76768fb3268422f46b44cfcd149d0a765d64ac67e9ac3b9e9315eb012a1af113fb36a28940d0fa74bf25f500851efe0637
-EBUILD mod_authz_unixgroup-9999.ebuild 735 BLAKE2B c47b621f43a052b746bfba1c1c8fac59ba60555b54e73e560b910c1f613a33380e3cff0091bad5776a976787ae1197ee89961044018f197fae9ed2e6b419026d SHA512 116c08375d466d7b60ae44606dc34632d91219b32f30aa24d2b16eff463e98f18ce5e0723174f2cce6636a80c0156e14f9d3366d06e5d4338e1152f31a11bd90
 MISC metadata.xml 337 BLAKE2B 98dd71f26a860fea5d25a02ec76292898fcb76adbb3018a377383a99170318b0d3fa48f53248a7bc4b138a0c63d575963ebf1f90d5af5a6020260781fbd1d79d SHA512 63e2117dfdcf645e5d966a36dec31fd92f10a17c9efff9f378803060f91f0344ce76b51fa8eec6eef5dbd7fb7368e33d6a668185cf901bd01d1f99438cad120c
diff --git a/www-apache/mod_authz_unixgroup/mod_authz_unixgroup-9999.ebuild b/www-apache/mod_authz_unixgroup/mod_authz_unixgroup-9999.ebuild
deleted file mode 100644
index 7c9081bf3575..000000000000
--- a/www-apache/mod_authz_unixgroup/mod_authz_unixgroup-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit apache-module
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/phokz/mod-auth-external.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}/${PN}"
-else
-	SRC_URI="https://github.com/phokz/mod-auth-external/archive/${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/mod-auth-external-${P}"
-fi
-
-DESCRIPTION="An Apache2 authorization DSO using unix groups"
-HOMEPAGE="https://github.com/phokz/mod-auth-external"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-need_apache2_4
-
-DOCFILES="CHANGES INSTALL README NOTICE"
-
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="AUTHZ_UNIXGROUP"
-
-pkg_setup() {
-	_init_apache2
-	_init_apache2_late
-}
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 51b63c647969..414be20b49a8 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -7,5 +7,5 @@ AUX mod_perl-2.0.10_rc1-bundled-Apache-Test.patch 2777 BLAKE2B b59cb23545dfa26af
 AUX mod_perl-2.0.11-ranlib.patch 341 BLAKE2B 72cd8bab80a2c435c54311c41f1433f462647a8bf2fe68dd41ea7ce73571b45a57627ca575d75af48f22559ea132d0e22af24bb204df8e317366f665fddf4157 SHA512 7fbdc274780033b704758d3e303d05c1d05e059f79eea72797201027610f9f7218ba13b398c0d885dda86b1f88a192b3dff06059b93c89a6c4de4a5089b64bc5
 AUX mod_perl-2.0.4-inline.patch 678 BLAKE2B 67da89c49904537df88e09fb4a171c03096993439d56d6fdd9e12b83d4cbca2cc1a734357ae6ee93ca20fd9906e1a0e74743d6d826f80763fda9387b42151597 SHA512 5669230db6e70b31b087851fd792004c4a292975e507f248b8dc7ce195559ab9b0579db8bea84d823f7d53e351990ecda057d7fe63273d486b5f12204d7160a5
 DIST mod_perl-2.0.13.tar.gz 3848487 BLAKE2B 8fb640f6815dac7a93ceeca21c63d4c5d5f14c81d061b0fbfe5831afcb8682df509c367f113a7b1396fdd25ccebd66cf708f99b5e69c8393add0f7969c102249 SHA512 453c789743487e2d1167d005f21ef9780f36488db8830103e4ea0a0656f685bf5ec423cd1baa68ee30efc75d9e2b845c9656458203b9f48de81a315a91d587c9
-EBUILD mod_perl-2.0.13.ebuild 3858 BLAKE2B 75dfa9c6ed8c5fdae61a16f26d2c1e76d4bd04daf427f7eee1687651ecdf7f2db613bf7c493653ebf3a0490d1bf5603a4cd22b582fb6a790d8f009634f893599 SHA512 d5df4fd27d6e46545005ced3566de9f3346493cfe2b3eff1e58042e69a85a31a2bd13dc0408bfe105cf662de2a62e03bdddebca7ea424d6952bda9d7db481ee3
+EBUILD mod_perl-2.0.13-r1.ebuild 4120 BLAKE2B 0c0ee35c8d975184eaa6747ace61ccf7905b7bd69d4dcc5ce184a488200303970c69cd329c44cb8280adec7e6fc7ab6f765a368e976a1b003bf3d9e25b0ff34b SHA512 07ae290455f346e2ab65c5e7768117c4e29285be56475be46564b98c7309c8a086f4073c1b6905eecb08184d3801011ce78eb45bbc330fdce661654f1963069b
 MISC metadata.xml 468 BLAKE2B 89a2a9d8fdb7c3e0dc3022daf3937f67c59849c4a9d95cb97db1adee8f38e2d26a34706fbf23d8ba6da9fe9a09a68c3f0778f3c93f93b2fd965b4b79dc69d14c SHA512 a01e631256aa5d25219dcccc886601da90b9cfdf91bbcebfb1a4f193f8699ca0033e2899dac4a206149247874a7f0b9ce74965bf5098ff956470897c794d3aca
diff --git a/www-apache/mod_perl/mod_perl-2.0.13.ebuild b/www-apache/mod_perl/mod_perl-2.0.13-r1.ebuild
index d2b6cb753c19..a0d8c495793b 100644
--- a/www-apache/mod_perl/mod_perl-2.0.13.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.13-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
-IUSE="debug ithreads test"
+IUSE="debug perl_features_ithreads test"
 RESTRICT="!test? ( test )"
 
 # Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
@@ -25,11 +25,12 @@ RESTRICT="!test? ( test )"
 # default one, which will likely need threading.
 
 RDEPEND="
-	dev-lang/perl[ithreads=]
+	perl_features_ithreads?  ( || ( >=dev-lang/perl-5.38.2-r3[perl_features_ithreads] <dev-lang/perl-5.38.2-r3[ithreads] ) )
+	!perl_features_ithreads? ( || ( >=dev-lang/perl-5.38.2-r3[-perl_features_ithreads] <dev-lang/perl-5.38.2-r3[-ithreads] ) )
 	>=dev-perl/Apache-Test-1.420.0
 	>=www-servers/apache-2.0.47
 	>=dev-libs/apr-util-1.4
-	!ithreads? ( www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork] )
+	!perl_features_ithreads? ( www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork] )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -75,7 +76,7 @@ src_configure() {
 	_init_apache2_late
 
 	local debug=$(usex debug 1 0)
-	local nothreads=$(usex ithreads 0 1)
+	local nothreads=$(usex perl_features_ithreads 0 1)
 	myconf=(
 		MP_USE_DSO=1
 		MP_APXS=${APXS}
diff --git a/www-apache/modsec-flameeyes/Manifest b/www-apache/modsec-flameeyes/Manifest
index f34d1b223520..f8833d1e4460 100644
--- a/www-apache/modsec-flameeyes/Manifest
+++ b/www-apache/modsec-flameeyes/Manifest
@@ -1,4 +1,3 @@
 DIST modsec-flameeyes-20130216.tar.gz 18716 BLAKE2B 1466cd1bd943106609e80fec8251fe85f3ca5fc8e21fcaa3e0e264776b4aff21ef671fa75fed1c19aee76441e02211b88efdcdfc17bea21f3036526272eefe7e SHA512 196a8176da09340c5496a3056deb473c69721fdd6c891b6bec6dd5459063dbd61b00eb9559ba0e88413678633cd90496cb0e1b2828442635d31d68dc949013db
 EBUILD modsec-flameeyes-20130216.ebuild 1282 BLAKE2B d32be195af654e59863564c4383cb214c98648a731e255ef00b6902bb17f4e0401fcce232e0caccd6857dd449963bd7718a529beba3d7d4272df3102d8f5a8ec SHA512 caa3e41e0dfb0065fdf9c5f04f9565a9735bfa7d79cb772cb214d9a8e5013c3d4e3f4a317f068edad7dc555ab4e9f81bd882e168ecd77c93874fccf1ce5a34f2
-EBUILD modsec-flameeyes-99999999.ebuild 1282 BLAKE2B d32be195af654e59863564c4383cb214c98648a731e255ef00b6902bb17f4e0401fcce232e0caccd6857dd449963bd7718a529beba3d7d4272df3102d8f5a8ec SHA512 caa3e41e0dfb0065fdf9c5f04f9565a9735bfa7d79cb772cb214d9a8e5013c3d4e3f4a317f068edad7dc555ab4e9f81bd882e168ecd77c93874fccf1ce5a34f2
 MISC metadata.xml 262 BLAKE2B d3d94dbb77d97807f87d471a045ae52e5ce3425970e5d202990088f4d36151b6bd25d0618616aecde8db169c27809939feb421b6e23073f7868d453f8d623493 SHA512 c99e15c81d76ddfd4646bc41da74bcb4e4e6e1fae12fc076709d42189af867d9a5ceadc8e29982e6ad65ff148bf5ecf9812176cf0c9037f176c8fe42c135af84
diff --git a/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild b/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild
deleted file mode 100644
index d52b04714b54..000000000000
--- a/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="Flameeyes's Ruleset for ModSecurity"
-HOMEPAGE="https://github.com/Flameeyes/modsec-flameeyes"
-if [[ ${PV} == "99999999" ]]; then
-	EGIT_REPO_URI="https://github.com/Flameeyes/modsec-flameeyes.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/Flameeyes/modsec-flameeyes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-
-RDEPEND=">=www-apache/mod_security-2.5.1"
-DEPEND=""
-
-RULESDIR=/etc/modsecurity/flameeyes
-
-DOC_CONTENTS="To enable the ruleset, define MODSEC_FLAMEEYES in
-/etc/conf.d/apache2.
-
-If you do not use www-apache/modsecurity-crs you want also to uncomment
-the init configuration file in /etc/apache2/modules/81_${PN}.conf."
-
-src_install() {
-	insinto "${RULESDIR}"
-	doins -r rules optional
-
-	dodoc README.md
-
-	cat - > "${T}/81_${PN}.conf" <<EOF
-<IfDefine MODSEC_FLAMEEYES>
-
-# Uncomment this if you don't use the CRS
-# Include /etc/modsecurity/flameeyes/optional/flameeyes_init.conf
-
-Include /etc/modsecurity/flameeyes/rules/*.conf
-
-# -*- apache -*-
-# vim: ts=4 filetype=apache
-
-EOF
-
-	insinto /etc/apache2/modules.d/
-	doins "${T}/81_${PN}.conf"
-
-	readme.gentoo_create_doc
-}
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index f2b4b94d3bed..3f9b3f7d62a2 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,9 +1,7 @@
 AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b0245c2c37c27cc69eeba9be62c8b626b8fdf26c18ddffe0a06743abf1d529318f46c0091f64370f2a9d82f1b54116 SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d
 AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d
-DIST passenger-6.0.18.tar.gz 8424409 BLAKE2B 50f3639d0233892c85b97383689599c08457642fbfd1d968b67dddee896eb1377ffc40ce8049a2c3ae4a1a6d3673bdc2fef8de9125efa0386722103f9c4ed1ba SHA512 4c9e43d0907e83f82b2ae1bdc882648f5b3c1b54ffe029590a259c191f57b752dc3196332d0bb68319d50d656192e59df0ed9647f1c7fe3fdc13477a9c0b829b
-DIST passenger-6.0.19.tar.gz 8426094 BLAKE2B d0c6cf8b1b27cb11723f28b019d45710a53db76001f1449fd207b7e552080e1b303378acfbc3194076a4a33d03a8eeed9e716471a24706a5a5049343f2b93ef8 SHA512 3ac9b1d85549c8b69f9895d2b0fe00bee68bedfd2ef36ec148fb5e76a88db6498caf7bf6aa2255298aa51bb6b3d14e05c48de519398a0271402cc81e926b206d
 DIST passenger-6.0.20.tar.gz 8476308 BLAKE2B dc1ac3a1e2be1a9138594d68cf23fc0a73b6b0aca0550c022de56bc156825b3627de741128f163871c89747f178fb26fc41533962ba83ef2659ca71793c0fa62 SHA512 b46864cd7fa83fe39a2a4f42d581660c9a521b96942604b56caa567adff272bb092e82a46a6817a7b68be4830ad1015c9af4429a6d5b26edfe9c3e3884046559
-EBUILD passenger-6.0.18.ebuild 4035 BLAKE2B 0eed0beefd8bfe373961c84735bc7086e2f4282179c1b5706f8bb4df6d3679f7170a4341a6fcec849e37a3d4da2202ce9e6e9438088024040563098adbcc1cb0 SHA512 0a244b427f4aa7a47feee4ed6f8aca2492be504a0bc34f98a48782da84a661fcd2d776b66ba160349205b4daa98c9da059b9603b6e87da41b1039375cc361395
-EBUILD passenger-6.0.19.ebuild 4028 BLAKE2B fd5374b04bbd32ecbb9561844f0fb7f8f67b7f37035440f36ddf1bfb20dd3604a9fbe4b3daefbe3fcc7d54f98255e0b81a96cc1a9174c7fed402e53334a00033 SHA512 6d496c48c8061ad41b68f24ebb2112f43120271aa7865f90a0523d6c16615005ef917313185212537ff41d4b40c3ff43288217f8806fb6d60d154628d71b4c7f
+DIST passenger-6.0.22.tar.gz 8296503 BLAKE2B 0e9440134ead3c909570f1fde54e332dd1b017dbc140e1c0b6f1bc73462f01ab4ce36a19a44fc89bbc1d5a93f0faa6cb2e10dc2425722b9b17a4ebe4a5102ded SHA512 85c07386f36677063d32214cce780933d19a3893d15c15efc6c7333dce8046e368218ae9a6aa4d814abdfcfa7da823ae86badfd2c6e6252d4da4f20cd468cdd8
 EBUILD passenger-6.0.20.ebuild 4035 BLAKE2B 4b006ea98dcb69baae7aa757ce3c10a4ef89b5836e0f6a1d57c22c074435f5bc0f136872c453013faf8fb9c71726546c45cc26fbb9c001e63b846d8bf16906c1 SHA512 4be03e3bec258405cfbbbf8a8fa2006ca13694afcac6e31512d4fd344ccf3ae5c2cad3b93a7119733e814654606f6a5dcb090f3901615046c57d1b8da0a9f352
+EBUILD passenger-6.0.22.ebuild 4037 BLAKE2B 011ddae946f9313462c25a7e9b0c044dcfdfb96d6693400da96f11333faf5a276e2e49b1082bec1996c46e607b4e0301772f62f3cfa62578aca76ece901ec25a SHA512 5c341279b8f222d8ab48d89722da467358d81336045069bbb87defd2e02c92b49678fcb79932676e9c7e047a4a64abbbcf8f736f1ef062180d83e20f19fe0fda
 MISC metadata.xml 331 BLAKE2B 5cc7b65a8ac511e9065cdb9fc6f4a04923029f718f02ba0da718c798e0bb3a554a8da7f05e639daa88c2fec34888e6e1316ccab4a44a0d99b616354006e7c762 SHA512 95f21209228559e1b775f8b44c49e1d311a6c2955ba26fb24fb72bf64afd42048d9d0186828be8b733963b4aec245f5abc4540c1ca8baa14ee59b2fba0c33086
diff --git a/www-apache/passenger/passenger-6.0.18.ebuild b/www-apache/passenger/passenger-6.0.18.ebuild
deleted file mode 100644
index d501f7ead463..000000000000
--- a/www-apache/passenger/passenger-6.0.18.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit apache-module flag-o-matic ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="https://www.phusionpassenger.com/"
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
-
-# Passenger is licensed MIT, but vendored code licenses should also be taken into account.
-LICENSE="Boost-1.0 MIT BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="apache2 debug"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-ruby_add_rdepend "
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rake-0.8.1"
-
-# libev is bundled but with adapations that do not seem to be accepted
-# upstream, so we must use the bundled version :-(
-CDEPEND="
-	>=dev-libs/libuv-1.8.0
-	net-misc/curl[ssl]
-	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}"
-
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
-APACHE2_MOD_DEFINE="PASSENGER"
-
-want_apache2
-
-pkg_setup() {
-	use debug && append-flags -DPASSENGER_DEBUG
-	depend.apache_pkg_setup
-}
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
-
-	# Change these with sed instead of a patch so that we can easily use
-	# the toolchain-funcs methods.
-	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
-		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
-		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
-
-	# Avoid fixed debugging CFLAGs.
-	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
-
-	# Use sed here so that we can dynamically set the documentation directory.
-	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
-		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
-		src/ruby_supportlib/phusion_passenger.rb || die
-	sed -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
-		-i src/cxx_supportlib/ResourceLocator.h || die
-
-	# Don't install a tool that won't work in our setup.
-	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
-	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
-
-	# Make sure we use the system-provided version where possible
-	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
-
-	# Fix hard-coded use of AR
-	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
-
-	# Make sure apache support is not attempted with -apache2
-	if ! use apache2 ; then
-		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
-	fi
-}
-
-all_ruby_compile() {
-	if use apache2 ; then
-		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-		 APXS2="${APXS}" \
-		 HTTPD="${APACHE_BIN}" \
-		 FS_LIBDIR='/usr/'$(get_libdir) \
-		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-		 RANLIB=$(tc-getRANLIB) \
-		 ruby -S rake apache2 || die "rake failed"
-	fi
-}
-
-each_ruby_compile() {
-	append-flags -fno-strict-aliasing
-
-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	RANLIB=$(tc-getRANLIB) \
-	${RUBY} -S rake native_support || die "rake failed"
-}
-
-all_ruby_install() {
-	if use apache2 ; then
-		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
-		apache-module_src_install
-
-		# Patch in the correct libdir
-		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
-	fi
-
-	dodoc CHANGELOG README.md doc/*.md
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_DOCDIR="/usr/share/doc/${P}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	EXTRA_LDFLAGS="${LDFLAGS}" \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	RANLIB=$(tc-getRANLIB) \
-	${RUBY} -S rake fakeroot || die "rake failed"
-}
diff --git a/www-apache/passenger/passenger-6.0.19.ebuild b/www-apache/passenger/passenger-6.0.22.ebuild
index 881b0b4073de..0c0ad6d0d23f 100644
--- a/www-apache/passenger/passenger-6.0.19.ebuild
+++ b/www-apache/passenger/passenger-6.0.22.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 inherit apache-module flag-o-matic ruby-ng toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 # Passenger is licensed MIT, but vendored code licenses should also be taken into account.
 LICENSE="Boost-1.0 MIT BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"