gentoo resync : 28.04.2021

46 files changed, 236 insertions, 554 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 51a5dfde2a7b..708bb2088d77 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/anyterm/Manifest b/www-apache/anyterm/Manifest
index daf2e99665c1..6e24f4cd839f 100644
--- a/www-apache/anyterm/Manifest
+++ b/www-apache/anyterm/Manifest
@@ -6,4 +6,4 @@ AUX anyterm.conf.d 157 BLAKE2B 1ad6fc94e1d920ca108fccdd0988edb5b763f9a6d014a663a
 AUX anyterm.init.d 426 BLAKE2B d573fb46bb23a909f49c516b1e4605eb405bce52682a9ce5a5f72d62e36f1122ea0cd497f688453b6604794ed399e33cac11ae06ec9a9a320d698160d746d39f SHA512 5c4086796bc9d63b96605df9931aadd8d1bc3021bbe5366412c309d9bbf519abdcd065b5cd602ea33555bb4edc8c376e72b5f8a6db63f19843b8cffec255304d
 DIST anyterm-1.1.29.tbz2 178424 BLAKE2B 33416d5cd4bffff3bbbaf6cdb65458c0183a9d2fc58a0422b81b293106152f9d11d002a8cc1a9b1d3cd6a6b51c3d9f682f0e156258d35e7a54abf39349ed185d SHA512 119b2b3eae416721bfd7511d5325f8a8b7bdf4438655a5760f3cac2a91c0d41db2b1efd6bc8f3effb99bff646a21d88ab6e670ece0191e69aeb85f093dc5ab75
 EBUILD anyterm-1.1.29-r1.ebuild 1306 BLAKE2B 1f916bdb14b8a9d6478e897d9e68d0dca9113955cd315fc9ed666b7b5a2138861164ab1b4a3847183142752f9b9ec5403dd3e3300a3dde4efd6bd76c8375b751 SHA512 304c486fafe2025694539190e4d5f4736e23e4e41e86ce24b4e4e3c43723c45768e102d78ed65747e3f1e4b866430a949df44dca3192d7ee2529fd4f006ba16c
-MISC metadata.xml 250 BLAKE2B 856ff9793486ce226d86aeb43e3c5a75acf1fdd49936d52cf09e72669d2e956844d9087cf5cb67d4f04353d30be644bfc1daaa70b2ae332651f4bf71ae5c31e8 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/www-apache/anyterm/metadata.xml b/www-apache/anyterm/metadata.xml
index 2b9b44f73497..7a38bb900964 100644
--- a/www-apache/anyterm/metadata.xml
+++ b/www-apache/anyterm/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest
index db297d0cf039..55c9c0cb7324 100644
--- a/www-apache/libapreq2/Manifest
+++ b/www-apache/libapreq2/Manifest
@@ -3,7 +3,7 @@ AUX libapreq2-2.08-doc.patch 1188 BLAKE2B 296bf0b1e23389c0d418df23768e68932c22f0
 DIST libapreq2-2.13.tar.gz 891320 BLAKE2B 6e896b95a17d7e4eede651bd74f21280d77b38c1c96be790c34993307a0435ea6d4626825dc215680e1fa2cd6a3ec635fcbeb9fda3b34e687ed8f7641b4fee7e SHA512 54553cb90c0d3f6fb34ff19364c5804976c4aff1bae551ae051fdd06f41695770f1e285c40e03dbd93ae738adc332f38f1a1994167598364071feaec833fdf05
 DIST libapreq2-2.15.tar.gz 839618 BLAKE2B 875aa8091512cf6b43c8654579b3d4779ea50835784380dcf69ca048f9b8d4ef6e573fef5ee03c0e47a929dcd8c4643d5dc861d875122095024bca6e8fbbf38c SHA512 abdc34f4867ba891966e7296c8110cffaa723f9b966522a1de352bc459e89e5cfc60de25dcd20cf0fa9b7cdf9282719b0276b621af8aa7bb770c89a7fbae4701
 DIST libapreq2-2.16.tar.gz 839264 BLAKE2B 6a79e0281bb24962775f6c2fcc906d07a2f7643f608871018a647a225329c45516f1afe12e27c432449765463b2a4e823a728051fa73938e97ddc828b94c4732 SHA512 aa9e751a3f0d6a9cb587aa1c5408e8d9a073560860d7f653776196fe3739516df16abe943c9cb0460cfb9b68a2d79ad651cfd5e4a30a2ca34d6dc3ced73f628c
-EBUILD libapreq2-2.13-r1.ebuild 1431 BLAKE2B 3fb9ee38eca5794203c451fc80cce1b6c5871559142b0410a0ab639ca9333d82e29440a38eb09521b2af89c7e257794ec5973d846a4375a6dab280a36f5ea642 SHA512 751c34af300a3b020a0df6ad82882ffdf840f6fd28295c3bc388d3c902080efab7537e9ea349880a478e274b9966c8eefa8f27a1db4295dfe53df11ad189e60a
+EBUILD libapreq2-2.13-r1.ebuild 1435 BLAKE2B 3e297a280924714a98446cf2913c69d5b681b16f9ac63e82d3e714044a331afc6fb96a23f4783098f6d77925e64f714f7c44e6581e5cbb7d0a09830b5fdff4a0 SHA512 0eda05e7bc6fcacfdaaff274115de45392d1bd9645cbeaf0fb9a60453a96bddf8648d08f63082d5b74377f7f5c720182253ab49a4817ca9d46769a2bcfb73150
 EBUILD libapreq2-2.15-r1.ebuild 1649 BLAKE2B aaf444f4864c1e0dfa07894c7eeeefde8b4251904633d8b98fd179f69ef3c89fe2170b94636e2f1a78dc3f1afb26704df76c05d558d56ca7ae5cf2176cb567db SHA512 7023eb743e9c92c4ce1d941c289f8d7c8d1b918eb58a56421e2a66fe2e7ced7eb5e6d4bc43bd71d264b6143a905142ebd641391242da62d15c648a03fcde788f
 EBUILD libapreq2-2.16.ebuild 1712 BLAKE2B a3ee8d3ccf0837da603ccc38b4692e45d8acc3f741be5beabcb39705a87a5ea4ddd6a52d607fede20054a980ca372ca5ef35d317da6fd9831fdab7160a73321e SHA512 b44fe29e868fbd64983a4bf4130addb1abb2b171894f2300cb03e1a5220b5ba5a548e3754a4d9c79ace0a5951f356f0f5c9bb0f14689c773a03132acdbd88736
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/libapreq2/libapreq2-2.13-r1.ebuild b/www-apache/libapreq2/libapreq2-2.13-r1.ebuild
index cf5812b4cd01..8a4890686cf9 100644
--- a/www-apache/libapreq2/libapreq2-2.13-r1.ebuild
+++ b/www-apache/libapreq2/libapreq2-2.13-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit apache-module perl-module multilib
+inherit apache-module epatch perl-module multilib
 
 DESCRIPTION="A library for manipulating client request data via the Apache API"
 SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz"
diff --git a/www-apache/mod_auth_kerb/Manifest b/www-apache/mod_auth_kerb/Manifest
index 49bf52fbf661..a4bad7dab215 100644
--- a/www-apache/mod_auth_kerb/Manifest
+++ b/www-apache/mod_auth_kerb/Manifest
@@ -2,5 +2,5 @@ AUX 11_mod_auth_kerb.conf 338 BLAKE2B c9093c961dae957f392bde032b20690a9a83c0fcac
 AUX mod_auth_kerb.conf 40 BLAKE2B 76bfe68f7dd32d9f8dffb5a2124628c7971f7f7470182d003fa576ba386239fd946d2eee50b49f2e4f0d6d8061b61c927e212a68fb3e1cfc21d9c2dc01c688a8 SHA512 fd21cb7d6da1ac4ce5becab4e3c72a56245878625990ebddbf1d612a3b9cc273a6b3e87509db59ed67e934b5834c3db10914118982cb77a6b8220b0f65cd6e1d
 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 1348 BLAKE2B 7a5e0e722c429dffe6b88341020a58f89b7e74d7cce06d80f863271b6372ad500693686ce3e1d58a8d24406bf5bb493aea027f50dfd8d5c6b4d924713ab1ed1a SHA512 0cd33367866ec359eb45f749dfcd826bcf8062eb083aaaf2aa983764e906f1ab5466efbea40bd72efe78131af16623bf3b826f309d0571a944eb43380423b3dd
+EBUILD mod_auth_kerb-5.4-r2.ebuild 1348 BLAKE2B 40e2ff68fb49536caa601bc6d7b5946078ff153aa04bf52505768796679876ba2a036c71f064c9292735fe3a1fd0cf420d03953efebaad93375d370426bbfd07 SHA512 01e299d020775704b7275491ea7783e588963598cefabed8f920f7fb80586e86d65d21fa12b72d759880867f0332c309e88cdfb35477443c81330c15ebb1a161
 MISC metadata.xml 248 BLAKE2B f2b54a005672ac4bbad84611ba34daf4076b2551add4f8c982dd2dc3761a02084719693536a8cdb1080c6613915eed75501dedafa905089211bddade9f8d7083 SHA512 f46a08a90200cc49b6389361c42fc1580504fcbb3ce3ce817916a6c6ae1c9b700f3dcbfa95e7b1284372c6cd5e51c7d93ea9076c5c26fa3b02f1ad7e1c053c36
