gentoo resync : 05.12.2021

37 files changed, 360 insertions, 483 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 52567df61aff..4b738ca22c4c 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_auth_kerb/Manifest b/www-apache/mod_auth_kerb/Manifest
index f416e2c98b16..588c9a8fc0dc 100644
--- a/www-apache/mod_auth_kerb/Manifest
+++ b/www-apache/mod_auth_kerb/Manifest
@@ -3,4 +3,5 @@ AUX mod_auth_kerb.conf 40 BLAKE2B 76bfe68f7dd32d9f8dffb5a2124628c7971f7f7470182d
 DIST mod_auth_kerb-5.4-gentoo-patchset.tar.bz2 8717 BLAKE2B 759ad350bb6c07226c86fa51e22f17023378928abed3fd80ff280bac54a472a8d918cba680b3c75ce93805a7f803bbd370a6bb1b73665f5a8d5fb7cdc6353d1c SHA512 3909c2677b30790cc17c0d8843feaa00d9acd14a012672443a887c0e88473d6b1572ba045e1491bcab53cbacff193c11cfe15e63ef1046cfcdf1f4ab60e0ac57
 DIST mod_auth_kerb-5.4.tar.gz 93033 BLAKE2B 2f5c2c26f0f9fa5919f879680e0b8f29087edd001c166655f8130e8d7efd527b0bb9bbb79fe3e508c14622ecefaa693a96dc7dd16a3298da8ae0ad4b69b48ca6 SHA512 93fdf0e43af1c24e8c8204d09240b708747068ef99dd8d21b45cb4d132d31e6d582d49ea5e23b905f55cb0d4a20b1ecb58de1bcbfdad1d016e536fc622b63214
 EBUILD mod_auth_kerb-5.4-r2.ebuild 1397 BLAKE2B 793f5f2703d63596e4ea97cfb8cda795d4e10238814f7fff08429fbce086cf09c211eedf32ce6e348b868d6f8d2acca35cfefb395ca83c7dc451e19a15bb8fcd SHA512 664917f2de1e463573baba7599f68022270480cc9210b520fbd4d551549a8b02045210722c1f2824ef2914dfcebabf5ee53fca528d0fef85791e246a96d57f00
+EBUILD mod_auth_kerb-5.4-r3.ebuild 1453 BLAKE2B def0046f355054c2f4db256f0e6eba587e2adfb530c2257312a9d8b8f44bd927297250a946a0d01b1d8f934da6bfc0dafec68cf76aab9a828558515a25cb8975 SHA512 05d73f3dadf4e50dd3f6052aa05ea0d943b2cae62843942cc2772720627704fbe4fc5f7c84669342b478c2aef911761e669ee2e74f619c7b3115592768e48b5e
 MISC metadata.xml 249 BLAKE2B fcfd318a3d8fe55ad58570ca24b63d7e0160c65b5a66c0540d53d0f4123b42359a474eb0b9b3ee687686d6d2809b61f4bea13d7130f44c6a1036badfc0bec9cd SHA512 d812a7cc336482b8febeb447231bbc0d4aa105cfc780990627b16dd29f74dbf727ed52cf317def938759aded98d8bc1992f8cbc20bbb6b18575945682c42d26f
diff --git a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r3.ebuild b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r3.ebuild
new file mode 100644
index 000000000000..0a59d3214ff2
--- /dev/null
+++ b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module depend.apache tmpfiles
+
+DESCRIPTION="An Apache authentication module using Kerberos"
+HOMEPAGE="http://modauthkerb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/modauthkerb/${PN}/${P}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
+
+LICENSE="BSD openafs-krb5-a HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/krb5"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="11_${PN}"
+APACHE2_MOD_DEFINE="AUTH_KERB"
+
+DOCFILES="INSTALL README"
+
+need_apache2
+
+PATCHES=(
+	"${WORKDIR}/${P}-gentoo-patchset"/${P}-rcopshack.patch
+	"${WORKDIR}/${P}-gentoo-patchset"/${P}-fixes.patch
+	"${WORKDIR}/${P}-gentoo-patchset"/${P}-s4u2proxy.patch
+	"${WORKDIR}/${P}-gentoo-patchset"/${P}-httpd24.patch
+	"${WORKDIR}/${P}-gentoo-patchset"/${P}-delegation.patch
+	"${WORKDIR}/${P}-gentoo-patchset"/${P}-cachedir.patch
+	"${WORKDIR}/${P}-gentoo-patchset"/${P}-longuser.patch
+	"${WORKDIR}/${P}-gentoo-patchset"/${P}-handle-continue.patch
+	"${WORKDIR}/${P}-gentoo-patchset"/${P}-heimdal.patch
+)
+
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+
+src_configure() {
+	CFLAGS="" APXS="${APXS}" econf --with-krb5=/usr --without-krb4
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	apache-module_src_install
+	dotmpfiles "${FILESDIR}/${PN}.conf"
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/www-apache/mod_auth_radius/Manifest b/www-apache/mod_auth_radius/Manifest
index 3529bf6dba37..92126fb9e342 100644
--- a/www-apache/mod_auth_radius/Manifest
+++ b/www-apache/mod_auth_radius/Manifest
@@ -1,5 +1,5 @@
 AUX 1.5.8-includes.patch 719 BLAKE2B 2ebf52d30377346e1d7aeb66ee46dec5ef7366748d5d71246cd8215184a08cc8ec32a9879dd468d3d3b02e4c49f31fffc6a1e238d3f8b279b78970274798a303 SHA512 8c9bd0e4a9afd5ab009b956685bc0c94cef1a50dc112f701994804acd8fe821d1c25367c5bede3e95ad190149d1bd482dea90ff8824bb5a2aa20fa9451e81ad2
 AUX 1.5.8-remote_ip-obsolete.patch 1326 BLAKE2B cd788a83eb02e26033c369e8595e6a5e4e4f09d87cb5e32fc81c329c17369cf09b6d2e5368418238a62d9540cb0b5c9fc827799e9f0ca556b3edfe34ea5b3399 SHA512 172b319b90580e08200d787821e28fbd85ffb0dd6fb17566cbad62fd5908be225b7e7b34adc6cb0800f97650de2b0e5bc0cbe7e30f8fdb7ee75674bb7b670db4
-DIST mod_auth_radius-1.5.8.tar 122880 BLAKE2B 54f1b72cc5c7721c6aead2b0a465c2ddca1264c2a6c196dbf4498c53cc114f1b6afa5467aca5164a39401f0257aed91d8fca1fca4b7e0fe7cd4f04d398ad63a4 SHA512 0fcc43a44ea17b33595a850abb03ff6b92e100dfbeffc82caa9516f6eb7914fb463cb62286d624203a2c7035d05a107dda7b68c5cedf7de3b8be95b9266b6988
-EBUILD mod_auth_radius-1.5.8.ebuild 759 BLAKE2B c2296e1782cc5e208116e7d98b595271837a4e315aa0114100bce2015ce31b0365d9ae63e0233674a4c1a6d2a51a70e0fef4cf69ce07c856d6d114e1fffa671a SHA512 f6e5e4536ee91150b85e27f413e8e5f0e37ad28bcb652f5c27688883509798e4dc29575bd1c714549d08c204b73db7e3b87440237786a66367d92798c0ce6fef
+DIST mod_auth_radius-1.6.0.tar.gz 20176 BLAKE2B b004b133a3b8e84533f1e97883436aaec389870c6ca6eb2017bd7f4fac12913c438b9838ff1fce01e5ed26bfeec65f6ac349816ee681f39deea0616c22e2530c SHA512 e128855ab198b35030b798c16538fa33c1698f0f179fccb0d160c2d2cce08f1a7b2ecfaefdc19ae7f21802d38705b7a08414444ac52041b7365a5633e5e66159
+EBUILD mod_auth_radius-1.6.0.ebuild 896 BLAKE2B a53e510c70f452d6fb62b8810dd595724f661caa93c5b64c747105cff9c3116a2254457e084e01536183458c56e8912a4959559202abeb3e777397ac3b935191 SHA512 7a52be61ab97e29012df45a47d3ad64ac9c8416587f43eb094da32f0218edf25902c9a86c04ce1ff9a78fdb0284af98c548282152fb1f097000ffdec9c2c6a60
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/www-apache/mod_auth_radius/mod_auth_radius-1.5.8.ebuild b/www-apache/mod_auth_radius/mod_auth_radius-1.5.8.ebuild
deleted file mode 100644
index 831b59d27d9e..000000000000
--- a/www-apache/mod_auth_radius/mod_auth_radius-1.5.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit apache-module epatch
-
-DESCRIPTION="Radius authentication for Apache"
-HOMEPAGE="http://freeradius.org/mod_auth_radius/"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-APACHE2_MOD_FILE=".libs/mod_auth_radius-2.0.so"
-APACHE2_MOD_DEFINE="AUTH_RADIUS"
-
-APXS2_ARGS="-c ${PN}-2.0.c"
-
-DOCFILES="README"
-
-need_apache2
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-includes.patch"
-	if has_version ">=www-servers/apache-2.4"; then
-		epatch "${FILESDIR}/${PV}-remote_ip-obsolete.patch"
-	fi
-}
-
-src_compile() {
-	apache-module_src_compile
-}
-
-src_install() {
-	apache-module_src_install
-}
diff --git a/www-apache/mod_auth_radius/mod_auth_radius-1.6.0.ebuild b/www-apache/mod_auth_radius/mod_auth_radius-1.6.0.ebuild
new file mode 100644
index 000000000000..c53926ebd7cd
--- /dev/null
+++ b/www-apache/mod_auth_radius/mod_auth_radius-1.6.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module depend.apache
+
+DESCRIPTION="Radius authentication for Apache"
+HOMEPAGE="https://freeradius.org/sub_projects/ https://github.com/FreeRADIUS/mod_auth_radius/"
+SRC_URI="https://github.com/FreeRADIUS/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+
+APACHE2_MOD_DEFINE="AUTH_RADIUS"
+
+DOCFILES="README.asciidoc"
+
+need_apache2
+
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test ${v} -lt 1.6.0; then
+				ewarn "Please note that upstream has changed the name of this module from"
+				ewarn "    ${PN}-2.0.so"
+				ewarn "to simply"
+				ewarn "    ${PN}.so"
+			fi
+		done
+	fi
+}
diff --git a/www-apache/mod_auth_tkt/Manifest b/www-apache/mod_auth_tkt/Manifest
index d4329b4fe47b..c6bfd1dcf9be 100644
--- a/www-apache/mod_auth_tkt/Manifest
+++ b/www-apache/mod_auth_tkt/Manifest
@@ -1,5 +1,5 @@
 AUX 10_mod_auth_tkt.conf 852 BLAKE2B 315d7deebfc41e95f4fe15b13ede08839b787c5ce3917ffa292df859689e080bf8a91fd54fab60ed1507d0cdbc9dd88637a5689b67df683f93bdcce02572c5d5 SHA512 f3a5b209f89421780f4ac0f40662670403da41dfcebf46846d61fc4c7ef2359aaf44e12fcedb9f548e30abf7eab8c7c8b2fb2e425fc7c2d5c9e0e2db5de64958
 AUX mod_auth_tkt-2.1.0-apache-2.4.patch 1467 BLAKE2B 84c24ab295b729ff060868268539637f4db5c108783c3bdb1a8ed7857d6e9aa4b1d5c589144dd9f783ebc0e35c11e6928f75512081dee57a89dd5f0c23b098ea SHA512 12fb6273ff8d95591dbd7bb9839961425fb4526f54ab8f0ee09fbf3f9927a2754453dbfbaf55b34ab454e915867ee3085e77d34ad8b22d7aa4bc55e49a75550b
 DIST mod_auth_tkt-2.1.0.tar.gz 100731 BLAKE2B d3b7bd9d6fe90865ca6586b33402f6239899b46db358e737b93547bd1046f3eea1802b96c18df5bf2a39828ac448751f5fea932c852658589522a307b1695941 SHA512 e99ed60dbe2deebd654c4c849b20f7aa929ab476b9142e3da1aad8468b4922f4c36d30086396bb15676a3dc3e4ad9ac97e3524d1c70c6f18cea4c436174463b0
