gentoo resync : 29.12.2022

17 files changed, 191 insertions, 45 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index b8f60ca06940..a94d6c04184b 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest
index 827724afbdfe..80dd94b54cff 100644
--- a/www-apache/mod_gnutls/Manifest
+++ b/www-apache/mod_gnutls/Manifest
@@ -1,4 +1,6 @@
 AUX 47_mod_gnutls.conf 1125 BLAKE2B f4e9a48be5abda5f9ac0af5ae6621e1d35f4b52c4d00a64c0c939661ed26ad38563b833bafc1266d0b5c5ea8c2d0e5804547b73d5d2b7d95c5fc3f37411715db SHA512 cafa6b049f4131b3cb43a4c62a6fb06e9ac5c44bea1901865dd5d48692f22bb5f6243d812f7f2b2d2adf0d39a16480f062043556bedc740b5630809ba9c972f7
 DIST mod_gnutls-0.11.0.tar.bz2 458966 BLAKE2B 6d81be7b7d48255173d028a8e3207badbce0c1ba541124a241b63d4ed4eb36833156e9cd7194318138b6f16667a971d5311d56b9b0036e5b3d9dac8d352a4335 SHA512 090d244823f15a6b23dd2ad9b35db202ebbe96210ec8fd06e06f13e32c327e9d9a449834c899755f1ec8c1a3a71db1b125d436ce661caee1002a8719b4c1320e
+DIST mod_gnutls-0.12.0.tar.bz2 461643 BLAKE2B ffbb4bd50cae7c974c59067908712e104e6d77b121e5e6114a1a45279b9396331f353a53ddae8e3d58259cd7669f047edc4d2b5ebebe94bb40df55f3546b0a02 SHA512 1ec32d0641dc8dc520726a4439edf2e9dbe582651aa4c782047d0499e5e7418b3145eb071d9e97aa4ec803e6818974efea2ed8ed18e5062cd7fdb90ef2e9e0f2
 EBUILD mod_gnutls-0.11.0.ebuild 2011 BLAKE2B 9ba5504d3b8e24f2f6ed1be16a821559799f43e081454b1f45d8a01e263697077fd95b59bb9de74eee22f99246019b529a407081941f1be9a2873c4eab63f445 SHA512 2285ee4e71a949211df2a8251f941f0bad7debb19c9cbbcc0fc615978c3f6a85bc3f89778aba5a1c102108bf8bba5f2864bbcec14c415ba7fe150b4bc183fd47