diff --git a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild
index 40e71cf95be3..8b56d40b4d03 100644
--- a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild
+++ b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit apache-module eutils tmpfiles
+inherit apache-module epatch tmpfiles
 
 DESCRIPTION="An Apache authentication module using Kerberos"
 HOMEPAGE="http://modauthkerb.sourceforge.net/"
diff --git a/www-apache/mod_auth_radius/Manifest b/www-apache/mod_auth_radius/Manifest
index 51ee841fa7b9..65e972e88299 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 762 BLAKE2B 823cfb29379cb9e35a7154cde10825b6538a0df879b5b65a2d87b4a810c2db6f9b2549757872f12757012d4e188ca3cce5309397f9cee8395ebc90f8c21a9871 SHA512 43e55f7e6ebc3cd4ba9ba797d97f998aa5c2b286dbdd90eff70ec94f36486da6ba860ffc7a144196e8c4ac94124d2c39fa7e6582300e241aafd604fa871222a6
+EBUILD mod_auth_radius-1.5.8.ebuild 759 BLAKE2B c2296e1782cc5e208116e7d98b595271837a4e315aa0114100bce2015ce31b0365d9ae63e0233674a4c1a6d2a51a70e0fef4cf69ce07c856d6d114e1fffa671a SHA512 f6e5e4536ee91150b85e27f413e8e5f0e37ad28bcb652f5c27688883509798e4dc29575bd1c714549d08c204b73db7e3b87440237786a66367d92798c0ce6fef
 MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
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
index 878aebee4c0e..831b59d27d9e 100644
--- 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit apache-module eutils
+inherit apache-module epatch
 
 DESCRIPTION="Radius authentication for Apache"
 HOMEPAGE="http://freeradius.org/mod_auth_radius/"
diff --git a/www-apache/mod_auth_tkt/Manifest b/www-apache/mod_auth_tkt/Manifest
index 3f81e316e3ca..4d4ae0eeaf6e 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 1046 BLAKE2B 91db4034b1ad2244aa30e334655b56b01c3d05ca4a43b4df616159770bb587718adb362453e8b8212759ffa2c88d2cce7b1bce21ca059b0e24b742767111e6fb SHA512 45d59bc894f0344704222bf7967d449241193b1af7e251c8523ef8d19024fbf873320a545cc581b38b95d616c513a78044fc1ef54acfee4bdb4f3237f9cf122c
+EBUILD mod_auth_tkt-2.1.0-r1.ebuild 1043 BLAKE2B c3be0480d172f460bc2e31419497b1d068c621d941fc4139ef7e848310ffb775405f0bfd029f381a24902b83f0310ac40d242c30cbe831c154efc3ed94a19e3e SHA512 f127c8cf24be28697708caf10bc1042d97d367a892d89c338ea276307830d3459de240859b5e9c7937eaaf89662a5261501e0be91d151659f4975c0e2bc23e35
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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-r1.ebuild
index 7b9bb46132f7..e7ec743532d2 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-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit apache-module eutils
+inherit apache-module epatch
 
 DESCRIPTION="Apache module for cookie based authentication"
 HOMEPAGE="http://www.openfusion.com.au/labs/mod_auth_tkt/"
diff --git a/www-apache/mod_authnz_external/Manifest b/www-apache/mod_authnz_external/Manifest
index 2f64ea49c9e4..9aa46ec2e481 100644
--- a/www-apache/mod_authnz_external/Manifest
+++ b/www-apache/mod_authnz_external/Manifest
@@ -1,7 +1,7 @@
 AUX 10_mod_authnz_external.conf 993 BLAKE2B 36daed95a23c58abb0749cfd4836f57b7913362f7dd98f18a5e0158b30754392756f9f9e0c3a8158d6e93e40f765ec440fa3f24069746a49ec16db9f2c8ca6b1 SHA512 66de4c74f5f72ee1f0483c8f5bcd0ff461ebcf0a7b2790692a3b6f4c2ac1be8e6510ffcaa7502903d1b5b611a1a8375a845ff14c3147df3614e5d73384a22ce4
 DIST mod_authnz_external-3.3.2.tar.gz 36160 BLAKE2B afc3e4b9b52628479163bf705a473edbb96b5c82ac74c43a0d15512adf59adb4a4122f83e59871a3a91d9094347287b1072e3f12b9689680acd91f4ea534cc6d SHA512 8216744dbaed8dbde0d33658e38594463409e613412bd94f3e5f5a816f5e793a395ddda7c582ff1d1e69e48efdd1efb48c168d4cbc37cc7807a0dcb92eace0be
 DIST mod_authnz_external-3.3.3.tar.gz 38266 BLAKE2B 03bdfe7efdcd832b7662be70e0e38cdfb4f025d3bdd3baf3e98b4d77efd538605db8f625006246515f427989aca3242626a4115e4534ecb75c09adc967227ea6 SHA512 65b643870dcfc5cdc0343bc606ff74697473617ce9f6fe27cae40ae1b2dca904bb71b6ec8347c6b5c5e3819785432798f6e78820cdf66fd17b245371a41322d2
-EBUILD mod_authnz_external-3.3.2.ebuild 557 BLAKE2B be9b71ac1d3c9518db7f53299c4d32c2dc8fc718cbf0c82a2ee5bb0a71a8068c7ad3bb5f3aeafda9af7b4d5941b273c9931b613b40c24a268390b5b272878c7d SHA512 13fcdfd45a9fe6e9150af4a3bf18295c446b7bad7acde88561d7187fee930ae98667d93d9a385a344d37f252b3c2789a544681ee1dd1fd34667e32e302af197c
+EBUILD mod_authnz_external-3.3.2.ebuild 547 BLAKE2B cd5805c3dcc67d369caa4c0766c36be0840345444e7c776ab074a522cb6d5c21ed9081d656d60c9a6c7f6362f9a619a3dbefc3dc1b4607f51a54e3a9666aadfa SHA512 3c76edf465edaad8b0103af7f872cf29d57faf44a1e35fbd9cad67fed5e72a1b66c6925b6ebbaad55529214e809198ccc0b801120d148f69f67cbc60a189f2e9
 EBUILD mod_authnz_external-3.3.3.ebuild 807 BLAKE2B 55791df0e64af79430204a412fb48b0e39de500d37db76fba7b2e83133fc4198dd18afd87d83a60f04f311d09169f34bb510511ad0ed14ae87e9ad7eca417e51 SHA512 5edf1c9def9dcaa2ceb1d73c421dfce4d5853ef8622f6146522af715178a7baf8518cc934c58a6567b38862193fd75b8fe29d5a4f080cf5f9f7b3edc243ad8d8
 EBUILD mod_authnz_external-9999.ebuild 807 BLAKE2B 55791df0e64af79430204a412fb48b0e39de500d37db76fba7b2e83133fc4198dd18afd87d83a60f04f311d09169f34bb510511ad0ed14ae87e9ad7eca417e51 SHA512 5edf1c9def9dcaa2ceb1d73c421dfce4d5853ef8622f6146522af715178a7baf8518cc934c58a6567b38862193fd75b8fe29d5a4f080cf5f9f7b3edc243ad8d8
 MISC metadata.xml 336 BLAKE2B 22bff5bdfb90a1ce3e1e02e91eb783b3ad492c042ef11c3cd4322f1a710ee44949db8dc6fd16e36378e26389c1c326655c5a58d053aaa12adfa888c425d819f0 SHA512 d70954c0d9502b0f45dfbe37e623b679fe2b2466a7d261ffed766b5111e79912be5d6c5324af0d9d43741de58d8e70058c08866486a056ae4f7a27246c451500
diff --git a/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.ebuild b/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.ebuild
index 499caf55e844..1ee5ca6c1276 100644
--- a/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.ebuild
+++ b/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils apache-module
+inherit apache-module
 
 DESCRIPTION="An Apache2 authentication DSO using external programs"
 HOMEPAGE="https://github.com/phokz/mod-auth-external"