-EBUILD mod_auth_tkt-2.1.0-r1.ebuild 1043 BLAKE2B c3be0480d172f460bc2e31419497b1d068c621d941fc4139ef7e848310ffb775405f0bfd029f381a24902b83f0310ac40d242c30cbe831c154efc3ed94a19e3e SHA512 f127c8cf24be28697708caf10bc1042d97d367a892d89c338ea276307830d3459de240859b5e9c7937eaaf89662a5261501e0be91d151659f4975c0e2bc23e35
+EBUILD mod_auth_tkt-2.1.0-r2.ebuild 1113 BLAKE2B 924bdf13ff51bab3fb690d8aea915c84e847d385e1d591190c01cd0d6b2e9e580014ac239144952a9d18f888943139f2e2b61060aa274d3aaf54bf26f6277382 SHA512 2dee67bf48f6a790823be29f0b02c05ae4bba8d24f36bd9291c4824ddfc8ce62c9356fc95904a3eee5e36df0a40c77e37b2d6759cd811dee998d246e897c6103
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r1.ebuild b/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild
index e7ec743532d2..787f1c49d693 100644
--- a/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r1.ebuild
+++ b/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit apache-module epatch
+EAPI=7
+
+inherit apache-module depend.apache
 
 DESCRIPTION="Apache module for cookie based authentication"
 HOMEPAGE="http://www.openfusion.com.au/labs/mod_auth_tkt/"
@@ -11,10 +12,8 @@ SRC_URI="http://www.openfusion.com.au/labs/dist/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="dev-lang/perl"
-RDEPEND=""
+BDEPEND="dev-lang/perl"
 
 APACHE2_MOD_CONF="10_${PN}"
 APACHE2_MOD_DEFINE="AUTH_TKT"