-MISC metadata.xml 252 BLAKE2B 5dd8d0c83d6c9c396753f4e6674725483e0c7a005b4c529d3bd1fba5de36cee7f2b33e53aec48aa75f35ec663173677c2c964fb73f7f954b20631cc9c59533ca SHA512 afee4a606f4b70f265eb14178037c0459e32ddd98378c6c2978b829e906f83dc3607385173bd8f84ad988d307f8e44e1320310c92c070c802a4ccba93a96ae18
+EBUILD mod_gnutls-0.12.0.ebuild 1915 BLAKE2B 5552cf150f3f3b75a33876399c9b38d1116017fef92a881795c09e84208fbdc2c58424971f5ff3c9160da54a05c861ea2736cbde6a570d2a7acbbb5f1c76ae47 SHA512 c357a5ed917688d48ddcaeea2eafb22e3342cb301b30fa575f4f47d02b05e7796fa4822eec21b11823be14e2d8c4ca4d0741078fa42e8172396f628503138464
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/www-apache/mod_gnutls/metadata.xml b/www-apache/mod_gnutls/metadata.xml
index 99e2666c588b..115e9d64a669 100644
--- a/www-apache/mod_gnutls/metadata.xml
+++ b/www-apache/mod_gnutls/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.12.0.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.12.0.ebuild
new file mode 100644
index 000000000000..2b9dea4ff9d5
--- /dev/null
+++ b/www-apache/mod_gnutls/mod_gnutls-0.12.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools apache-module python-any-r1
+
+DESCRIPTION="mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)"
+HOMEPAGE="https://mod.gnutls.org/"
+SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+TEST_REQUIRED_APACHE_MODULES="apache2_modules_proxy,apache2_modules_proxy_http"
+
+COMMON_DEPEND=">=net-libs/gnutls-3.3.0:=[pkcs11]"
+
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_any_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+	test? (
+		app-crypt/monkeysphere
+		>=net-libs/gnutls-3.3.0:=[tools]
+		net-misc/curl
+		|| (
+			www-servers/apache[apache2_mpms_worker,${TEST_REQUIRED_APACHE_MODULES}]
+			www-servers/apache[apache2_mpms_prefork,${TEST_REQUIRED_APACHE_MODULES}]
+			www-servers/apache[apache2_mpms_event,${TEST_REQUIRED_APACHE_MODULES}]
+		)
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+APACHE2_MOD_CONF="47_${PN}"
+APACHE2_MOD_DEFINE="GNUTLS"
+
+DOCFILES="CHANGELOG NOTICE README"
+
+need_apache2_4
+
+python_check_deps() {
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# Calling depend.apache_pkg_setup fails because we do not have
+	# "apache2" in IUSE but the function expects this in order to call
+	# _init_apache2_late which sets the APACHE_MODULESDIR variable.
+	_init_apache2
+	_init_apache2_late
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-apxs="${APXS}"
+		--disable-strict
+		--disable-doxygen-dot
+		--disable-doxygen-doc
+		--disable-doxygen-html
+		--disable-doxygen-pdf
+		--disable-valgrind-test
+		ac_cv_path_UNSHARE=no
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	apache-module_src_install
+}
diff --git a/www-apache/mod_maxminddb/Manifest b/www-apache/mod_maxminddb/Manifest
index 6b3de67670a3..a69720f6935c 100644
--- a/www-apache/mod_maxminddb/Manifest
+++ b/www-apache/mod_maxminddb/Manifest
@@ -1,4 +1,4 @@
 AUX 70_mod_maxminddb.conf 87 BLAKE2B b50eb32c9cbf88f63bd9b0d5d12d13a83d7a4cb87ff3ad96bbc06825aa2b144d9ae6c09f0abd2c4004ec7a88b9156ba6b5bf5b6fbf2ede947dae2f46a03c5b30 SHA512 e9137211ea71a52a1010cd022cc5bdc3ae967a02eeb5cbe8339239251f3d2fdb14aba03ba66dea1071f513947e26598cd228e455e92df5a41a5016e5112b5ea5
 DIST mod_maxminddb-1.2.0.tar.gz 101465 BLAKE2B a0f9673560851726e7e85b3c6a5ef3e9004854e79a72bb14446bd68eec59ed8befb3bc27d7e7f031c69708ab54984c9f7537e5d55616be9f7ef1b92e2de61ccd SHA512 739c3c9b136fd3ce784e0a81c82a26a188e7d07435c1381ba359b2e159a721d072cb04310f2ce2a38953a8918fec686025bac6c140048a1afc035c0b8e449483
 EBUILD mod_maxminddb-1.2.0.ebuild 903 BLAKE2B 48709b6a24cf6fda247bfcdcef912e8cdd03640fc4ecc529ea06f3b09ea989f697496b1f60574f1670685ed77bce9bbb92b25a083b1b25dd47cf30dae359f5d9 SHA512 c9b1ee3f42f7d3ed824d7dedb56c4dd016ad93aa40a03b2480009f4dd50f7ba2a4aad09c8b13c642f591d72ed10f4969b84e77412289e6656cec8801ba0a55d5
-MISC metadata.xml 479 BLAKE2B db48007c4eeefd6cb10cfbe61b8c0d40da9e08af85cc11d1bdac20cff055db1567f141f11f1f00aed421437a45545d3ba469ad71c63cccf197d1c9d6ac83063f SHA512 a38d962e2059db165a3d93d4eff598b7f4cc1577a7bdbb6e17c9fb86d0501fa29499a8cd11e1aa44e08fbaeefc0f6c18798f44e3430087f49828cacaf4ee4669
+MISC metadata.xml 484 BLAKE2B 7b1241b11e8b219d9cedd46ff190ec211020ee5ad206d159726181dcaa2b98dbda2985dbe8469a4f3ad76b50fe7ae08bbffbe7f467ee1afac921312cb3d4490b SHA512 dd5c40a767ffcc04e01c1212e704c3f937dc0cef8c019bbb77bcbf2d24d54dd4f7811f1b063b004d7c841aed3c2b3d63e4525b85f840ee79b8d95fb6fb865103
diff --git a/www-apache/mod_maxminddb/metadata.xml b/www-apache/mod_maxminddb/metadata.xml
index bc0c7c700b38..3dda7d12e6f7 100644
--- a/www-apache/mod_maxminddb/metadata.xml
+++ b/www-apache/mod_maxminddb/metadata.xml
@@ -5,9 +5,9 @@
 		<email>hydrapolic@gmail.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">maxmind/mod_maxminddb</remote-id>
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 85adff652468..408c031cee7c 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,12 +1,12 @@
 AUX 2.0.3/75_mod_perl.2.2.conf 1221 BLAKE2B 6887e97fe210b9656e4a0b50ff3f536df1cc2125adbded32654917b3c3e6e3d65502d0f49aa9091ebeca7eef9d9ac326937636832e6ba7e00fa63d7105070a6e SHA512 caaf66604e385f24ddebf282c42b880362fa19f9195fca105171b3d3edfa5b995d7bda9899be60f78341e20e2fad75fbb097740ea43781a44a60a4a5b7f650b7
 AUX 2.0.3/75_mod_perl.conf 1295 BLAKE2B be75ef503b400660aa24f72d7c8aa0592a7e1cfe277b508ebd158c9c3d6d4adea676fd4b0934929f05ea4613f3a871ca28bd6435203a913501bc4fdfd99686b7 SHA512 f6842055bf41b457e77f25de4fccb4981456669e269a01faf606f5de31050fe41c2741c2591bc89a46914c876bfebb914e7d3a07108db8220ec0b8218781c22e
 AUX 2.0.3/apache2-mod_perl-startup.pl 478 BLAKE2B ec1bf3eb1119561396756706e501b904a2910f6ffec2db62aa08c10af0a79bc8dacc1455524818a46c54906096efd26f89f6114d932aeac30c036f9dd7ab6823 SHA512 3af399b3aa0bf5421ddef581b1042cbd71fa3fc9d27aa87feafb4754cc8e7bf9659eb70082f0c73f0022b31e8870ff68021af692e41b391dec6c5e7608589e29
-AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 BLAKE2B 029f4be8c295b83031454dc53511293d7e034947ae9f591008235a8a16dc322df9c144c106d0392709aeaeb2080ba2534e4f34aa571c7e78bd726823b8f7d6da SHA512 8e41d94db8cdd181393be8b4922a9e9760576cb051f93d652cf3f324671a464bfc2741bf18661ac4509db257cb5975b408f33799aea76a2e46ad15af08a68792
+AUX mod_perl-2.0.1-sneak-tmpdir.patch 264 BLAKE2B 2ed1802516d3ce68f43154e63c9a222e10e53bf4c90e87ea6a4c9c5a7df902d4ed9c9df3b39070e0c618281b245c47b81fecd40a37c2d2397feb03bf4d6645c9 SHA512 523aa45c616473062841b0bbf11c43a4dcb0729a9a5e380a1da1857409169fc2a6036ece1a33e52762eed6853cb068264802701d7b89be2d247948a65ef4fc0c
 AUX mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch 1517 BLAKE2B 4546fd0ae82a99c335140c223b830321dd340393700e74d18130063b952d8249e0b1610b86ba93782d5798dcb66689cc2d30247a5f3e3866c34387dba4b0f6dc SHA512 4ac22d4e8942d2fb4d07f10897c7670acd77d28a7b47049e95dffe026d335c26681a0fa4a43c67b53fafa8c5bdba7991bad150e3bc00a8e3c40a7d7e59938c63
 AUX mod_perl-2.0.10_rc1-bundled-Apache-Test.patch 2777 BLAKE2B b59cb23545dfa26af1181b5c4fa7f2d2ca5e049d6ec4056f6cac68389cc9fe6cb7ab010b8aa6c210aeaab1e98afb65ab3051a341856823debbb2fded47c63320 SHA512 ebb583607d4a8587d340384bb5c8deb50a3001beaaf9a536f4731baa3664a6d2667de309d1549175bf721643ad3f107988de4d2c9e213429888044dd726447ee
-AUX mod_perl-2.0.11-perl534.patch 711 BLAKE2B f036118d4b7d6b34969453cbf0b15b832a1973ae541275fdf70327918b5f52e724c63a3e99fc1baa2d088a086adb44bf0b5d0b4cb8d396a697a0f3f0752403a6 SHA512 a3c649b8a96f5d4a1989eb8aa1d32ab5da5dfeebd3d26975f9f95517bb80a1181d6e09c08ae4f577edbb3e05557a5206653205183a9d3167cc4c768467519dd9
+AUX mod_perl-2.0.11-perl534.patch 621 BLAKE2B 44def80ff70bd7a2416df46c8dd84429d4452fea6ac72b5f51a7e5935db38bb90cdef41904ce6828bc1942f1be602f1d63c1922acf5f29e867797f9047e51c1b SHA512 1cc1b79ddd258d37463e80f52bbf2a9414cc57b5b38e491085f2600e5ddd15d5941450d5990d7a50964c26e9e35890b724f48353f5e54dead7427a6899952f29
 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.11.tar.gz 3848147 BLAKE2B 8eeef6d1fadbf9d2e3bcff33c5114e588f032c2497f5191b1edd30da8bce72eadf5ea62482ec8ece7d7fde308c8c41d6682d1a325760c627bee75c3ce8cf6272 SHA512 f232b215ccb9217f69ccced8a037470e5975900b9a6fcc5a2e4674e6559d21f026547c1b97c48109352043946dc22539dd38004759be16ad5cfcb3a96973dfdf
-EBUILD mod_perl-2.0.11.ebuild 3861 BLAKE2B 59d26881b9bd7efde6667d2002e3349732fdb19cfb39b81749ed694a0e598995dc30c60bac0669d09d601f024495da257e421ada2f6e947de101869a5ea66449 SHA512 c6d408b9f4283744ea3f2f0ebe86df5d2cc53325b94548334be9e4ce11f048d824fe845c6cec5c88a28b90ee579824ea10f23638fd3debc0b89f38eb25907904
+EBUILD mod_perl-2.0.11-r1.ebuild 3897 BLAKE2B 466a090bf3397f3dc7aa3eb77a1b5b0a947f31c1253d08cfaaf921ece7b8b81b6906937299aad8c325d31aec65470d528452d19bc129583ae769a82c83f5a147 SHA512 a8ddcec6ef14777d26e9bf5ae4ccb7f960916e7fc7e08b4901720047220a00716cbe199c2588c0563c4be85259717215fa196003a06fd049d3f6338360bd41a6
 MISC metadata.xml 377 BLAKE2B aa13bbb99008022c839bafd6c4efcf8535d67d7ef572a54c1e48c061484bb6ee2925095b3cb5f54a68c63f4c4ec0ffd6f017a2b2eb579abcb2df985921f2d151 SHA512 165fc6b30620139d17ee48826521373e4a58110ea89e996bad83ea72e96c364d896398a61af0664573e35d29be5deb336c98baaefcb3022bd04882fba0272b33
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch b/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch
index 0930278aeba3..40c88c83eb87 100644
--- a/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch
+++ b/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch
@@ -1,5 +1,5 @@
---- t/conf/modperl_extra.pl.orig	2005-05-16 18:27:45.000000000 +1000
-+++ t/conf/modperl_extra.pl	2005-05-16 18:34:46.000000000 +1000
+--- a/t/conf/modperl_extra.pl
++++ b/t/conf/modperl_extra.pl
 @@ -136,6 +136,8 @@
  sub test_modperl_env {
      # see t/response/TestModperl/env.pm
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch b/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
index c6c5bed4ed0c..77db5f65263d 100644
--- a/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
+++ b/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
@@ -4,8 +4,8 @@ Fix build for perl >= 5.33.7
 Patch by Leon Timmermans <fawaka@gmail.com> from https://github.com/Perl/perl5/issues/18617
 
 
---- perl/modperl/trunk/src/modules/perl/modperl_perl.c	2021/04/20 13:48:02	1889013
-+++ perl/modperl/trunk/src/modules/perl/modperl_perl.c	2021/04/20 13:55:29	1889014
+--- a/src/modules/perl/modperl_perl.c
++++ b/src/modules/perl/modperl_perl.c
 @@ -268,7 +268,7 @@
  #ifdef MP_NEED_HASH_SEED_FIXUP
      if (MP_init_hash_seed_set) {
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild b/www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild
index 77fb5135e3a3..3b0cc28a4471 100644
--- a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit depend.apache apache-module perl-module eutils
+inherit depend.apache apache-module perl-module
 
 DESCRIPTION="An embedded Perl interpreter for Apache2"
 HOMEPAGE="https://perl.apache.org/ https://projects.apache.org/project.html?perl-mod_perl"
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="debug ithreads test"
 RESTRICT="!test? ( test )"
 
-SRC_TEST=do
+DIST_TEST=do
 
 # Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
 # The minimum versions requested here are the bundled versions.
@@ -73,6 +73,8 @@ src_prepare() {
 }
 
 src_configure() {
+	_init_apache2_late
+
 	local debug=$(usex debug 1 0)
 	local nothreads=$(usex ithreads 0 1)
 	myconf=(
@@ -108,7 +110,8 @@ src_install() {
 	default
 
 	perl_delete_localpod
-	perl_delete_packlist
+	perl_fix_packlist
+	perl_delete_emptybsdir
 
 	insinto "${APACHE_MODULES_CONFDIR}"
 	doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index 510844c330bf..39163e2dda59 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -2,7 +2,9 @@ AUX 10_mod_qos.conf 97 BLAKE2B d3dfe5296b89ef35b09e6b9a0d272c3fcfd66ceb54e2405c3
 DIST mod_qos-11.66.tar.gz 1247819 BLAKE2B a835722363a816637411b434eba60bc91f04fe48efd1dd5a3b63f046feb2fb60d776a64d0a4e889c8f827f6a3002fa731743d079b5f3ebd3bde3edf2023c983c SHA512 19541c72d72cd9c4f055f6c0908e1ddbfa0b27f33e13edbecf9abcf61c2fe334ef797e3ad44c7d8343d5d2df714744b4f1a3f0f96a6de02ff7d7999385393db6
 DIST mod_qos-11.70.tar.gz 1283241 BLAKE2B 516dc8ec0228956c374845e10ed2533291544c496a1eda693da28d551b81f83ab898384a627b87c940782925c5bc84f1140e4e241c964b451acb63fd947a274d SHA512 004898d7993cda82f261d28e4c91b1ff1665465d3ad1da005fae94471824a31f0d30ca4edf700ddb45bfde133218c55d49a396ba03b3ed0ac00b1743c4aaa5be
 DIST mod_qos-11.71.tar.gz 1282858 BLAKE2B 92061497a6f31c009c5dbd7d0bf9042272b679e7b2f1bf5fdf9a52dc3b9cf9ea13fae6a6bd422d652466a5d1ac4355b7cc33f2d183900a64eddce3de97e96e82 SHA512 2550d868a03b7add5a48a4cd43a5287317142c879777e6d38c15270a8bbef1e2a639f938d996645bb2cace40dc6806094fc4a80e2a9b5b4e5ccc60bd35244cc8
+DIST mod_qos-11.72.tar.gz 1283276 BLAKE2B 1769a7198f5569b2c205a0939928f6949e950d41f54765ee1a055606df139c7e7dad4ad7d6161dbf07003a93d54b966b15d20fc721a6ba05cba221e1cae126d8 SHA512 0e5af2c702bade096101f20fcf12b90a2a538665cfbec4183608acdfdc99552304ad4a42f63ad3111b570bfd42b17ce7acb16f6bc86a0380c79fae84a5124715
 EBUILD mod_qos-11.66.ebuild 1141 BLAKE2B 4c08f022489736efcf3833b70c6ae90663ccb34bbed965e14b55e4c028c039e1e438618ebd153eca1e22c2b0f1a541a68c2383d4b80d8cbb7bd549a766bb6f06 SHA512 54ab558430ec323df724e4f4d2a2c0019c94f97d656b1d75107b0e1ac0a905fe4cce2422f28d79342aae2b41f7466461fd6480518a0d6d89c3396f26dedfab4e
 EBUILD mod_qos-11.70.ebuild 1142 BLAKE2B 8b9f5e9626719ec8390b401df2b9f17a00231cad9135c5a107f9e965a24f6823c60d99faec0a6dcaecd18a957ac1930078f9937d3694fa66edede3fd960e34ca SHA512 aea1e1ffaddbb25679e7815e1ad48f76cc8ab59606c20beaf8dcfe54640c9a939f2dd864550911d0257554ad39f529fa9a09bead62e2ab04d029fefc8fbe9887
 EBUILD mod_qos-11.71.ebuild 1142 BLAKE2B 169c4a162118afb590a56a8ad230a273820c2129a9e207843a4565701ba37bf4e46d2f1e7b25db049fcef70a9c106a31cd21437f52954f3d829d185056028d9b SHA512 007b46552dc1f398600ece4d6b6105a4f7ccbd7db88aef19afcf05c64cfa28da4fa7467225d45d325adbec90f6cd3d4a30b7232578b819de97bbb9ca1fc26d1d
+EBUILD mod_qos-11.72.ebuild 1142 BLAKE2B 169c4a162118afb590a56a8ad230a273820c2129a9e207843a4565701ba37bf4e46d2f1e7b25db049fcef70a9c106a31cd21437f52954f3d829d185056028d9b SHA512 007b46552dc1f398600ece4d6b6105a4f7ccbd7db88aef19afcf05c64cfa28da4fa7467225d45d325adbec90f6cd3d4a30b7232578b819de97bbb9ca1fc26d1d
 MISC metadata.xml 326 BLAKE2B 469e74aa98baf0a4789743501b566d233d6072595c29c91ef4cffb4a9e4a986dde186cef2326e5b1e02d57a69f49b9dcf9fd045c857a5627f68f50787cd6d072 SHA512 bd08a8ffbee3d67a6b5a81e615ad0bf161204027e91ae69bd5a541a2d76f0ec52ca7405647d03d2ed3b51c756fb16d0386c97b1bab8be52a1b3803f0b2c301dc
diff --git a/www-apache/mod_qos/mod_qos-11.72.ebuild b/www-apache/mod_qos/mod_qos-11.72.ebuild
new file mode 100644
index 000000000000..a6cc2a461250
--- /dev/null
+++ b/www-apache/mod_qos/mod_qos-11.72.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools apache-module
+
+DESCRIPTION="A QOS module for the apache webserver"
+HOMEPAGE="http://mod-qos.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libpcre:3
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="QOS"
+DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
+
+need_apache2
+
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+src_prepare() {
+	default
+
+	pushd "${S}"/tools &>/dev/null || die
+	eautoreconf
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	pushd "${S}"/tools &>/dev/null || die
+	econf
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	apache-module_src_compile
+	emake -C "${S}"/tools
+}
+
+src_install() {
+	einfo "Installing Apache module ..."
+	pushd "${S}"/tools &>/dev/null || die
+	apache-module_src_install
+	popd &>/dev/null || die
+
+	einfo "Installing module utilities ..."
+	emake -C "${S}"/tools install DESTDIR="${D}"
+}
diff --git a/www-apache/mpm_itk/Manifest b/www-apache/mpm_itk/Manifest
index 88d252e0dbc6..a92bf7277205 100644
--- a/www-apache/mpm_itk/Manifest
+++ b/www-apache/mpm_itk/Manifest
@@ -1,4 +1,4 @@
 AUX 00_mpm_itk.conf 130 BLAKE2B bdea54e21c622c519254d9853db92fd1ad27c893ba84aa4ba71a30f0a708bbe3b4646176e70afaaeff0a915bb9406601568844953d4e689b65d1e0dbba1b7ac6 SHA512 ac997b764631d90e4bbf37d3ccaaad55d555e8829c25a5feb5c018ac4505328692d7e781d15a6ada861320726a423af75d870428834e103092e65b4874593980
 DIST mpm-itk-2.4.7-04.tar.gz 45843 BLAKE2B baf590b82dce886723e7c6dfb46163eda2bddb3df96dbda52f491b3b821fa069a5aed7febdea6bce059418960484e748ad1117518346b0bbd588575a54171420 SHA512 4c6f02bbe3aa4e1af2e912b6a49751dedf976901484b4f55ff67757c2f40077a330e41bcfbe1cb433a8ec8870055b0533658e85042887aa94ccf14638eade178
-EBUILD mpm_itk-2.4.7_p4-r1.ebuild 1228 BLAKE2B e7e5b95126daf03a59f299f773427b7d1160c4246d780e835e3f18fb428bd9b5d34fc219314d054bacd3485e68115172d8016d74a68a906e487d368a8b3dcabe SHA512 5b5327dbd6363b461f04b6e063958aee5f062725edfad5df4422e38ea7c3480324d456e6b1d68b0e6e6a18c8f085f21bfa1f9b1f6ff876824689760afdebf9f6
+EBUILD mpm_itk-2.4.7_p4-r2.ebuild 1281 BLAKE2B af5d09bb636d9c8fa185eed57f3b1284d9602831cc34863ab6050f6dd8e68ae94c0d2730a7ebb81ec4a7d5214f216e98f67ed0d24465ffa174b1b309115ff4af SHA512 e47b4ce64a5c119944d0cf2a1c6ac3343194df6b27781f8e4144b5f3d5819e48bfe0200a603b82c78a782c4da21514269183e76614f4349e357e28500b35d1da
 MISC metadata.xml 219 BLAKE2B 27094593eb47f098fe9df926d3a827b65c2ca39ac6b03d392efe2c19d646274e5b462f65a7177ba2556a9167c994544688e53a3df810dc7f86ae43c4a75fd59e SHA512 e990bf6d766d6c0380344187a03b66380e4ed7a1554dd7a900ccf1f6f2dd3a51b06b382cedd5c73e0ad75301436b351fea0e7f1fb720c3d1345a8958554d341c
diff --git a/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild b/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r2.ebuild
index 7c684962d236..093dfa16ab39 100644
--- a/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild
+++ b/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit apache-module linux-info
 
 MY_PN=${PN/_/-}
@@ -11,13 +12,11 @@ MY_P=${MY_PN}-${MY_PV}
 DESCRIPTION="Run virtual hosts under separate users/groups"
 HOMEPAGE="http://mpm-itk.sesse.net/"
 SRC_URI="http://mpm-itk.sesse.net/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
 
 # The libcap dependency is automagic, so we require it
 # unconditionally. Reported upstream at,
@@ -35,6 +34,7 @@ RDEPEND="${DEPEND}"
 APACHE2_MOD_CONF="00_${PN}"
 APACHE2_MOD_DEFINE="MPM_ITK"
 APXS2_ARGS="-c ${PN}.c seccomp.c -lcap"
+
 need_apache2_4
 
 pkg_setup() {
@@ -47,4 +47,8 @@ pkg_setup() {
 		ewarn "for LimitUIDRange and LimitGIDRange which we include by"
 		ewarn "default in ${APACHE2_MOD_CONF}.conf."
 	fi
+
+	# Work around bug #616612
+	_init_apache2
+	_init_apache2_late
 }
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index da0508398fa6..45e3f7abab65 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,8 +1,7 @@
 AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b0245c2c37c27cc69eeba9be62c8b626b8fdf26c18ddffe0a06743abf1d529318f46c0091f64370f2a9d82f1b54116 SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d
-AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971ca028df4f8962e4220880361b96c3640475ac537f62d5e7ad198fdfb477fe15f34dbd86db4143b24246d11278eb58 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9
 AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d
 DIST passenger-6.0.11.tar.gz 8183414 BLAKE2B 9767c3f198d7a779dfefed1d1a2ab07e3dda964a61718475470266e3b4448a45d2c5e7416a2e148afa66241f74e91e98ccbec7f2a08f5d4d1e2eff2ac7de5f63 SHA512 977d8adb261c17d5f21115703b9b18c4d3bfc17f998fb880d3a28f68392db2f9e6a2cb7612211f08bc913fd2f417cb2b689fcab2317707e17e8ddea6aeb967d2
-DIST passenger-6.0.13.tar.gz 8216169 BLAKE2B 592b65ccfd7a043a6fcc1ea8061da3acaafd773caa2b5270e39906ee7f07cf3fb45654c5864eef53687d10c3079003a7ba8d3e8dfba50616b43516e1d457ce11 SHA512 25867f7bb7b7b09def800969884f5c3a2a5cf9dbb20817e02121a471e2eb6fb1e93d8ca3a4b103c5d17d6a61e33bf8edc29f54d496118b88c25147de85629d88
+DIST passenger-6.0.14.tar.gz 8216590 BLAKE2B 33fa27e05ae0c5e65e3fec3cd791eee799ebc71f2b2bcfd06c6dde530c1063c87f01a0249b57443f47745b376cc596f58b66f5790b0cb2ed70df8940b6faa92d SHA512 57189e1b78ff9dda38c37d07908cae20db1c856fb4279e54706d0efd2d1d140ff7af8ed9357c4de1360364d3809e376da152f8a18050dcf657850f276d9ce70c
 EBUILD passenger-6.0.11.ebuild 3937 BLAKE2B 38225fdc2ed6b7508017871093c41b1078b4a67b14b0b3c7e8fc8badb39157fe0d9a85cbfb91335178645d29c6e7ce0a49cbe1ec3f91deb713df8e65327b51f6 SHA512 bbbfd0ce8483d603d3539351c06f311efa42652fdb4462503c8136c74c9a7de273feec4bde5430c141d4fd150380c53738999729eea994cec2ee595e8667a3d7
-EBUILD passenger-6.0.13.ebuild 4021 BLAKE2B e08908037a90ceba1cad877b4a77fad19ab7c5b970a64b20ab2d6ec736bcf8b2ef86eaf08c500241f168644be36028e27c1544d04d9c83b7e150f66040d135a4 SHA512 d28e2ffb9c2cd0ad53647b4c1f28c7016255dfafe8bf61395a1161e7dbe7f96b5a1b08cb0335f97b345e7cbec7396235a86ac72a6e7ccbb4b874b42f43d32a5b
+EBUILD passenger-6.0.14.ebuild 4028 BLAKE2B 56ae8d23c31cc509fd12a67f6601685f1012268fa7b287a104ee7c7fce9dce7d23af8c4847067253df7f09722282f29fef324263b1ef10608bd9dae67f5f978a SHA512 6c5baef52b4da0a3df3596805cc67f0be8e060013dc1fafbb97ee733f88aac6315dfb506b81d5a6b0ab3e1cb1c8291fce5f93235590016f5c9b86c78e6d9ae09
 MISC metadata.xml 331 BLAKE2B 5cc7b65a8ac511e9065cdb9fc6f4a04923029f718f02ba0da718c798e0bb3a554a8da7f05e639daa88c2fec34888e6e1316ccab4a44a0d99b616354006e7c762 SHA512 95f21209228559e1b775f8b44c49e1d311a6c2955ba26fb24fb72bf64afd42048d9d0186828be8b733963b4aec245f5abc4540c1ca8baa14ee59b2fba0c33086
diff --git a/www-apache/passenger/files/passenger-5.1.1-isnan.patch b/www-apache/passenger/files/passenger-5.1.1-isnan.patch
deleted file mode 100644
index 02f7fe76df06..000000000000
--- a/www-apache/passenger/files/passenger-5.1.1-isnan.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr passenger-5.1.1.orig/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp passenger-5.1.1/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp
---- passenger-5.1.1.orig/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp	2013-10-26 15:00:00.000000000 -0700
-+++ passenger-5.1.1/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp	2017-01-12 19:21:39.696285758 -0800
-@@ -134,8 +134,8 @@
- inline bool is_nan_helper(__float128 f, const boost::true_type&) { return ::isnanq(f); }
- inline bool is_nan_helper(__float128 f, const boost::false_type&) { return ::isnanq(f); }
- #else
--inline bool is_nan_helper(__float128 f, const boost::true_type&) { return ::isnan(static_cast<double>(f)); }
--inline bool is_nan_helper(__float128 f, const boost::false_type&) { return ::isnan(static_cast<double>(f)); }
-+inline bool is_nan_helper(__float128 f, const boost::true_type&) { return std::isnan(static_cast<double>(f)); }
-+inline bool is_nan_helper(__float128 f, const boost::false_type&) { return std::isnan(static_cast<double>(f)); }
- #endif
- #endif
- }
diff --git a/www-apache/passenger/passenger-6.0.13.ebuild b/www-apache/passenger/passenger-6.0.14.ebuild
index eeae56538f93..bd5e5c4851b9 100644
--- a/www-apache/passenger/passenger-6.0.13.ebuild
+++ b/www-apache/passenger/passenger-6.0.14.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit apache-module flag-o-matic ruby-ng toolchain-funcs