diff --git a/www-apache/mod_bw/Manifest b/www-apache/mod_bw/Manifest
index 69c33bbd7321..adc856615049 100644
--- a/www-apache/mod_bw/Manifest
+++ b/www-apache/mod_bw/Manifest
@@ -1,5 +1,5 @@
 AUX 11_mod_bw.conf 422 BLAKE2B eed5c83ad8e83caca31b659d0dfca21d1b8e8befcde5adc9bd9218144c72161aaea483c04388806e98bb9b1fa5cb31a3e898fba341d937694a599ae7b6ff6877 SHA512 8bbe8c7a2b83a6fe4dfa5849b447193b400de4bea9c3d70c4d4aac0d315eb16a3c48c9c75424a6d01c553c94a2fe500d7e01b8406201dbc34ed459961a2f8a7c
 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 535 BLAKE2B a04552b14e457921a32fb5489831c25b92a38652ab9448ea2c72039a4022491627febd1fb79274ab72fa46015e823cec255798de75fe7a86c9d79e13b8d25f3c SHA512 e29794fbcf4f03491398e35982870d39a347401254dfba08a2f16b6bee436b69b9dfabb2b3dc499e6de20e9946de1456affd6363c66af2830b50965223411568
+EBUILD mod_bw-0.9.2-r1.ebuild 532 BLAKE2B 292462ccb66f4e2b6858fd6577100b6a7edb5833556f302c645503188ec677ad46d5cb749b980ce77fc5f5a741bc1e05501a3613a9cdb768b121bfae74e644f5 SHA512 7bb95c0c2964dd2f058e6095c248f57796cad0feffaa4f2d293e6b204bf26648e9bd0aa9074b9d5efaeffc6c4a2cdf6ae84568d936e6c3a97a48ddd796549e28
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild b/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild
index c6bc263c140a..3bc850583b69 100644
--- a/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild
+++ b/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit apache-module eutils
+inherit apache-module epatch
 
 DESCRIPTION="Bandwidth Management Module for Apache2"
 HOMEPAGE="http://www.ivn.cl/apache/"
diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest
index 87f272f78f67..bb2c5b428554 100644
--- a/www-apache/mod_caucho/Manifest
+++ b/www-apache/mod_caucho/Manifest
@@ -1,4 +1,4 @@
 AUX 88_mod_caucho.conf 496 BLAKE2B 671b774c06ebaf9dacaa7744ed488a8331a2276fe6b347e8d69a783358ff574a29700ebe2f4e642b0a1a09dec8fda2120417a2d4a9d95bbac5d209fa632b1c32 SHA512 0e0751e633af0734e95306d26a05e6e6c8dd301862a46a47ebfa04721f648a16f5615554fd3a52288cef14bb9fb4786b11720fd96db7e8f6dcfdae651e578a26
 DIST resin-4.0.47-src.tar.gz 33022378 BLAKE2B 0a46391a47ed282da4031d3e30b0bb14c06ba93556572982bdca75459829145caac824611cbab3d500602432f71c0b78c5e78fdbe61874158b1ec2eaec617d94 SHA512 c070277c970144a990c45afc86b0626d424618c0ec8122cd7e0e60745339a7f79f5d47483b5a33c24f7fb192e72a2d49823155718b8565a2c273333119279703
-EBUILD mod_caucho-4.0.47.ebuild 1199 BLAKE2B 4ce4922669940edfead35ef90831cd058e87ae82d2b8d36bf0c91da8348f82aba9b2e52a40c447179063c3722fe0e40a8e47ef275f36bd348266766bc1246562 SHA512 4dd17ea0b82eb3b7f4655254f67178521e152c22c9f37f236e1325fe98240107045d90461c4a97ddaf7eb5e47efda3bb419c77307d382469e1b6b8162065bbe4
+EBUILD mod_caucho-4.0.47.ebuild 1189 BLAKE2B 822b5637731ace4b155c9966210feb2dfbb6ac5984fbcda145529412711848decd201906d79950ac18ef9a6deb3ef9b7533d4407d7be4bd84c0435e001c1df7c SHA512 e6155cd43d4cc8b7b92f87ccafe76d01fb0c2a1c64e5b0d63e5cb30a599c6e1086fece46e2b216d77f66d67032446abf8da02ba8f830db9c7ced926f0ea54080
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.47.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.47.ebuild
index 6987de2600c6..e0e459f4056d 100644
--- a/www-apache/mod_caucho/mod_caucho-4.0.47.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-4.0.47.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils apache-module
+inherit apache-module
 
 DESCRIPTION="mod_caucho connects Resin and Apache2"
 HOMEPAGE="http://www.caucho.com/"
diff --git a/www-apache/mod_dnssd/Manifest b/www-apache/mod_dnssd/Manifest
index c470bd10012f..a735d7c23691 100644
--- a/www-apache/mod_dnssd/Manifest
+++ b/www-apache/mod_dnssd/Manifest
@@ -2,5 +2,5 @@ AUX 80_mod_dnssd.conf 118 BLAKE2B 821ab460bac4953375244a9da11674fb054f14611f73fb
 AUX mod_dnssd-0.6-httpd24.patch 603 BLAKE2B f18e9a6dbb133287d839bd88a94b131cd34d2789590ad3f2a8ee8d24d86206f5ed4dcd305c4c3b446be12297d6256ac10751b35508e902c486de5c7c0340c484 SHA512 c8e3428a1b4dfe0a24ed244ed30eb8b1181642a05d75de2b2b61ea48168f881b026d6c3fd0fbdfcc344736a1d93e4458853853e335076e498d6df091ccdde228
 AUX mod_dnssd-0.6-ldflags.patch 571 BLAKE2B be314c84a92262d3659a973ba1e2069389c16bde72674ab57465585179867cc8b3b851beca924f4596a8a237969e6defa162af6d222f84137a77d587463c596f SHA512 419c9565ac03a352568b3ab97e03e6878b5721a455fdd8f07f328d4a64ab401776f3a5ccd2a31e10b64fbbf334693c8f6e3636ed65f9f06f6f83d433f6366d6c
 DIST mod_dnssd-0.6.tar.gz 86417 BLAKE2B 01aee3624e413f5a00d6e63e5e74d9dc1667db9e9747b65a7fce9ab762cf0f9a5cd3ef4dcccf9532e9aa70435bd6afd846fdbaafff6667ba1fd9d413ea6fe0d9 SHA512 c3eacd2065f996ace76496b828a5be4b735225782c88ed0fba00c37ffed91af7c81cef755556968880e11e05fbaf65a4326728cb82abcad03ccaf925be1f29d3
-EBUILD mod_dnssd-0.6-r1.ebuild 876 BLAKE2B 7882c9bcafe82141e587854f38620ce00fc330a1527fa759a5d6c6dc2cbcc09b9c23a58b0cab11e078710f045beec2d7226b5e6237b4e1f63031e0c9a5e177db SHA512 4f5f4b3a7cadeb888ec11d6ff2231846c4af5abcdadc77ac58b852eb952e9ce9f2f8e5f65eb05ee78af38e9e0aecd140c88742cad00ed71df27ae42287569b43
+EBUILD mod_dnssd-0.6-r1.ebuild 876 BLAKE2B b27cf5b6b78e8d0bb5e0edc1b9823e769e83032618dae4d0b9748e371ed3c48a02e847367da17f4e44f03bd9c67262992db63cf94b2a85d9f2d6254c4ef20406 SHA512 9b7d00ee5dbd025fd8ac44a9596bdd3cf4577d15bdd19f236e369170cb066782f080d683218917f3b3db5a2dad3e1d47d97223b055e1b98a9749704b5b49485d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild b/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild
index c23885fa5aa9..1739b8ff00cc 100644
--- a/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild
+++ b/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit apache-module eutils
+inherit apache-module epatch
 
 DESCRIPTION="mod_dnssd is an Apache module which adds Zeroconf support via DNS-SD using Avahi"
 HOMEPAGE="http://0pointer.de/lennart/projects/mod_dnssd/"
diff --git a/www-apache/mod_fcgid/Manifest b/www-apache/mod_fcgid/Manifest
index 311a0aba94dd..f66631c9476d 100644
--- a/www-apache/mod_fcgid/Manifest
+++ b/www-apache/mod_fcgid/Manifest
@@ -1,4 +1,4 @@
 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 704 BLAKE2B a68c64162f4f6b03e591dfae1f591cec7cde847b8631654867ac81a53450daa4790ad232ea70590a273ce948d2a28505fe0a54afeb665df7c01307593c53ebb0 SHA512 a4000798c13fc79897d1fed2594ca993453833c8fa8345273f701a758839650e0ad672ed9a4c020614fc250c690dcf5667199ebb6067c389c06c4a91f90c18c7
+EBUILD mod_fcgid-2.3.9-r1.ebuild 697 BLAKE2B b3c85797109fb5175dc49ba2daef6eda482f9305bdea4a56df235a4ec54fe5b3e5a0cecf4b9f948f7d9192915b264ed17a792e59f36286b0cec9c2c196d083b0 SHA512 e2f160d4094639f525c2b6c41758fc195e3e1ded8d470fabc32be45b27eb10c6ccedef69d6372f9030137cf56e49038a163087fff2c693d9e1d881c675a95443
 MISC metadata.xml 393 BLAKE2B 6b4f4cca80273eeb83d5e8f26daf6a9d0f3d686c1c72883d11bdd78ce20844b986ddc3bc70c5d8f68fc9151ccada81d585d8966d191a7029e53fa4beee19fbe9 SHA512 44e77be6b2d4119e5c63945fca1a68a517e0953b47262d101feae8c083fbe5799ad0032ebe11ce8330df3b15dd59ba12d641070803c619e76f3ad7d080df5ef9