@@ -24,14 +23,20 @@ DOCFILES="README"
 # test suite is completely broken
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-apache-2.4.patch
+)
+
 need_apache2
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-apache-2.4.patch
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
 }
 
 src_configure() {
-	./configure --apachever=2.2 --apxs=${APXS}
+	./configure --apachever=2.2 --apxs=${APXS} || die
 }
 
 src_compile() {
@@ -40,7 +45,8 @@ src_compile() {
 
 src_install() {
 	apache-module_src_install
-	pod2man --section=5 --release=${PV} doc/${PN}.{pod,5}
+
+	pod2man --section=5 --release=${PV} doc/${PN}.{pod,5} || die
 	doman doc/${PN}.5
 }
 
diff --git a/www-apache/mod_backtrace/Manifest b/www-apache/mod_backtrace/Manifest
index c19286bcf9a8..6ce8c32abfdc 100644
--- a/www-apache/mod_backtrace/Manifest
+++ b/www-apache/mod_backtrace/Manifest
@@ -1,4 +1,4 @@
 AUX 10_mod_backtrace.conf 113 BLAKE2B 758af2566c8d07c555d0069b504243677732fa95566d9ca526e32d52a2750c6788f802211f9d21558777c2d4b6b216cc0bdf5beee69b0d8f8a441687569e3741 SHA512 ed2f22ac750411d46508d9f5e740c9c3c32e2eb43c909c0eea743101f6d4213f7a2d3ccded0efdb5e10a148c407fb9f0213a01c5e741b1ee96dc4e5145642a3e
 DIST wku_bt-2.01.zip 933169 BLAKE2B 5ec19ee27284b432162ee10433d9b9da4f390557eec644c3cc9fae2f447ca23dbfa3d678054a90ee1d0cc54aef1666910f23e66b811b22652fa2a50abeeaf68c SHA512 c1bde8a26b395fc5fc66cd83c9282a8c519f34d27bef628ec502cec4245a7d446300178c9c94a5c5c0eb817bb8dd146587607760f9c9e780986d6ec53f03fb4c
-EBUILD mod_backtrace-2.01.ebuild 778 BLAKE2B 5a46521a918aaca23bc4406fd6a2fd01927ec008f6648b02bb5b7c63a13bc95b92f43fa4c9de86ba1991971cac5bb272cbb9f7d7edcc0a206b233b250f861efc SHA512 2636bf45f9a4b331eb38fc3b9e343af7f1d79300ce5b162eabefd5e368a8503791d282596177695dc0ecc8ce5f5f4c5bdd2825bc95f8bfbe7140fbd9d55402f9
+EBUILD mod_backtrace-2.01-r2.ebuild 947 BLAKE2B 107cc3d23da73d4f893f8b68f4542a33c1b10c46e5e4b7f7c4c79637179440b4b0ef663b4f574fa59f17fda795b641c89dcc7d6459d6d6b9ee500d317f57a6df SHA512 1194ca226a42c052be25c821b47badebc5828364ab622eda127bfe11c3f81a6d78586d8d91deea1ab44fac7433262f26f2e2c43bf3d4a9fe150a14540225d6a0
 MISC metadata.xml 303 BLAKE2B 24b16a350e89f31a0e9ba1ebdaba11943a4e3211188038bf2dd5cb1af5bd2bf162205fba336a3b217ed252e1c8571cc0b3a1cd84e09bbd6b69c6968720081ba5 SHA512 7cb3a607fc26b8c65e7c4bfa89eb67d6777b77c95a5e9f5eaeb3f648d66c838813dfa94bc75154aa51c82ad5b80af43330920d1bb26938c77bc9726f0ebd6762
diff --git a/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild b/www-apache/mod_backtrace/mod_backtrace-2.01-r2.ebuild
index 04115faa8877..84a65ffa352c 100644
--- a/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild
+++ b/www-apache/mod_backtrace/mod_backtrace-2.01-r2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit apache-module depend.apache
+inherit apache-module depend.apache toolchain-funcs
 
 DESCRIPTION="Debug segmentation faults in Apache threads"
 HOMEPAGE="https://emptyhammock.com/projects/httpd/diag/"
-SRC_URI="https://emptyhammock.com/downloads/wku_bt-${PV}.zip"
+SRC_URI="https://emptyhammock.com/media/downloads/wku_bt-${PV}.zip"
+S="${WORKDIR}/wku_bt-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -15,21 +16,26 @@ KEYWORDS="~amd64 ~x86"
 IUSE="unwind"
 
 RDEPEND="=www-servers/apache-2*[debug]
-	unwind? ( sys-libs/libunwind )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+	unwind? ( sys-libs/libunwind:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	unwind? ( virtual/pkgconfig )"
 
 APACHE2_MOD_CONF="10_${PN}"
 APACHE2_MOD_DEFINE="BACKTRACE"
 
 need_apache2
 
-S="${WORKDIR}/wku_bt-${PV}"
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
 
 src_compile() {
 	APXS2_ARGS="-c ${PN}.c diag.c -ldl"
 	if use unwind; then
-		APXS2_ARGS+=" -lunwind -DDIAG_HAVE_LIBUNWIND_BACKTRACE=1"
+		APXS2_ARGS+=" $($(tc-getPKG_CONFIG) --libs libunwind) -DDIAG_HAVE_LIBUNWIND_BACKTRACE=1"
 	fi
 	apache-module_src_compile
 }
diff --git a/www-apache/mod_bw/Manifest b/www-apache/mod_bw/Manifest
index 46d1c8d4b4df..54d8f5bc9299 100644
--- a/www-apache/mod_bw/Manifest
+++ b/www-apache/mod_bw/Manifest
@@ -2,4 +2,5 @@ AUX 11_mod_bw.conf 422 BLAKE2B eed5c83ad8e83caca31b659d0dfca21d1b8e8befcde5adc9b
 AUX mod_bw-0.9.2-apache24.patch 1637 BLAKE2B 3f7c430b7db37032e653a0b08853a18095db776ffebcfbf476127446e7f010b5763d49db564b0d2dcda79a2394e088f94302a2acd8f0410803b7ab04670c4ab8 SHA512 93e16714477c8e35a5780db1480aa4ff733ee3e38e8ce43f80a7d4ac63052a98ea003716e37b37ca6fbe5efeb2621576c7efbbbfc835590852fd904a1babfda1
 DIST mod_bw-0.92.tgz 23816 BLAKE2B f8ae08018ab970c4ac5572a1bf8922c621f285711a8d825f0113566b479fd2773967ef2eac690a4f369a2121b4deb1d528881e8d63b1b1871df54abd629e7cf6 SHA512 caa5c0eccb12498ca59428e0ac6b06e6a6c86c1126693071b5df20f32cc5a5673197b2e53e58c9edb0f0f8efd8d1c276cfdc9962cb90b219baf1bd0785ea2443
 EBUILD mod_bw-0.9.2-r1.ebuild 532 BLAKE2B 292462ccb66f4e2b6858fd6577100b6a7edb5833556f302c645503188ec677ad46d5cb749b980ce77fc5f5a741bc1e05501a3613a9cdb768b121bfae74e644f5 SHA512 7bb95c0c2964dd2f058e6095c248f57796cad0feffaa4f2d293e6b204bf26648e9bd0aa9074b9d5efaeffc6c4a2cdf6ae84568d936e6c3a97a48ddd796549e28
+EBUILD mod_bw-0.9.2-r2.ebuild 658 BLAKE2B 9deb150e59bca1fb6137dfc59141d7c00b4ec3a72159bb696d65023f908958c0403b7e460a248f2b76c6bab278ce975c88f9e6c7cb33127b5b18263a1ea5d11f SHA512 4693c706841a66f4cf61ffab125a6f32fa9dc7d1751a91937ad9fe576745fa1c9383c61dd9b293c6e729e4365a99c1da1ab3dd8dffccdcacd56e49f5003ec131
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/mod_bw/mod_bw-0.9.2-r2.ebuild b/www-apache/mod_bw/mod_bw-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..ff0a685229cf
--- /dev/null
+++ b/www-apache/mod_bw/mod_bw-0.9.2-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module depend.apache
+
+MY_PV=$(ver_rs 2 '')
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Bandwidth Management Module for Apache2"
+HOMEPAGE="http://wp.ivn.cl/apache-bandwidth-mod/"
+SRC_URI="http://legacy.ivn.cl/files/source/${MY_P}.tgz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND="sys-devel/libtool"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.2-apache24.patch
+)
+
+APACHE2_MOD_CONF="11_${PN}"
+APACHE2_MOD_DEFINE="BW"
+
+need_apache2
+
+S="${WORKDIR}"
+
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
diff --git a/www-apache/mod_dnssd/Manifest b/www-apache/mod_dnssd/Manifest
index d5df6a565d6a..a2e49368bf7c 100644
--- a/www-apache/mod_dnssd/Manifest
+++ b/www-apache/mod_dnssd/Manifest
@@ -1,6 +1,7 @@
 AUX 80_mod_dnssd.conf 118 BLAKE2B 821ab460bac4953375244a9da11674fb054f14611f73fbad3a5ee9441880a5842803ccbcd4077e97ac71c99646229ae254472fe25ccf701a80cf4a924549011d SHA512 ef13ddde307b6e4c8e48727d1d2145ca3ae99f8e105d4606628edd86576fde0ba4dd3cb6fb71a95d66a523e90cf30e5a3608d581760038f147f137fa5c6c4e28
-AUX mod_dnssd-0.6-httpd24.patch 603 BLAKE2B f18e9a6dbb133287d839bd88a94b131cd34d2789590ad3f2a8ee8d24d86206f5ed4dcd305c4c3b446be12297d6256ac10751b35508e902c486de5c7c0340c484 SHA512 c8e3428a1b4dfe0a24ed244ed30eb8b1181642a05d75de2b2b61ea48168f881b026d6c3fd0fbdfcc344736a1d93e4458853853e335076e498d6df091ccdde228
-AUX mod_dnssd-0.6-ldflags.patch 571 BLAKE2B be314c84a92262d3659a973ba1e2069389c16bde72674ab57465585179867cc8b3b851beca924f4596a8a237969e6defa162af6d222f84137a77d587463c596f SHA512 419c9565ac03a352568b3ab97e03e6878b5721a455fdd8f07f328d4a64ab401776f3a5ccd2a31e10b64fbbf334693c8f6e3636ed65f9f06f6f83d433f6366d6c
+AUX mod_dnssd-0.6-httpd24.patch 571 BLAKE2B e0a5d3610a7c26dcbad07bab08d38d872cea1070891e457788525d347408560bd30768c9b3886b5199b49f9b1a2c748824bb0a04a5c218604281c194cac09a99 SHA512 5af320fe038b9db4298874fa68c0de7381ff3f0471802d60972c9694c50616684a30e1986ff3beb95ed963060b792b1e5e3c88b31a199411c20ff15d3bb1fd0c
+AUX mod_dnssd-0.6-ldflags.patch 494 BLAKE2B ac0237603c2062a45ab5ef22a255ebedb8b1f75382dd64717398b1c4bac1289a086870363771f1abd1b8fadb1428a449d8c1c42f3f6ae520e2aa4979eedd8d66 SHA512 bbf43d11b6a52800277fcdf4407b6b46f49468337fa2188485d3a6af990b9fdcb5696b0fa2ec60453c3692e6f985659d73fe72053f5254d3f4c5c7907e851264
 DIST mod_dnssd-0.6.tar.gz 86417 BLAKE2B 01aee3624e413f5a00d6e63e5e74d9dc1667db9e9747b65a7fce9ab762cf0f9a5cd3ef4dcccf9532e9aa70435bd6afd846fdbaafff6667ba1fd9d413ea6fe0d9 SHA512 c3eacd2065f996ace76496b828a5be4b735225782c88ed0fba00c37ffed91af7c81cef755556968880e11e05fbaf65a4326728cb82abcad03ccaf925be1f29d3
 EBUILD mod_dnssd-0.6-r1.ebuild 876 BLAKE2B b27cf5b6b78e8d0bb5e0edc1b9823e769e83032618dae4d0b9748e371ed3c48a02e847367da17f4e44f03bd9c67262992db63cf94b2a85d9f2d6254c4ef20406 SHA512 9b7d00ee5dbd025fd8ac44a9596bdd3cf4577d15bdd19f236e369170cb066782f080d683218917f3b3db5a2dad3e1d47d97223b055e1b98a9749704b5b49485d
+EBUILD mod_dnssd-0.6-r2.ebuild 864 BLAKE2B ac86ebe1fa4ce2b238466dfceaa8f4e4e81dd923c1ae4ae9b185a9ce60b96fec4b135d793375cff0a141c6d36b07892c21e27772ac4e42c9e4c370847d87be32 SHA512 db4fad3e2d2b7111975892c884f54b929ba1e54c0dca8593e151e19c0abe6fc0059679d6692bd8095c92cbe2ea59f91edc2b64c0479f9437537aca96af4f8d29
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch b/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch
index 6eb505810405..fcb0c50c15bd 100644
--- a/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch
+++ b/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch
@@ -1,5 +1,5 @@
---- mod_dnssd-0.6/src/mod_dnssd.c.httpd24
-+++ mod_dnssd-0.6/src/mod_dnssd.c
+--- a/src/mod_dnssd.c
++++ b/src/mod_dnssd.c
 @@ -26,6 +26,9 @@
  #include <unixd.h>
  #include <apr_signal.h>
diff --git a/www-apache/mod_dnssd/files/mod_dnssd-0.6-ldflags.patch b/www-apache/mod_dnssd/files/mod_dnssd-0.6-ldflags.patch
index 699f2301f442..a81a255997c4 100644
--- a/www-apache/mod_dnssd/files/mod_dnssd-0.6-ldflags.patch
+++ b/www-apache/mod_dnssd/files/mod_dnssd-0.6-ldflags.patch
@@ -1,8 +1,5 @@
----
- Respect LDFLAGS and properly use LIBS to avoid missing symbols at runtime.
-
---- src/Makefile.in
-+++ src/Makefile.in
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -16,13 +16,14 @@
  
  APXS=@APXS@
diff --git a/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild b/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild
new file mode 100644
index 000000000000..828e5f62075b
--- /dev/null
+++ b/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module depend.apache
+
+DESCRIPTION="mod_dnssd is an Apache module which adds Zeroconf support via DNS-SD using Avahi"
+HOMEPAGE="https://0pointer.de/lennart/projects/mod_dnssd/"
+SRC_URI="https://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND="net-dns/avahi[dbus]"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="80_${PN}"
+APACHE2_MOD_DEFINE="DNSSD"
+
+need_apache2
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-httpd24.patch"
+)
+
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+
+src_configure() {
+	econf --with-apxs=${APXS} --disable-lynx
+}
+
+# Do not use inherited src_compile since it doesn't do what we want
+src_compile() {
+	emake
+}
diff --git a/www-apache/mod_fcgid/Manifest b/www-apache/mod_fcgid/Manifest
index 9a306e638527..a6e3b6491353 100644
--- a/www-apache/mod_fcgid/Manifest
+++ b/www-apache/mod_fcgid/Manifest
@@ -1,4 +1,5 @@
 AUX 2.2/20_mod_fcgid.conf 165 BLAKE2B 6d0df61890baa8d84f2a373ced303e86e492bef5b854b3cfad934a686684a3391afcdf9787e6998036c32924307567c88794769f144438bd4cd7633e7ff9af93 SHA512 f534c02703f697e76d4c1e57aa9785d81f58374ad4d4f458299e23d64bf3b80c9c5380a9c60862bcfbfbc0d6bef4f0e5c8c11c53e2f90c3824d3b1afd64bcd7c
 DIST mod_fcgid-2.3.9.tar.bz2 80205 BLAKE2B f0320e56f40c90f89d12ecbb91a54a98d49262d01547d743060dfc57c3217f9927a2931d997a003f686d09f4df1c42de45088ce4909aa689f7b7f4ab05b53971 SHA512 c429c14990cc8b492e88db1aa00fc2593bfb1b129b9001be21670d42c8f3e5038acd3f4556b48f3ac7dfc03c8d3656f0d4402122932e5bdc2c2aab1c7c235121
 EBUILD mod_fcgid-2.3.9-r1.ebuild 697 BLAKE2B b3c85797109fb5175dc49ba2daef6eda482f9305bdea4a56df235a4ec54fe5b3e5a0cecf4b9f948f7d9192915b264ed17a792e59f36286b0cec9c2c196d083b0 SHA512 e2f160d4094639f525c2b6c41758fc195e3e1ded8d470fabc32be45b27eb10c6ccedef69d6372f9030137cf56e49038a163087fff2c693d9e1d881c675a95443
+EBUILD mod_fcgid-2.3.9-r2.ebuild 772 BLAKE2B be62aed1deab3e36f8c2adebccb1b427f94a4cc43b6ff2314b27f9d48ac3bacb665f4767270defc3271a059fae8889e19ecdf107ab99bded7796082c97c16e5b SHA512 772bd75c450c7123ba5a9897f0f9bf0a4ec031846a444c6275642be551e6aff290a6f92b4c24d37d868949346cb843c140dd0b666dddaf342fa9d2174bd77723
 MISC metadata.xml 394 BLAKE2B 6ec8690080234855b34e9bb3be79ffc9e20455b3d21ab4a0119b3e66cbc571588e2a603a725cfd2eb84c6ddb7334069b8a61783a40b8a66573fad9cc5e97943f SHA512 24a4b3452fb8cfa3d1e2bbcdb3355f1ebade286a0f622ae8f630a98ea467d3f4c10a1489b1b889bfefe48e57f77f88fe5f2c57dfb01854f17145899d77ba42c0
diff --git a/www-apache/mod_fcgid/mod_fcgid-2.3.9-r2.ebuild b/www-apache/mod_fcgid/mod_fcgid-2.3.9-r2.ebuild
new file mode 100644
index 000000000000..3057d40345c0
--- /dev/null
+++ b/www-apache/mod_fcgid/mod_fcgid-2.3.9-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module depend.apache
+
+DESCRIPTION="Binary-compatible alternative to mod_fastcgi with better process management"
+HOMEPAGE="https://httpd.apache.org/mod_fcgid/"
+SRC_URI="mirror://apache/httpd/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+APACHE2_MOD_CONF="2.2/20_${PN}"
+APACHE2_MOD_DEFINE="FCGID"
+
+DOCFILES="CHANGES-FCGID README-FCGID STATUS-FCGID"
+
+need_apache2
+
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+
+src_configure() {
+	./configure.apxs || die "apxs configure failed"
+}
+
+src_compile() {
+	emake
+	ln -sf modules/fcgid/.libs .libs || die "symlink creation failed"
+}
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 1f450c2aa6cb..fe69dc2c2367 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,11 +1,5 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
-DIST mod_h2-1.15.24.tar.gz 664134 BLAKE2B 37795ee308d62f74583d7e37c262fca2ba235f025aa96314b1edb66e9900fef61f225d4143460e0bb29d46251c6aae8540ac667deb7eef8febc5fcc92c954b82 SHA512 3988e75b4b0ddb9361b559971a0e2c4c3af225d16bde6bf17ece33993487e6b4b6d66c874fede3cca97f40e9a83b500cf356546f7e83391fb81d5ec649a53fd0
-DIST mod_h2-2.0.0-rc2.tar.gz 655944 BLAKE2B d96d9196359bd7f6fb593a148a08a974e82a5e296c893526501c3e6c60f36581bc89548098e5ff6e42428d400cd8b7b44787ea97f7d0dbcd7d4da1db19c25ac8 SHA512 2c41fbe3d780452507d15b88fafe62c3386de023cc22181b7f077dd72e9c7738b6671494ba6e9c59f09df740ec4ec76dc42a9188e294b7900c97f1975038c0e2
-DIST mod_h2-2.0.0-rc3.tar.gz 656572 BLAKE2B 56001bb007ebb5114cd41c67e83221cc15d50e8ddc1d6ec5a512c26221577eea44bb5a74537bc39c6e50cc14ed6070177cf3ab0fff39d1c8f3147090a07aae0b SHA512 f236bb8aa137d8a3675938beae31e6cd27863b4fb91f9cb65d7704ecd977ecda08dc4c069a4c3be19cb64587a960dae69a0eed98d25f9e07ad223212bc208a51
-DIST mod_h2-2.0.0-rc4.tar.gz 656579 BLAKE2B 112fe4d41e0ddf769c0e7141584be823fd2e9849d95ea077347750019451937886cc6b88d123e004ba2fb799a4f0eea069337eaaa9627e8c70f4b74fb1c8ff08 SHA512 c061f97ebb13793067194a9bb531231b6aa424d2962c380de3769f04e09da3cf3434dd496e81c5f83137ea48cf197a4ee66ce7985c426c2b0b23eb1670e0e888
-EBUILD mod_h2-1.15.24.ebuild 904 BLAKE2B 5a0364fcff265b60e9f2eed81e821511bf66504000ce86358f2b0b5bc3638865b77059c5587d26842ba61d2f61856611b5cbf338d7f429d074448faa9cc2c774 SHA512 1e4483a00430182434a1871f177222d1c00007fbb27c400f7e2993a4fc1a0e71aa4de8641527c3da94b73e44b3ed637a6da374810e64bad4818b8d76190d8eed
-EBUILD mod_h2-2.0.0_rc2.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
-EBUILD mod_h2-2.0.0_rc3.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
-EBUILD mod_h2-2.0.0_rc4.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
+DIST mod_h2-2.0.1.tar.gz 664404 BLAKE2B 94ee488f205e4ca0fdeb40e743b5679208698af97a33f965b2828e2b4f66bed4bb4ca99a23113039ed4766c73aa0aaf00377d379cfd52a5f605c197269702303 SHA512 2e2d6fb01abe34549a6ea81f33356ebbc667223d5ccb23f3027685deb9a4482cacf26be8d5cd30738afbf52be4f777f896bb8c0061bbfbbfc4ea5f2ace267468
+EBUILD mod_h2-2.0.1.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
 EBUILD mod_h2-9999.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
 MISC metadata.xml 326 BLAKE2B 200b47b41409bd7167132c55b5e77b5efa2ec18859520ea38d61a625a6e68bbb1cb0095dda3fd7d273e17114e7cc0ff2fe5c1bbb66ea3a90b4796490fc04a2e8 SHA512 6d45faf84382555d53dc9f38f8d7a23454d763025bbb345f51bece78b36287372d86e173c894038839092adce210e444389b8c41644f44bce0c912880d788080
diff --git a/www-apache/mod_h2/mod_h2-1.15.24.ebuild b/www-apache/mod_h2/mod_h2-1.15.24.ebuild
deleted file mode 100644
index 5b9dbe992073..000000000000
--- a/www-apache/mod_h2/mod_h2-1.15.24.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-2.0.0_rc3.ebuild b/www-apache/mod_h2/mod_h2-2.0.0_rc3.ebuild
deleted file mode 100644
index 352e2e78dea4..000000000000
--- a/www-apache/mod_h2/mod_h2-2.0.0_rc3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-2.0.0_rc4.ebuild b/www-apache/mod_h2/mod_h2-2.0.0_rc4.ebuild
deleted file mode 100644
index 352e2e78dea4..000000000000
--- a/www-apache/mod_h2/mod_h2-2.0.0_rc4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit apache-module autotools
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-2.0.0_rc2.ebuild b/www-apache/mod_h2/mod_h2-2.0.1.ebuild
index 352e2e78dea4..352e2e78dea4 100644
--- a/www-apache/mod_h2/mod_h2-2.0.0_rc2.ebuild
+++ b/www-apache/mod_h2/mod_h2-2.0.1.ebuild
diff --git a/www-apache/mod_limitipconn/Manifest b/www-apache/mod_limitipconn/Manifest
index f13e7bbfe666..6378ca389656 100644
--- a/www-apache/mod_limitipconn/Manifest
+++ b/www-apache/mod_limitipconn/Manifest
@@ -1,4 +1,5 @@
 AUX 27_mod_limitipconn.conf 554 BLAKE2B 2bd5e2224a19d2b5a18b64224db41e232ed2c9028fdcaa751251e29d9990e1006b0ca25d09682f1a108d176a5898d2460bb26dc92816dd79530706434ac1adb6 SHA512 7ded8b48b769529a8fcb6b25855d31ef82cf3de423a75ae5e986974ba2c21643adff235ec9bfcde1955513d10fc3fc9dde172ddb9fb43626eb625bed96936c3d
 DIST mod_limitipconn-0.24.tar.bz2 10150 BLAKE2B 0715a0494f6d434217093625f10b5b723de3823c88c82fe2ffa22972b2496abae0924fc7b5d773568af125dc92466e8ab84e3e86acde7756c9535b244e729e88 SHA512 caf1337231ac83ef57938b0f89769afcf309a4a09a0a2c3fb171e49f038d42a5859dfdac06b2c7766f05d9431132b8752aa8ad5164794c89638eb90f392e827f
 EBUILD mod_limitipconn-0.24-r3.ebuild 565 BLAKE2B ce72b3c89d8a92fda493c2c7e8bd35e554a4632af9c28e6dc010394263fd60dafef962864f5e1637d6111aa2c55181e8e72dbe28a754916c26aaf2398c4b9d88 SHA512 bcbaa759c915729b218e229847f0327d95f564c2a22df9473a8aa21472923485a79dc3d8add58fca17c88c4ca705317755cc5f49a85e4f522887ae1baf8dd875
+EBUILD mod_limitipconn-0.24-r4.ebuild 644 BLAKE2B 8f3d10edfed100b00d698b30e48e5c19fe8a3e4b7381296308e62909f4c41f85bcbf7fa696c949bca5e12c29e9bd5f7c9e5ed333705ecdc19d634d828dcf74bf SHA512 da732e91f097d84debb5668ad293f41b6b1f3584158d1fb21648d9994995dbed65b9f37f59151fcdb1b6028de01c056c67d646b3eb5098c590f287d8117d555c
 MISC metadata.xml 359 BLAKE2B 781beba800b950a69431983fe6df11451311debde62a7a5715bddb5b9c8b90afa23e9844b67ebc46ea09d240076ecaf201e5ae1a5a51c3dfee3e2edc389bd34a SHA512 77c9fc37752c5bf419057e29e91e22efda93cc9ce3ba025c313947aeffa5a6195c8fbc0553c549ff6f9774613d8d2494128fc1e6079322d132309da8f3193fd3
diff --git a/www-apache/mod_limitipconn/mod_limitipconn-0.24-r4.ebuild b/www-apache/mod_limitipconn/mod_limitipconn-0.24-r4.ebuild
new file mode 100644
index 000000000000..df72cd42b1c4
--- /dev/null
+++ b/www-apache/mod_limitipconn/mod_limitipconn-0.24-r4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module depend.apache
+
+DESCRIPTION="Limit the number of simultaneous apache connections"
+HOMEPAGE="https://dominia.org/djao/limitipconn2.html"
+SRC_URI="https://dominia.org/djao/limit/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="www-servers/apache[apache2_modules_status]"
+
+need_apache2
+
+RESTRICT="test"
+
+APACHE2_MOD_CONF="27_${PN}"
+APACHE2_MOD_DEFINE="LIMITIPCONN STATUS"
+
+DOCFILES="ChangeLog README"
+
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
diff --git a/www-apache/mod_log_rotate/Manifest b/www-apache/mod_log_rotate/Manifest
index 1f43609d7a44..41c7c8ea069e 100644
--- a/www-apache/mod_log_rotate/Manifest
+++ b/www-apache/mod_log_rotate/Manifest
@@ -1,4 +1,6 @@
 AUX 10_mod_log_rotate.conf 132 BLAKE2B a7bb07653e4f31bd5e54f864d06ec62a8ff2cbdc298917b92f2da1b59e0bf7835863caf61461dbff3663eb3c9762cfca6a281166ed0a1da82e815f1215b9938b SHA512 70f973aba76042486bc9ca71365bc2c0e1e78266956418d3804ba4af4a6a491373e62da96b40a7ad1a5f24ab75692419214565e4e579ba75ec5a1259dbdbed27
 DIST mod_log_rotate-1.01.tar.gz 9772 BLAKE2B 87fd9f3d02c2aad3849236c8a7e8713e9f550b6b795fecfe75226e5d429c5abe0f2626754f8a82036e0ee1b90802e46ddd90ac622ba3740c0e3382346bdad534 SHA512 7da606ae8ce5e0f2ade16fdffffc57fa9549b4b5e9529eb3149ff7390caa64f7ec065aa7416b5c8ab751e2b3eaf35cf79c96b8c7e68e1165a46851547781c076
+DIST mod_log_rotate-1.02.tar.gz 9805 BLAKE2B c2fc8dd26520443ff1363d193c7fd99576fc319d283789cf4527dcdcbca3e88073ba2458d507f456646657b926721b6865cf4d20f9cabb625b7457b85c62d8f4 SHA512 90673723c971527e5b03e138f9f3c4c3c8dfdf98f54f813ee09e5003e13d07bf0595e1e4e6d06e33b55b65566dece03dc1474e9816292e18eb2164724fa390b7
 EBUILD mod_log_rotate-1.01.ebuild 519 BLAKE2B 62bdce177816e7bfeba39474fa0fd7152cfeb00fbe0913535a478cc558d1bb2d74279a06a796db81d0e1d233e45ab9f179bf20c36a44be5804a1fd16431bece9 SHA512 397a40ad12db88b6f7719860d1e98ed5c4faba5a5af1c5162fd7f9945e82fb2ca8badd2239256f5e5d996038d7bfa418bbdb90381be320fd3dc37a0039f752c4
+EBUILD mod_log_rotate-1.02.ebuild 593 BLAKE2B 0a8071e81ae2c5f6f2a9bc2a8d6a0b47823328ecec7ddc31d3304310b8f70019d7a0596790b7312055a7d5dd3f36b3dcce5880abe8ba576999a8ccccb40c3b87 SHA512 b89dc1e809074e419b876fec79ff8aecde1b9305ee6cd1f39e04042d689633f4dcb318aee71992c636d46a9e8a7e17ba83e885b92da97ede2ef6ce620c95499d
 MISC metadata.xml 254 BLAKE2B c8404065a92350eff40af580afc4425da1e7409c1cedda84eeb400bdd950d83358b518c4a06362fd6d35292f604d090c83a32a197af1807e8f1826adad88a539 SHA512 329b8e124cfc3d21445afb36ed0dc08cd1769663d81d85ad2e9b7d985c4210e6cbbef006e55d3cb79f260117c8a7bb2726ad61f8f9640b0cb80224c64d73367a
diff --git a/www-apache/mod_log_rotate/mod_log_rotate-1.02.ebuild b/www-apache/mod_log_rotate/mod_log_rotate-1.02.ebuild
new file mode 100644
index 000000000000..3783475358ed
--- /dev/null
+++ b/www-apache/mod_log_rotate/mod_log_rotate-1.02.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module depend.apache
+
+DESCRIPTION="Log rotation support for mod_log_config based on strftime(3)"
+HOMEPAGE="https://github.com/JBlond/mod_log_rotate"
+SRC_URI="https://github.com/JBlond/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="LOG_ROTATE"
+DOCFILES="README.md"
+
+need_apache2
+
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index 938310096216..5022fece0780 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -1,14 +1,6 @@
 AUX 10_mod_qos.conf 97 BLAKE2B d3dfe5296b89ef35b09e6b9a0d272c3fcfd66ceb54e2405c31d67a703a68f7362f5bd5340d3634d8f2c09cc8b825a8ef715c0b99430df5b9b98355c2ff4e516b SHA512 eafdbc3ae2f33a7e2bb55e59c311e79688c3ecabdd12247a5f68a9c00c46b84c709139f124cdccc5fd7b3d792b23a94ce37a8d27835d70c521ad6212d4e761c2
-DIST mod_qos-11.61.tar.gz 1242978 BLAKE2B d784538e516abda338230ae9f2580217e3727f8aa22e5d1e881d605ade06444753c9f393a16ef8c683422bb989434b1152aa06955c3f5ba5b38e486d3cc4571b SHA512 c34a970e869238a1340a4bf32f3b21ac3e19cfb65a809989c45100aa1c3559ce0a5f5c30e6366f6d65ef04ad6fc1be73f80a9fc18b7a6a164912618cce6383a8
-DIST mod_qos-11.65.tar.gz 1247087 BLAKE2B 145af39814f974855520415c3bf114aa11ac9002784feace877c9777311fb77fa798fe5f61c7b63201ab5dd6d9582a1d141f421c7215ba3271a29cece13d02b0 SHA512 7a4363b7b5e31968188f2668003d88538134456c3e6eeaff7d200ebf46064139561da6adf9b96678f349bd296f2c502a2d2c9bfb8ae12f7c78e3edbe5c13de3b
 DIST mod_qos-11.66.tar.gz 1247819 BLAKE2B a835722363a816637411b434eba60bc91f04fe48efd1dd5a3b63f046feb2fb60d776a64d0a4e889c8f827f6a3002fa731743d079b5f3ebd3bde3edf2023c983c SHA512 19541c72d72cd9c4f055f6c0908e1ddbfa0b27f33e13edbecf9abcf61c2fe334ef797e3ad44c7d8343d5d2df714744b4f1a3f0f96a6de02ff7d7999385393db6
-DIST mod_qos-11.67.tar.gz 1282401 BLAKE2B 60d608f1e26fd2a50b1d48cad64210bb3aefc4397ce9cec302ac04fde2f8e6d1b781707509ad0ab1ce83bc8254f4b86d6de2d0f113f3000156fe81beb8df41f2 SHA512 3391d05917bdab6218774b886d7bf9f5be628525d53c91b14586f6870386f1cc333cc83340339f4ccf1918e22a2a55a5984b99643e581b63298a173e95c20e4b
-DIST mod_qos-11.68.tar.gz 1282547 BLAKE2B c4067afa20e2e5e9a0d14a5f96bbcdd5ac4d1e337373dd3ca67960f888edd8340942285f455fc418d554d3a17150cc0417ccaf06be18f41549877fed4378b809 SHA512 e49d643eb1f8210feebb8067ee84154c7334a0a0d2365aa297621ce505057046d744cfbf87aaf0a023248979f3576c083b43066c89614e0fb7c564f09bbfe773
-DIST mod_qos-11.69.tar.gz 1282840 BLAKE2B c0fe81b116b7d39409ec5cf87e35bb7843a0dfb4cd76a6b3ac169d96557e40a04bb06b834ba6cf2988ac3fee3e911e623bfb950cef4cea1500334addaacfe8de SHA512 e6daf7e5d267d9676c151ce2bc26347073dc89ebb49796bf843e4d9698b3dc542bcf4c7f979c9b4017f7277778f264790629e60b7ee6547e4754838e9fe4f3f4
-EBUILD mod_qos-11.61.ebuild 1018 BLAKE2B a767c7a386589ba71393c8f7c9b6cf1086d02dc70b9b2349230cf91628bae7ee4633eef70d932ac34a780156fe12deab23c8782653e4bf9e444e200b7e7ee78e SHA512 880a9b2920d2604630d0f9a813bfc38a1a469f4de9a3c731bef61dbe122f094e4b681d783228aaa71b0229d08e95d9362d23adccc8556985eb193a5b0dacfd51
-EBUILD mod_qos-11.65.ebuild 1165 BLAKE2B 3e289624c4779988e86e9f5814929aab89f09f20c37909375f2d2084c10a691f65899349556562e1030b89eb207b3bb25b6e168e5e3c6d4bd28312674e59b126 SHA512 d7e2a30f9021da10dee0c0961c064d9649a74354406d8741f815163ca40c391e35f6509fac8453c450c94b4982eb5c3dd780ff824478c19c9466860e77f21d35
+DIST mod_qos-11.70.tar.gz 1283241 BLAKE2B 516dc8ec0228956c374845e10ed2533291544c496a1eda693da28d551b81f83ab898384a627b87c940782925c5bc84f1140e4e241c964b451acb63fd947a274d SHA512 004898d7993cda82f261d28e4c91b1ff1665465d3ad1da005fae94471824a31f0d30ca4edf700ddb45bfde133218c55d49a396ba03b3ed0ac00b1743c4aaa5be
 EBUILD mod_qos-11.66.ebuild 1141 BLAKE2B 4c08f022489736efcf3833b70c6ae90663ccb34bbed965e14b55e4c028c039e1e438618ebd153eca1e22c2b0f1a541a68c2383d4b80d8cbb7bd549a766bb6f06 SHA512 54ab558430ec323df724e4f4d2a2c0019c94f97d656b1d75107b0e1ac0a905fe4cce2422f28d79342aae2b41f7466461fd6480518a0d6d89c3396f26dedfab4e
-EBUILD mod_qos-11.67.ebuild 1142 BLAKE2B 8b9f5e9626719ec8390b401df2b9f17a00231cad9135c5a107f9e965a24f6823c60d99faec0a6dcaecd18a957ac1930078f9937d3694fa66edede3fd960e34ca SHA512 aea1e1ffaddbb25679e7815e1ad48f76cc8ab59606c20beaf8dcfe54640c9a939f2dd864550911d0257554ad39f529fa9a09bead62e2ab04d029fefc8fbe9887
-EBUILD mod_qos-11.68.ebuild 1142 BLAKE2B 8b9f5e9626719ec8390b401df2b9f17a00231cad9135c5a107f9e965a24f6823c60d99faec0a6dcaecd18a957ac1930078f9937d3694fa66edede3fd960e34ca SHA512 aea1e1ffaddbb25679e7815e1ad48f76cc8ab59606c20beaf8dcfe54640c9a939f2dd864550911d0257554ad39f529fa9a09bead62e2ab04d029fefc8fbe9887
-EBUILD mod_qos-11.69.ebuild 1142 BLAKE2B 8b9f5e9626719ec8390b401df2b9f17a00231cad9135c5a107f9e965a24f6823c60d99faec0a6dcaecd18a957ac1930078f9937d3694fa66edede3fd960e34ca SHA512 aea1e1ffaddbb25679e7815e1ad48f76cc8ab59606c20beaf8dcfe54640c9a939f2dd864550911d0257554ad39f529fa9a09bead62e2ab04d029fefc8fbe9887
+EBUILD mod_qos-11.70.ebuild 1142 BLAKE2B 8b9f5e9626719ec8390b401df2b9f17a00231cad9135c5a107f9e965a24f6823c60d99faec0a6dcaecd18a957ac1930078f9937d3694fa66edede3fd960e34ca SHA512 aea1e1ffaddbb25679e7815e1ad48f76cc8ab59606c20beaf8dcfe54640c9a939f2dd864550911d0257554ad39f529fa9a09bead62e2ab04d029fefc8fbe9887
 MISC metadata.xml 326 BLAKE2B 469e74aa98baf0a4789743501b566d233d6072595c29c91ef4cffb4a9e4a986dde186cef2326e5b1e02d57a69f49b9dcf9fd045c857a5627f68f50787cd6d072 SHA512 bd08a8ffbee3d67a6b5a81e615ad0bf161204027e91ae69bd5a541a2d76f0ec52ca7405647d03d2ed3b51c756fb16d0386c97b1bab8be52a1b3803f0b2c301dc
diff --git a/www-apache/mod_qos/mod_qos-11.61.ebuild b/www-apache/mod_qos/mod_qos-11.61.ebuild
deleted file mode 100644
index 9cfad84c4f10..000000000000
--- a/www-apache/mod_qos/mod_qos-11.61.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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"
-IUSE=""
-
-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
-
-src_prepare() {
-	cd "${S}/tools" && eautoreconf
-}
-
-src_configure() {
-	cd "${S}/tools" && econf
-}
-
-src_compile() {
-	apache-module_src_compile
-	emake -C "${S}/tools"
-}
-
-src_install() {
-	einfo "Installing Apache module ..."
-	cd "${S}/tools"
-	apache-module_src_install
-
-	einfo "Installing module utilities ..."
-	emake -C "${S}/tools" install DESTDIR="${D}"
-
-	# installing html documentation
-	dohtml -r -x *.txt "${S}/doc/"
-}
diff --git a/www-apache/mod_qos/mod_qos-11.65.ebuild b/www-apache/mod_qos/mod_qos-11.65.ebuild
deleted file mode 100644
index 7d7ff9dfbeff..000000000000
--- a/www-apache/mod_qos/mod_qos-11.65.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-IUSE=""
-
-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
-
-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}"
-
-	# installing html documentation
-	dohtml -r -x *.txt "${S}"/doc/
-}
diff --git a/www-apache/mod_qos/mod_qos-11.68.ebuild b/www-apache/mod_qos/mod_qos-11.68.ebuild
deleted file mode 100644
index 412c8e3c8eb5..000000000000
--- a/www-apache/mod_qos/mod_qos-11.68.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 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/mod_qos/mod_qos-11.69.ebuild b/www-apache/mod_qos/mod_qos-11.69.ebuild
deleted file mode 100644
index 412c8e3c8eb5..000000000000
--- a/www-apache/mod_qos/mod_qos-11.69.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 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/mod_qos/mod_qos-11.67.ebuild b/www-apache/mod_qos/mod_qos-11.70.ebuild
index 412c8e3c8eb5..412c8e3c8eb5 100644
--- a/www-apache/mod_qos/mod_qos-11.67.ebuild
+++ b/www-apache/mod_qos/mod_qos-11.70.ebuild
diff --git a/www-apache/mod_rpaf/Manifest b/www-apache/mod_rpaf/Manifest
index 3a0a2bd238bb..d28553906225 100644
--- a/www-apache/mod_rpaf/Manifest
+++ b/www-apache/mod_rpaf/Manifest
@@ -4,5 +4,7 @@ AUX 011_apache2.4.patch 2833 BLAKE2B 9bb24037fb0b1394ef9fcf415626b8a865611d0d77d
 AUX 012_Add-missing-header-for-inet_addr.patch 326 BLAKE2B 603089f9c539bb10bbeffe13e93a4751f152dffcb755e2f014071afe99676a272a93ec5f52d0b13ce46983df977dd11fafcf1f9075a95afd4481de48b0129275 SHA512 ca0153d63ca08a0504313da135c4ef7060f30144d2cf5a6a74ee19be05bfc6a914d50da319f66048cabc88bfdef098730c20bccf45df219bb6629bbae67edb94
 AUX 10_mod_rpaf.conf 114 BLAKE2B 803cfbfb28884983e8115c5e0544721e8ff9b8b8be1065b1c555d8c1381d6792e8071d6e8434dd56d1325c8f1b0696bf688ee54a2237313f0bed1cf2300a39bf SHA512 33c7f44fa372644ee8654778a4fac5056830a11c90b4ef8aaac17df1e34644fa07cef7f6db2135dcf047dafb99f302c19e288653028811f4f4306aa53f7c58ec
 DIST mod_rpaf-0.6.tar.gz 7695 BLAKE2B 4aeb7fbaaa9c5fdda139b3f6eeedae842f623382c54d13166117d533c7674ad587be1d2da914a68594be6fc999f40bd60a985f773272f0ea9769cd72f8e25736 SHA512 1ad5af69cfe0e72cc609c081388e20e6a40cff1af7b47581b3d6958e5c7badf6580b2e14e5bd86482fe7cc7b60ca5045a2486c6f3f6e8ece7c142d38df990b4c
+DIST mod_rpaf-0.8.4.tar.gz 6458 BLAKE2B 80919bbae3a3fd1dfc343efe669a21bb57e041d79987a7430ef40085576164707995a9b0b4d9f41aeaefead7f1951a08e800ae40cc2141cd27df8a7feeb5bdb8 SHA512 ae3a265bfa829c62721acfed6ed20ecffd48f130e435e14769d65e635aac3e3ac15c57d198ac2a0f3e7479dd4d71f90cc15ab717ed396ca016f8822312ff4305
 EBUILD mod_rpaf-0.6-r1.ebuild 537 BLAKE2B cea5eaccc9d1035e9e09a2c1968093c5a11db0d78f035ac8a22a9949a27820b4b57ca0273cec85b5c8e9648e2eca59ab703f3cdc31642b8c7000020c2817b4aa SHA512 3ebe42367b9c5ac81a9e371e3b512bea95211b208b05fbc98e4a989dbe85dbb34df431cd083abc422ba0dd26125e39895a72b16556eec747d7a0b98f3e7ee027
+EBUILD mod_rpaf-0.8.4.ebuild 531 BLAKE2B 9035b29e77e10c4f2866dbb0504f280c2212c5a905c928270748826150122a79b0b3e5d98f916065dd80d9534e65aa3c0dff1b6358adcba119ac534c1cd32f94 SHA512 d6109f82baf86c0c046e2082f423115c5f62eace6d9423ea79c1cf377986580d4e4c7c7efac9fec1e6fdaed33f7dd22f7ce1d760805edd883930d25d95c4ce97
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/mod_rpaf/mod_rpaf-0.8.4.ebuild b/www-apache/mod_rpaf/mod_rpaf-0.8.4.ebuild
new file mode 100644
index 000000000000..101d8e4e0898
--- /dev/null
+++ b/www-apache/mod_rpaf/mod_rpaf-0.8.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module depend.apache
+
+DESCRIPTION="Reverse proxy add forward module"
+HOMEPAGE="https://github.com/gnif/mod_rpaf"
+SRC_URI="https://github.com/gnif/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="RPAF"
+
+need_apache2_4
+
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
diff --git a/www-apache/mod_whatkilledus/Manifest b/www-apache/mod_whatkilledus/Manifest
index 1d3bdff212db..c159fd1c4ce0 100644
--- a/www-apache/mod_whatkilledus/Manifest
+++ b/www-apache/mod_whatkilledus/Manifest
@@ -1,4 +1,4 @@
 AUX 10_mod_whatkilledus.conf 169 BLAKE2B eb84b23e74660b020480d9822955b3d4964070fe658a3bba905e33c2f5556ceb1a8c2cbc6d1a760d49b17c3005433dfb40a013a0105f7e3c7084c4f9e926d573 SHA512 2ee25a68b4a188060cf361591c9946bc36d75aefb43b6e91b42727fe1eace658bbb877c1c181d5e9677aea289154a84135cfdb7c3d501d9dd0f967c160b3bfa4
 DIST wku_bt-2.01.zip 933169 BLAKE2B 5ec19ee27284b432162ee10433d9b9da4f390557eec644c3cc9fae2f447ca23dbfa3d678054a90ee1d0cc54aef1666910f23e66b811b22652fa2a50abeeaf68c SHA512 c1bde8a26b395fc5fc66cd83c9282a8c519f34d27bef628ec502cec4245a7d446300178c9c94a5c5c0eb817bb8dd146587607760f9c9e780986d6ec53f03fb4c
-EBUILD mod_whatkilledus-2.01.ebuild 701 BLAKE2B 3648f9e8f140351802bb2784c3bf2ae0c7aa3e5777dd79c70c794ae894577b02859a8b7813d1bfbddab8f6e204b79b16437c98bcff29d306ca5a19c0870a21f9 SHA512 2dbce07854740344cddc9ee03b8cb2a75c8db0c4a03114a2d4f54c86fad2e95235338eb1f07c39361d228876cc4c86c0454f68f73217cc06cd91aa1f8cf8fcea
+EBUILD mod_whatkilledus-2.01-r1.ebuild 783 BLAKE2B 7bd37985b70c11d31021df79e80a35e473932d0fb35d1fd4a4f0b3934fc5056e4efd1eaaa315904ae01df8904e1228768d171491f4fbc6f462951734b7bc6e06 SHA512 b5f5707fec6c16188933440e3d42e1dfe986b6df6584d88ac35c4d91a8905fc4d7a0d8de5dbbdcc9e71734442cf7957080ebb2938741c901b429b9b8ee37001f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild b/www-apache/mod_whatkilledus/mod_whatkilledus-2.01-r1.ebuild
index 29a55422dc59..708ceda8c228 100644
--- a/www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild
+++ b/www-apache/mod_whatkilledus/mod_whatkilledus-2.01-r1.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit apache-module depend.apache
 
 DESCRIPTION="Debug segmentation faults in Apache threads"
 HOMEPAGE="https://emptyhammock.com/projects/httpd/diag/"
-SRC_URI="https://emptyhammock.com/downloads/wku_bt-${PV}.zip"
+SRC_URI="https://emptyhammock.com/media/downloads/wku_bt-${PV}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND=">=www-apache/mod_backtrace-2.01
 	=www-servers/apache-2*[debug]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 APACHE2_MOD_CONF="10_${PN}"
 APACHE2_MOD_DEFINE="BACKTRACE WHATKILLEDUS"
@@ -26,6 +25,12 @@ need_apache2
 
 S="${WORKDIR}/wku_bt-${PV}"
 
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+
 src_compile() {
 	APXS2_ARGS="-c ${PN}.c diag.c -ldl"
 	apache-module_src_compile