diff --git a/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild b/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild
index 61a9a805cd0b..693cc0c6699d 100644
--- a/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild
+++ b/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit apache-module eutils multilib
+inherit apache-module multilib
 
 DESCRIPTION="Binary-compatible alternative to mod_fastcgi with better process management"
 HOMEPAGE="https://httpd.apache.org/mod_fcgid/"
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 5b5c469dd20e..f72b73882ff8 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,7 +1,11 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
 DIST mod_h2-1.15.16.tar.gz 702081 BLAKE2B 1f1ce9911c4dba5001d548b99fe08c5a13882a1f44b067a19c3edc178566895522e30d5b949c89754c322eb80a09fd5c07cba740783377b46e2d075e207ca04b SHA512 48e734bafc68acda75a2b9b72b503396bb8c4e58842e5b1ff395389835681a26485cd3795ca3c7fe7be5ad9614b89f305993d2753f1486856eff7599d2892c49
 DIST mod_h2-1.15.17.tar.gz 708333 BLAKE2B 7f7f4625d20dd85e88768cbc1b6347498d2d913b4e778fcac6e01ef2e6676ff4c180385610e5db990d7e9d3ceceafac7e1a08b421c7d99814f9c212b17ac8d76 SHA512 7d6af4123091171273093b4333699bda2469b3e2bd7412e226394f0dc79a5a7d684035538549e13d119c5134016c8b7a3e7aaf8559eec56ed15d849655f11521
+DIST mod_h2-1.15.18.tar.gz 708704 BLAKE2B 1ad8bd317c42f517baf015cbdeb89040a743753f19a0fd6ae20a3d2f1c48ae4a76dcb926ad71060f25e64e8e89c07e7e95f938b2a346b92c7c961808816fd19f SHA512 4582e815f582c66e0d119925a1b19ecd74afedc4e7db4410a8552384ad6d2e113dc4e428fa88214ef23f0d7b0b3a64c2fa6f9a42b9e0a8b1239d891826b56cdc
+DIST mod_h2-1.15.19.tar.gz 708753 BLAKE2B 9193e9b307ead341e90dffe4547de444a3f47340f23e3a7171f8a0fdbd0c5749eddfd7f9e6b3e4a3afccda521437183a8e7039a79e554a4c6e18415678dfec57 SHA512 52717d173df26faaa82e1335366de448bd0b125032066e436546027580707ba872ae07e1e4e9b8b4fc5dbd02e212441d44b96092aac8732627117e109b95671a
 EBUILD mod_h2-1.15.16.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
 EBUILD mod_h2-1.15.17.ebuild 906 BLAKE2B bbb32c5992643aa1994328bd7455ff77b1c4615f6f1c17486a24916825db517078173e832cbc95f8de887e841fb6a786e85f260023876c823f15d5afbb45b6e9 SHA512 0ddcea76dc5ba38b97059adf932e4bbcc6bdf2fa28ecae2faaa32396b40c2304179f36fd74b46a58c68ab86f950c278bbd9cbbbee04d44c9c19566ba4f4968ac
+EBUILD mod_h2-1.15.18.ebuild 906 BLAKE2B bbb32c5992643aa1994328bd7455ff77b1c4615f6f1c17486a24916825db517078173e832cbc95f8de887e841fb6a786e85f260023876c823f15d5afbb45b6e9 SHA512 0ddcea76dc5ba38b97059adf932e4bbcc6bdf2fa28ecae2faaa32396b40c2304179f36fd74b46a58c68ab86f950c278bbd9cbbbee04d44c9c19566ba4f4968ac
+EBUILD mod_h2-1.15.19.ebuild 906 BLAKE2B bbb32c5992643aa1994328bd7455ff77b1c4615f6f1c17486a24916825db517078173e832cbc95f8de887e841fb6a786e85f260023876c823f15d5afbb45b6e9 SHA512 0ddcea76dc5ba38b97059adf932e4bbcc6bdf2fa28ecae2faaa32396b40c2304179f36fd74b46a58c68ab86f950c278bbd9cbbbee04d44c9c19566ba4f4968ac
 EBUILD mod_h2-9999.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
 MISC metadata.xml 325 BLAKE2B 4154e88a0c1eb61e74e41ca0b86a2746d6fa8f0e573c5c8c36a9acc0306306804ce6c9b83834b67ae99476468f9143273f977bf868e06d1bc4b5022dd08b2722 SHA512 8dd16aa1fbf71b64c679cba7dc5759fb51410690fd6e6b77416d3604ea746a00516283510a0b24971aa0f5c08359eba6f5d96fab2f8eebdda7f2ebd8f428a04f
diff --git a/www-apache/mod_h2/mod_h2-1.15.18.ebuild b/www-apache/mod_h2/mod_h2-1.15.18.ebuild
new file mode 100644
index 000000000000..e59d601d9ddf
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.18.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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.20[-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-1.15.19.ebuild b/www-apache/mod_h2/mod_h2-1.15.19.ebuild
new file mode 100644
index 000000000000..e59d601d9ddf
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.19.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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.20[-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_jk/Manifest b/www-apache/mod_jk/Manifest
index ea4a95b84b93..f3c2224d23ef 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,5 +1,3 @@
-AUX 88_mod_jk.conf 5607 BLAKE2B ce175ba5653d2f9d2a677de7f227b07f9d2b5f59b9b575981a0720dcbf99b84ca37bbf09f5f1ff6966cd3b8da7f4481348f488d2bb43da0b6f6c972cf9f7209b SHA512 5190adbfc9f1f6ed3c5b9c7f76c0ccd12a9e9f36b22180f2998f30e9f3ce2f10559b10aaf5efbe87c2e1cff26608783b266007990426868e1a25c924233168f1
-AUX jk-workers.properties 1034 BLAKE2B 3420ea5ba394c773d02e7fa6b480f874587d8d4d9314c96a22d3e11fe26ac12dd72b1ae2af5db44bf6a17f695817e8a5fcc40d6e9a0a60e15ad16aee3a00b671 SHA512 0c2603f9b689c1a395c7ff3973921424a3310b0b1a7c2c79f6053ad438412cabd71f1d125981a320f29de607ea0a67b229a629916ccca7ad78cd833027a80268
-DIST tomcat-connectors-1.2.42-src.tar.gz 3143693 BLAKE2B d1ea2a85ec80a5e207896f3225049c12e96c5cb6d1734306ec7a268d0963f1c368bcf963b529e17efdf448c0f8ad3257902340f969b5a0bc6ee9644af4bb3772 SHA512 9a796e2a7865a99c16595deaead94e843c291ed7229f48414edf0a260b2dda05fc94671e8b863a9ccef719bbe2ca7622c06e3dae6ccf68a41f7d96e847b68791
-EBUILD mod_jk-1.2.42.ebuild 1268 BLAKE2B 784fa1919f3d676249417fdf10b332b5390f30530918841db23fe57569ff7881bb2f6ad38cbfa806b2afcbf2bd06e5c160f4d3b988a8894e623a40125a23dd55 SHA512 292ad3a793d2e7078abcf251fc40e566ef691ec880a88b345721ec9ee321967dbd60b673e587a9cdf271252d4d3e050a4e8fc778eac4c3fb1ff0e123b4fc5fae
-MISC metadata.xml 446 BLAKE2B 645959289074043d88a5bb975a5b9d5aa87136f2c3df821d9b2ddf1bc66e667e24d68abdb0aa6128025b0a677ecc55b87ad2d1d253b355eba095a1a586fb71b4 SHA512 e6e67b81753c0e2758c199d30ea0fb1b7f899e86a33a129faaaa84235dccbf74ab62f1bb61eed3b8647536bbc560f1db865090b17e808070adce387ce0636d0b
+DIST tomcat-connectors-1.2.48-src.tar.gz 3665280 BLAKE2B eca84f31235e441dea08fd7f0e44de4370799e9781384a0a4329ae48c9dab4b146733bf810669fdcf60ede9e67e139942ccfe12c74e15f4eda19d9107f9b6150 SHA512 955a830724a3902e29032a5d2e7603d3170334e8a383d314f6bf8539d53d9f7ee4cfa0b31cfc954acb0a13d9975ed2229de085d08de3885f8679b509924fde47
+EBUILD mod_jk-1.2.48.ebuild 1466 BLAKE2B fd56542ccb4a9e08012d2f221afbdc739eba512a171e0e72e4f069b8dcec27b6bb515080653d281ed105b3ca74bfd30bd504b0c4ecf4c950f72fce6e9bf72b5b SHA512 a2ebda076cb43d8af5dd41212ca1e80326a495db4509ad4a30357e698628013b129ae3d482e244bbb009efb2f3eebba78485c986d1a28ee33a9601ea5eba6f71
+MISC metadata.xml 616 BLAKE2B f72473ee9a28ed3078be60a38cc0a91ee1c3d2a13f1c41f10b162119f394fddbbabfa5cfd563338b419aabbabc2e722fcc34f6e89e6443336172348d6dda16d2 SHA512 70c4521ab59b7ce1d023826c03f63c743b033cd88091b74eb61bd99a210473e41f02ff9f375bbd18b2841fd7861e4d09b274dc0b06b92658a2b900702120b34d
diff --git a/www-apache/mod_jk/files/88_mod_jk.conf b/www-apache/mod_jk/files/88_mod_jk.conf
deleted file mode 100644
index 1c66783cca12..000000000000
--- a/www-apache/mod_jk/files/88_mod_jk.conf
+++ /dev/null
@@ -1,165 +0,0 @@
-<IfDefine JK>
-LoadModule jk_module    modules/mod_jk.so
-
-###
-### Where to find workers.properties
-###
-# JkWorkersFile specify the location where mod_jk will find
-# the workers definitions.
-JkWorkersFile	/etc/apache2/jk-workers.properties
-
-
-###
-### Where to put mod_jk logs
-###
-# specify the location where mod_jk is going to place its log file.
-JkLogFile	/var/log/apache2/mod_jk.log
-
-###
-### Where to put mod_jk shm file
-###
-# specify the location where mod_jk is going to place its shared memory file.
-JkShmFile	/var/log/apache2/jk-runtime-status
-
-###
-### Set the jk log level [debug/error/info]
-###
-# info log will contains standard mod_jk activity (default).
-# error log will contains also error reports.
-# debug log will contains all informations on mod_jk activity
-JkLogLevel	info
-
-
-###
-### Select the log format
-###
-# JkLogStampFormat will configure the date/time format found
-# on mod_jk logfile. Using the strftime() format string it's
-# set by default to "[%a %b %d %H:%M:%S %Y]"
-#JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "
-
-
-###
-### JkOptions indicate to send SSL KEY SIZE,
-###
-# The directive JkOptions allow you to set many forwarding
-# options which will enable (+) or disable (-) following option.
-#
-#
-# JkOptions ForwardKeySize , you ask mod_jk, when using ajp13, to
-# forward also the SSL Key Size as required by Servlet API 2.3.
-# This flag shouldn't be set when servlet engine is Tomcat 3.2.x
-# (on by default).
-#
-#
-# JkOptions ForwardURICompat , you told mod_jk to send the URI to
-# Tomcat normally, which is less spec compliant but mod_rewrite
-# compatible, use it for compatibility with Tomcat 3.2.x engines
-# (on by default).
-#
-#
-# JkOptions ForwardURICompatUnparsed , the forwarded URI is unparsed,
-# it's spec compliant but broke mod_rewrite.
-#
-#
-# JkOptions ForwardURIEscaped , the forwarded URI is escaped and
-# Tomcat (since 3.3 rc2) will do the decoding part.
-#
-#
-# JkOptions ForwardDirectories is used in conjunction with Directory-
-# Index directive of Apache web server. As such mod_dir should be
-# available to Apache, statically or dynamically (DSO)
-#
-# When DirectoryIndex is configured, Apache will create sub-requests
-# for each of the local-url's specified in the directive, to determine
-# if there is a local file that matches (this is done by stat-ing the file).
-#
-# If ForwardDirectories is set to false (default) and Apache doesn't
-# find any files that match, Apache will serve the content of the
-# directory (if directive Options specifies Indexes for that directory)
-# or a 403 Forbidden response (if directive Options doesn't specify
-# Indexes for that directory).
-#
-# If ForwardDirectories is set to true and Apache doesn't find any
-# files that match, the request will be forwarded to Tomcat for
-# resolution. This is used in cases when Apache cannot see the index
-# files on the file system for various reasons: Tomcat is running on
-# a different machine, the JSP file has been precompiled etc.
-#
-# Note that locally visible files will take precedence over the ones
-# visible only to Tomcat (i.e. if Apache can see the file, that's
-# the one that's going to get served). This is important if there is
-# more then one type of file that Tomcat normally serves - for
-# instance Velocity pages and JSP pages.
-#
-JkOptions +ForwardKeySize +ForwardURICompat -ForwardDirectories
-
-
-###
-### JkEnvVar forward environment vars
-###
-# The directive JkEnvVar allow you to forward an environment vars
-# from Apache server to Tomcat engine.
-#
-#JkEnvVar SSL_CLIENT_V_START
-
-
-###
-### JkRequestLogFormat set the request format
-###
-# JkRequestLogFormat will configure the format of mod_jk individual
-# request logging. Request logging is configured and enabled on a
-# per virtual host basis. To enable request logging for a virtual
-# host just add a JkRequestLogFormat config. The syntax of the
-# format string is similiar to the Apache LogFormat command, here
-# is a list of the available request log format options:
-#
-# Options	Description
-# %b		Bytes sent, excluding HTTP headers (CLF format)
-# %B		Bytes sent, excluding HTTP headers
-# %H		The request protocol
-# %m		The request method
-# %p		The canonical Port of the server serving the request
-# %q		The query string (prepended with a ? if a query string exists, otherwise an empty string)
-# %r		First line of request
-# %s		Request HTTP status code
-# %T		Request duration, elapsed time to handle request in seconds '.' micro seconds
-# %U		The URL path requested, not including any query string.
-# %v		The canonical ServerName of the server serving the request
-# %V		The server name according to the UseCanonicalName setting
-# %w		Tomcat worker name
-#
-JkRequestLogFormat "%w %V %T"
-
-
-###
-### JkMount assign specific URLs to Tomcat
-###
-# JkMount directive assign specific URLs to Tomcat. In general the
-# structure of a JkMount directive is:
-#
-# send all requests ending in .jsp to worker1
-#  JkMount /*.jsp worker1
-#
-# send all requests ending /servlet to worker1
-#  JkMount /*/servlet/ worker1
-#
-# send all requests jsp requests to files located in /otherworker will go worker2
-#  JkMount /otherworker/*.jsp worker2
-#
-#
-# You can use the JkMount directive at the top level or inside
-# <VirtualHost> sections of your httpd.conf file.
-#
-
-
-# We specify an autoalias, that makes it possible that apache is still
-# reponsible for serving static html files. All requests of files with
-# the ending .jsp will be redirected to a default Tomcat installation which
-# uses the default profile. Change this to fit your needs.
-jkAutoAlias /var/lib/tomcat-5.5/default/webapps/
-jkMount /*.jsp ajp13
-
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_jk/files/jk-workers.properties b/www-apache/mod_jk/files/jk-workers.properties
deleted file mode 100644
index b73892fae9e5..000000000000
--- a/www-apache/mod_jk/files/jk-workers.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-# workers.properties -
-#
-# This file provides jk derived plugins with the needed information to
-# connect to the different tomcat workers.  Note that the distributed
-# version of this file requires modification before it is usable by a
-# plugin.
-#
-# As a general note, the characters $( and ) are used internally to define
-# macros. Do not use them in your own configuration!
-
-# The list of Tomcat workers
-#
-worker.list=ajp13
-
-
-#------ DEFAULT ajp13 WORKER DEFINITION ------------------------------
-#---------------------------------------------------------------------
-#
-
-# Defining a worker named ajp13 and of type ajp13
-# Note that the name and the type do not have to match.
-#
-worker.ajp13.port=8009
-worker.ajp13.host=localhost
-worker.ajp13.type=ajp13
-#
-# Specifies the load balance factor when used with
-# a load balancing worker.
-# Note:
-#  ----> lbfactor must be > 0
-#  ----> Low lbfactor means less work done by the worker.
-worker.ajp13.lbfactor=1
-
-#
-# Specify the size of the open connection cache.
-worker.ajp13.cachesize=10
diff --git a/www-apache/mod_jk/metadata.xml b/www-apache/mod_jk/metadata.xml
index 7502a331d87c..34fdd63d09fe 100644
--- a/www-apache/mod_jk/metadata.xml
+++ b/www-apache/mod_jk/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
 	<longdescription>
-		mod_jk is a connector used to connect Tomcat JSP/Servlet 
-		container with web servers such as Apache, Netscape, 
-		Iplanet, SunOne and even IIS using the AJP protocol.
+		Mod_JK is a connector used to connect to the Tomcat Servlet Engine,
+		used with web servers such as Apache and IIS using the AJP protocol.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">apache/tomcat-connectors</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apache/mod_jk/mod_jk-1.2.42.ebuild b/www-apache/mod_jk/mod_jk-1.2.42.ebuild
deleted file mode 100644
index b3af1a400990..000000000000
--- a/www-apache/mod_jk/mod_jk-1.2.42.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit apache-module java-pkg-opt-2 readme.gentoo-r1
-
-MY_P="tomcat-connectors-${PV#-*}-src"
-
-DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol"
-HOMEPAGE="https://tomcat.apache.org/connectors-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="java"
-
-S="${WORKDIR}/${MY_P}/native"
-
-APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="JK"
-
-CONF_DIR="${WORKDIR}/${MY_P}/conf"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )"
-RDEPEND=""
-
-need_apache2
-
-DOC_CONTENTS="
-	Advanced Directives and Options can be found at:
-	https://tomcat.apache.org/connectors-doc/reference/workers.html
-"
-
-pkg_setup() {
-	use java && java-pkg-2_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--with-apxs=${APXS}
-}
-
-src_compile() {
-	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent"
-}
-
-src_install() {
-	# install the workers.properties file
-	insinto "${APACHE_CONFDIR}"
-	newins "${CONF_DIR}/workers.properties" \
-		jk-workers.properties
-	doins "${CONF_DIR}/uriworkermap.properties"
-
-	apache-module_src_install
-
-	readme.gentoo_create_doc
-}
diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
new file mode 100644
index 000000000000..ef0ffb044097
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="tomcat-connectors-${PV#-*}-src"
+
+inherit apache-module
+
+DESCRIPTION="Provides an AJP Apache2-JK-connector for the Tomcat servlet engine"
+HOMEPAGE="https://tomcat.apache.org/connectors-doc/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}/native"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+DEPEND="dev-libs/apr:1="
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl"
+
+APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
+APACHE2_MOD_DEFINE="JK"
+
+need_apache2
+
+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
+}
+
+src_prepare() {
+	default
+
+	# Adjust confpath and logpath for Gentoo
+	local logs_path="/var/log/apache2"
+	sed -e "s|conf|${APACHE_CONFDIR}|g" -e "s|logs|${logs_path}|g" -i ../conf/httpd-jk.conf || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--with-apxs="${APXS}"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	LIBTOOL="/bin/sh $(pwd)/libtool --silent"
+	default
+}
+
+src_install() {
+	apache-module_src_install
+
+	insinto "${APACHE_CONFDIR}"
+	doins "${S}"/../conf/*.properties
+
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins ../conf/httpd-jk.conf 88_mod_jk.conf
+
+	einstalldocs
+}
diff --git a/www-apache/mod_log_sql/Manifest b/www-apache/mod_log_sql/Manifest
index f2f2603f76a0..c0710b280583 100644
--- a/www-apache/mod_log_sql/Manifest
+++ b/www-apache/mod_log_sql/Manifest
@@ -2,6 +2,5 @@ AUX 1.101/42_mod_log_sql.conf 938 BLAKE2B a962983a14e069f574e1728e7029690e9ee5e7
 AUX 42_mod_log_sql.conf 827 BLAKE2B f96bb44047f2301a7db85e9cd9c66a53a703aa5f5426e6d7d5492122c9a41779dafec73621139e1c8c3e488f1922c3c80c69662b9e7a8abea5cc4e7bb6004634 SHA512 0e43b3c89216fe33886373a4036d3ef5f873e8c99f6fbb640224e606d29a1f220e692fb73e6b54cb87aff502e4642f17245a6771c4e0d6426d0834f564cf2f4f
 AUX mod_log_sql-1.101-apache-2.4.patch 633 BLAKE2B 71f5a303ec140bc55d02987fbb89a7911e90663a0b1ed1e583382dea2ed135cca0d79eab23720ed2a367ef1e46e223c584d93b33cd25803c31fd1ad73bc23bbb SHA512 9ce5fc6183d76a32a073d0778404d1b112a3f44eddb589a80146b82762535cf909f303af41dd0bbd650d70e362e85e4fb361039c4fcdfd1a8af134d6d02a2fd4
 DIST mod_log_sql-1.101.tar.bz2 127500 BLAKE2B b82677ba590f900a69506b0a9f5ada92076faa303815655d0d9e24c1f50704c96878ab39b7285836bbb59ecac15db6bfba674c10dfc78bdb0907ff37cf680cf5 SHA512 30ea586443cf042e52149012613d80ca0c6631847618366905e90f99bfab235ca6e050fa1dbdb98ef54be6d68b34564781c6efb36ba89f7b51e4f3e00892d91f
-EBUILD mod_log_sql-1.101-r2.ebuild 1504 BLAKE2B 55cab4365c3777ce7f3401c4901a800a24d4e42590d44cda3ba02eedd95fafec90c1cf549513c200b154b36dc9d11b1d7d2e5ab7408cd3a34ff81575278b3bfd SHA512 b49f76ef2444ef56ebc7d3c2d425990d8a31bc99acd066364c597b95c0905c75290e2add1e1ab1b5a87a64320594fea01388d3295a6b3763f6d3d370a399d198
-EBUILD mod_log_sql-1.101-r3.ebuild 1513 BLAKE2B 4c58e6a6e2d8933e64b70835e85a9d99e10353fe1ad90ab60c411bca0ee3163270c51922b9cf5112026f38af4c906498ad59b14d6f8c498dfd2e7dde364d4b4c SHA512 43d6f1e8ab52c8cd182299f26f4162fed7efd4f457ad9dc6e7f5b69d6f478a5ef85d4c579bec485b1d4618a5949480bb22c40b2ddabf6bef377499db69ca5fdc
+EBUILD mod_log_sql-1.101-r3.ebuild 1512 BLAKE2B 0ce4c3293c4c16baa36914d459978bba273b35810310850adefd6aceeca37813bb0de20b6c699c6ced61dd518dffee4ee7e8aa91273c6db27bafae28751c3120 SHA512 38f672c042a87484ca34d5934135b2a19f9ee37611d7ca2e14c2b015559f913364efcb69328f2f4ee7528d26effd0c6319bd622c3d5fbf74bdac81491d96af8d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild b/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild
deleted file mode 100644
index 0ffe17b300e7..000000000000
--- a/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit apache-module eutils
-
-DESCRIPTION="An Apache module for logging to an SQL (MySQL) database"
-HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_log_sql/"
-SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="dbi ssl"
-
-DEPEND="virtual/mysql
-	dbi? ( dev-db/libdbi )
-	ssl? ( dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_CONF="1.101/42_${PN}"
-APACHE2_MOD_DEFINE="LOG_SQL"
-
-APACHE2_EXECFILES="
-	.libs/${PN}_logio.so
-	.libs/${PN}_mysql.so
-	.libs/${PN}_ssl.so"
-
-DOCFILES="AUTHORS CHANGELOG docs/README docs/manual.html \
-contrib/create_tables.sql contrib/make_combined_log.pl contrib/mysql_import_combined_log.pl"
-
-need_apache2_4
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-apache-2.4.patch
-}
-
-src_configure() {
-	local myconf="--with-apxs=${APXS}"
-	use ssl && myconf="${myconf} --with-ssl-inc=/usr"
-	use ssl || myconf="${myconf} --without-ssl-inc"
-	use dbi && myconf="${myconf} --with-dbi=/usr"
-	use dbi || myconf="${myconf} --without-dbi"
-	econf ${myconf}
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	use dbi && APACHE2_EXECFILES="${APACHE2_EXECFILES} .libs/${PN}_dbi.so"
-	apache-module_src_install
-}
-
-pkg_postinst() {
-	use dbi && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} DBI"
-	apache-module_pkg_postinst
-	einfo "Refer to /usr/share/doc/${PF}/ for scripts"
-	einfo "on how to create logging tables."
-}
diff --git a/www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild b/www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild
index 728f2cb49d9e..250033863d3d 100644
--- a/www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild
+++ b/www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="dbi ssl"
 
 DEPEND="dev-db/mysql-connector-c:0=
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index 62df6bfab4b1..772833495cc6 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -2,7 +2,7 @@ AUX 10_mod_qos.conf 97 BLAKE2B d3dfe5296b89ef35b09e6b9a0d272c3fcfd66ceb54e2405c3
 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
-EBUILD mod_qos-11.61.ebuild 1016 BLAKE2B 66b80b9c56cf82ec6c01b73ad660ecf95363b2450513868c07c36868cb6327731401e88edeb010bf51516ce78e59eb2919ceaea3957fc9d2bcfaa5612c6ae9bb SHA512 c647eec700392c45827bc859a7c04d15ff7f6af7d93bc9ab77947d0b5e5170aa278d224d150596d864d3bd2cc7ea7120e3752a3be5e2a173775632483dc612e3
-EBUILD mod_qos-11.65.ebuild 1163 BLAKE2B 3937f41aed391c7b15467f61014332da33aa513136a2435d8de4985fccb4f0b4dd829ce1983fcec4068d986a46e629dfece57541f91003a8caa2460429617b0f SHA512 0ab9aea2e74a785701a6dcd77d1a15ff02188249a11a8c7f4ef671e14d9fbda9cc72f85cb7ddbbde5ebab14ea61ed749a8a6e737a9ef1b6e49950424a7d3bc16
-EBUILD mod_qos-11.66.ebuild 1207 BLAKE2B 1b777dc59bba7c9c156a78aebada139cc7c0e4533696212e9a88139b0da343da98356b3696c9237d74d4b1e020f569a498465c07cda8b7dfb8ba5cb10d349a93 SHA512 9674a4f4b3da30fdcbc5a531842a71717eaf66d5ae8e26b83b77410062896ec33aec1b62a15167680784c505071e60310fb6821d8f0eb468fb117cedc5fa054e
+EBUILD mod_qos-11.61.ebuild 1018 BLAKE2B a767c7a386589ba71393c8f7c9b6cf1086d02dc70b9b2349230cf91628bae7ee4633eef70d932ac34a780156fe12deab23c8782653e4bf9e444e200b7e7ee78e SHA512 880a9b2920d2604630d0f9a813bfc38a1a469f4de9a3c731bef61dbe122f094e4b681d783228aaa71b0229d08e95d9362d23adccc8556985eb193a5b0dacfd51
+EBUILD mod_qos-11.65.ebuild 1165 BLAKE2B 3e289624c4779988e86e9f5814929aab89f09f20c37909375f2d2084c10a691f65899349556562e1030b89eb207b3bb25b6e168e5e3c6d4bd28312674e59b126 SHA512 d7e2a30f9021da10dee0c0961c064d9649a74354406d8741f815163ca40c391e35f6509fac8453c450c94b4982eb5c3dd780ff824478c19c9466860e77f21d35
+EBUILD mod_qos-11.66.ebuild 1209 BLAKE2B 27acbd35386486da6bb60db15e1d5b37c8a908a5f1d809ee6aad6da2d1051789dc6b9ffbc7b363d92d7e548e7c2cfe4f25f0f0169a26b7a22e6c64ac98c88142 SHA512 97f8dc24718a33fc09a4eb1a61c94c4935699e62c29f3e227fc59a0db48a8e38ae8cb74279d0636f81f98776ab4a1581d9eecd9a651f724161aec8bc24418212
 MISC metadata.xml 325 BLAKE2B 322d2ee01e15bccbfc982530d0d51a66646a30d3c937d514dd5967ad5501325ecb6d2ead18b63f6255532fbcd80208b29fa325d90cfe8d65414fa7013c2af7e0 SHA512 392b5e28cca1b7b253349524117b22242a465f5413ed06ad844f51873f0c8b2c1d90d6b6b79c7dd6ebc2004be5d0b1757cd24ddcfb56ee12d0e1be325a460be5
diff --git a/www-apache/mod_qos/mod_qos-11.61.ebuild b/www-apache/mod_qos/mod_qos-11.61.ebuild
index b7bb23e76819..9cfad84c4f10 100644
--- a/www-apache/mod_qos/mod_qos-11.61.ebuild
+++ b/www-apache/mod_qos/mod_qos-11.61.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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"
@@ -19,7 +20,7 @@ RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib:0=
 "
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 APXS2_S="${S}/apache2"
 APACHE2_MOD_CONF="10_${PN}"
diff --git a/www-apache/mod_qos/mod_qos-11.65.ebuild b/www-apache/mod_qos/mod_qos-11.65.ebuild
index 765632d044a6..7d7ff9dfbeff 100644
--- a/www-apache/mod_qos/mod_qos-11.65.ebuild
+++ b/www-apache/mod_qos/mod_qos-11.65.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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"
@@ -19,7 +20,7 @@ RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib:0=
 "
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 APXS2_S="${S}/apache2"
 APACHE2_MOD_CONF="10_${PN}"
diff --git a/www-apache/mod_qos/mod_qos-11.66.ebuild b/www-apache/mod_qos/mod_qos-11.66.ebuild
index 9659eec93ecb..32b1e831b2e3 100644
--- a/www-apache/mod_qos/mod_qos-11.66.ebuild
+++ b/www-apache/mod_qos/mod_qos-11.66.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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"
@@ -20,7 +21,7 @@ RDEPEND="
 	media-libs/libpng:0=
 	sys-libs/zlib:0=
 "
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 APXS2_S="${S}/apache2"
 APACHE2_MOD_CONF="10_${PN}"
diff --git a/www-apache/mod_rpaf/Manifest b/www-apache/mod_rpaf/Manifest
index 574a3194564b..ea5f85915507 100644
--- a/www-apache/mod_rpaf/Manifest
+++ b/www-apache/mod_rpaf/Manifest
@@ -4,5 +4,5 @@ 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
-EBUILD mod_rpaf-0.6-r1.ebuild 540 BLAKE2B d3856345a525e08cf190a78b15ea3743dc360761580b28d28173fbbd371d321d2a205c003ea3adc2536f1346abe77429134a13b923f1fae1d1f88f9cbae72fea SHA512 c526354b7f3829e875030a4f817ec9124b1b5e57d83477876116ef3d3140351da1522a2332273c90b90d9201ebd1e943338db46eb80de16251dcc0b7e1c84bca
+EBUILD mod_rpaf-0.6-r1.ebuild 537 BLAKE2B cea5eaccc9d1035e9e09a2c1968093c5a11db0d78f035ac8a22a9949a27820b4b57ca0273cec85b5c8e9648e2eca59ab703f3cdc31642b8c7000020c2817b4aa SHA512 3ebe42367b9c5ac81a9e371e3b512bea95211b208b05fbc98e4a989dbe85dbb34df431cd083abc422ba0dd26125e39895a72b16556eec747d7a0b98f3e7ee027
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/mod_rpaf/mod_rpaf-0.6-r1.ebuild b/www-apache/mod_rpaf/mod_rpaf-0.6-r1.ebuild
index 703c870f07a4..e0e4e989f91d 100644
--- a/www-apache/mod_rpaf/mod_rpaf-0.6-r1.ebuild
+++ b/www-apache/mod_rpaf/mod_rpaf-0.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit apache-module eutils
+inherit apache-module epatch
 
 DESCRIPTION="Reverse proxy add forward module"
 HOMEPAGE="http://stderr.net/apache/rpaf/"
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index 5a888efb2298..2357c7eca4a4 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -1,7 +1,5 @@
 AUX 70_mod_wsgi.conf 100 BLAKE2B e0df283f4b825628cceb7538231afbba10d3dc1eaab64da22d336c1426c4f8f0379e1958b3599811b2efc3cdb16f9543ad3f72d6139da9be01897bf200c06100 SHA512 6e0310d3f5dd8da4653c8502ad297ffe73c04e04c5fdd87721c407e839ba81ba4060394bcd1f06ef26d2d98cf007b585a382eb5f566345817999cd237adfa833
-DIST mod_wsgi-4.7.0.tar.gz 695658 BLAKE2B 4332e5c30219cde9cf44c8633f3052faa104524d5a2ccd151fe9675364760cb9c447001289094c57cef21df4e364962c93e85f3a3eef36325e9b96e7715dfc19 SHA512 4c40a07301ef7f42ff175cfd5efd9c4916ba90749780cdc470cc0c62b190af810ba4284504f2b342c1e92801637aa52ba5719e0b114a072fd50d68754abdf36f
 DIST mod_wsgi-4.7.1.tar.gz 696111 BLAKE2B 69fea421077f1ecbf1cef5c9eac4ba296fa676e0bfbb860ca8a7cb701701f405edb3760486b87e8d9dd93efcb4c23385197d770ca32e16a473d5d252d292fb76 SHA512 cbb5ec53d55e47a83f2b0630527c6a52b48ef21d5d2c18adcb875fc455795b39b3c93f4a86dfbf9738c0bd554d86cc4912cc9ff83c428af302ab94a61f66b5b4
-EBUILD mod_wsgi-4.7.0.ebuild 829 BLAKE2B 4dd9357ea7c77c5f881edeb7b625d8995cdcbabf8c4750013aad2fc08df0821611c60e924b2543337b9238f21f65fb3e0a87fd9233604c4bb502cec0993b8208 SHA512 c0321b58f1340e92cc11a41760b17208f4aac337590c6fbd4e0d76918c732f3523091ed9d9399787f151efcfd937a03d5a553b5d5f7e3cc077a24b203a76a736
-EBUILD mod_wsgi-4.7.1-r1.ebuild 1242 BLAKE2B bf2517661deb7bd62cbac3b928480d57cc7796d2085f97f5da2194871b48abaddfb09bd812efc6d3f1041417430350ce2fcbdd5578f3404de6399fc0b77175a5 SHA512 1b13d3e0e25e4eff71e5b69a67cd3d40dd416d8ce3ec54755ca92b4a6ba6838afc09bd32a2722c7337931c85515abd9874798def529ef097a0ce6a780324ba39
-EBUILD mod_wsgi-4.7.1.ebuild 1235 BLAKE2B 4a54f43d7e8224caa152fe2b48af6126108ad74c2b3ebb5b38eb99127b2f741f1e54cb6237a852fbbb7d9c8a5e3b8253c227d507bd2fabbd02e3abf87ba13138 SHA512 132ae2a81c61c7e52615313e503b233d498dd37b65103b4be906f1173c178169ee66158bd25c1178c3da1ba303c37b646494d2942893f265533cd0cc04992e42
+EBUILD mod_wsgi-4.7.1-r1.ebuild 1235 BLAKE2B 725ac7c62fd6f7722203940527b0d130087ef03e4f02b201d028993070046dc634526c237693f20b2b974f54b5ca137611c29160310a3c33bf81baf0fee631ee SHA512 192d2492c1f2e0f3d79a5586442e6a60e5f80dfb55f6a41b1dcc6fcebb7e8f00df76ca15a4f26bb04c3bbf40a0ac80376131b4940e88ac4a5b5c3773922a3798
+EBUILD mod_wsgi-4.7.1.ebuild 1228 BLAKE2B dc5ab6545e2acfe51ee4f77dd6335f3b7ed56170f64a6fc043f57faa7b0d7d00a04d227611565da142e0a2e9bc4bfa5b315c0f54c1c9e519e0fa552030c2f98a SHA512 aaf4516e8304d1312b1ce3977281c86f866baaf9d7b1de3da3dd5b471f59e547b0b002aa966cb72dfbefd22efa26124e15ec4a377b64aa5a2f49196aeb58e1c3
 MISC metadata.xml 380 BLAKE2B 1b06e8ab30ece204c3b5926675346cca70352c9a0ffd7fef754fc25473b9e4040111da0005e24da304add76f1a56ccd0ab9247ae10faca316dca982052c6853a SHA512 b62536a8a79d3d5198b6cbd7eb51be455a8c7de53add3810120edc1beee7d0684e09e43de355c5da7a61486c8764c4619c809d9fadde9e9502cb5c0b364d7b68
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
deleted file mode 100644
index f2bcc902e83f..000000000000
--- a/www-apache/mod_wsgi/mod_wsgi-4.7.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit apache-module eutils python-single-r1
-
-DESCRIPTION="An Apache2 module for running Python WSGI applications"
-HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi"
-SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}"
-
-APACHE2_MOD_CONF="70_${PN}"
-APACHE2_MOD_DEFINE="WSGI"
-APACHE2_MOD_FILE="${S}/src/server/.libs/${PN}.so"
-
-DOCFILES="README.rst"
-
-need_apache2
-
-src_configure() {
-	econf --with-apxs=${APXS} --with-python=${PYTHON}
-}
-
-src_compile() {
-	default
-}
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
index 609e961c96ea..0bf447b96d6d 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit apache-module eutils python-single-r1
+inherit apache-module python-single-r1
 
 DESCRIPTION="An Apache2 module for running Python WSGI applications"
 HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi"
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild
index cb4f9aa9dcc6..7621b99b57d4 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit apache-module eutils python-single-r1
+inherit apache-module python-single-r1
 
 DESCRIPTION="An Apache2 module for running Python WSGI applications"
 HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi"
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 3fc87d9c3667..1428ee64afc3 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,12 +1,10 @@
 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.4.tar.gz 7347803 BLAKE2B 2e367b8dd0ace6a2773de92b3237821625190f2ae52fd11a1a3c47230d24affe1f9d161ef0346210cc91a21ae3a58f40f796063796399da0d133d6b0a261f52c SHA512 dd3398bece50c9da6029a5a9d98de2bed2e33a92f49fc776fe2b8f80f4a47e36d8a716c12f2f74d9611de5aa04981ddf680fc29a37f5b1860731a6f6e8390c81
-DIST passenger-6.0.5.tar.gz 7347149 BLAKE2B c2a1cb74a0c5d9ea7ea245b1c55413b8d212dc091bc7ad8727ca4cc4249cbc60e92c5313a5a1f8daf5dcea64485b27fbeeae9fada18727aed20dc38779d112ea SHA512 a6c174a52947f3985a0bbed20996e8386efdac6100a6c7ce9994bb6be7617bf810ac04821fae122e569e1883e8a8b1350cdccfa2b02053e5a4fbd13f891716e4
 DIST passenger-6.0.6.tar.gz 7347506 BLAKE2B 16332ca5c299c366c891eef0267889d024417bacafafb9b6faed94434f16a3823fd21e9251eeefe190a682e8530b49cde4af22008b1537466ee3d685554dcbac SHA512 57a013dbbddab13862c2d5445d048aafdc5a56297c56d3d642a39fe7757d3bcbd7e9e21aca36ebeb0f54a03d26e0886031a947cb098026a516900cc5bff42f0c
 DIST passenger-6.0.7.tar.gz 7352163 BLAKE2B e002f03f761cfd1b2a79f3d518fe25fb1ead4f0431042b6bfe2ecf1b9900e6405abb4d67f9750302149f1d99990d2b42bc0fb1c855168b7003ac37eec3297b8f SHA512 6019a93ac500333098cee772b5240f6cbf3a75a8d7cdd2bccac58c28369dddca574dc7e1c239a8f21b863df4825e758bb5eae84b316842168dc875116a07bfca
-EBUILD passenger-6.0.4.ebuild 3977 BLAKE2B 136797a63538618616ce49f3b2a1082f7155b88934b38d3c9118216ee43490f4a336164def33741ac072612fff9b96bc3bb897e2d76080e7eb030a2c180159e2 SHA512 584b578239cbe18ea1866d91231f92c5b1892d9481e3c52dbf768ab81396dfb17e5b861f956e33de81ba8c3365f61e06bd1ba785f966bc74e226a453478d3c54
-EBUILD passenger-6.0.5.ebuild 4078 BLAKE2B 72fffd8164aef7e98dd776ee3cc88b36e0434a540724346f6648f5960482fd4622facb310426715f12af3d1cfe7b98defd2302613d733e1542405896c8780e8b SHA512 6f2788c530920b8d8fdff8c96735de909b5bcc230cc579c0777352f23bb8a50486a982375ff70a4b68d8b903d7ed1af5fb413c0a66933490b9e2f080199a22a9
+DIST passenger-6.0.8.tar.gz 7567855 BLAKE2B ea8577c07a57eaea4e3b2b236808c9e54badb35368e948132af04220026b2676a71d066625a64cd98ce35118ae613bcbca8a0a1f8e0bc2a8d321c1165dec72f5 SHA512 ad35bee4a1c855b8f5401ab44e2a9b0cf3281e7fb1d8e09c8b12c54a465545d43285301c7d0fe16914e3c0fd5407d0d5cef31bb296f850d787903e6e006b368f
 EBUILD passenger-6.0.6.ebuild 4069 BLAKE2B f644fe935ff16ea908a7f6580d5fd12740b82ccfa26fae074d94df6f4ea46dec16ffab107ce9ef113e210f7eb90d5c9af4a92491f787271088b5c12a6811edbb SHA512 17357f9f346368021aca4acd3cb7516e7d1b340b5838c62fc7b43c3f7125d6fd2cfb5e116b3ca3ab7070c8203f6790a5c23beeea42fff0255337dab42b6df483
 EBUILD passenger-6.0.7.ebuild 4071 BLAKE2B 88556cba75e710275d64a50df6b2c9bc2721736240a0c6f2f611255093ce02d9b902fe14f33da152eba4069152c26d52b04b3962ed191fbc1bda82405c2d66f8 SHA512 e9e03814a511829b317f6c3c26ee6429f1dff106b80d4f1a088dfcc7ebdb615b93410ce1f8b7b5ed034956d2347bdb6e7582939c43de1168351e4f0fa5887dcf
+EBUILD passenger-6.0.8.ebuild 4078 BLAKE2B b1da770623dcc7a80661b881c21cf7865cf991d04202e3fd55cc672ae62ec940a5343291a4fac0c1d64fe8b1f51fc09864b4b437699b48bfd7f5759b1c2f0ae3 SHA512 c7acf738f7a4b74bce94f6826b0e8a19adb0068f526e43b68b990cbeb7c26404c26180233bfbce83c9d19e82ae720452404d3d374619fbd088b6242ba824b70c
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-6.0.4.ebuild b/www-apache/passenger/passenger-6.0.4.ebuild
deleted file mode 100644
index 3ec3b0b2167e..000000000000
--- a/www-apache/passenger/passenger-6.0.4.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit apache-module flag-o-matic multilib 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 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
-	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.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 -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" 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."
-
-	# Avoid building documentation to avoid a dependency on mizuho.
-	#sed -i -e 's/, :doc//' build/packaging.rb || die
-	touch doc/*.html || die
-
-	# 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" \
-		 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" \
-	${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
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	FS_LIBDIR='/usr/'$(get_libdir) \
-	EXTRA_LDFLAGS="${LDFLAGS}" \
-	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
-	${RUBY} -S rake fakeroot || die "rake failed"
-}
diff --git a/www-apache/passenger/passenger-6.0.5.ebuild b/www-apache/passenger/passenger-6.0.8.ebuild
index 39e9be599ea9..17074fb367be 100644
--- a/www-apache/passenger/passenger-6.0.5.ebuild
+++ b/www-apache/passenger/passenger-6.0.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs