gentoo resync : 12.03.2021

8 files changed, 47 insertions, 10 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index cafddcdebba2..02f05fea6729 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 5fb6da5340cf..49bf52fbf661 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 1359 BLAKE2B f3b27c346e8c604538ba7e8924eb1a158f2433ee56970a9ce8672d842418759ecd0b34c70ae85bb58ad557d00eb71969dbedd467fb244872f8ce4b6f8c4c34ec SHA512 46975625adab3e34d073687531ce2144d19da49ead2883bd4f6dccdd49f2b8bb2621d588837c0eded8d98322711674e8d3784ec92edfdb957868a486afc68285
+EBUILD mod_auth_kerb-5.4-r2.ebuild 1348 BLAKE2B 7a5e0e722c429dffe6b88341020a58f89b7e74d7cce06d80f863271b6372ad500693686ce3e1d58a8d24406bf5bb493aea027f50dfd8d5c6b4d924713ab1ed1a SHA512 0cd33367866ec359eb45f749dfcd826bcf8062eb083aaaf2aa983764e906f1ab5466efbea40bd72efe78131af16623bf3b826f309d0571a944eb43380423b3dd
 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 9094681f3d40..40e71cf95be3 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
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit apache-module eutils systemd
+inherit apache-module eutils tmpfiles
 
 DESCRIPTION="An Apache authentication module using Kerberos"
 HOMEPAGE="http://modauthkerb.sourceforge.net/"
@@ -50,5 +50,5 @@ src_compile() {
 
 src_install() {
 	apache-module_src_install
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+	dotmpfiles "${FILESDIR}/${PN}.conf"
 }
diff --git a/www-apache/mod_fastcgi_handler/Manifest b/www-apache/mod_fastcgi_handler/Manifest
index 7f0a266460eb..42a6d7175a25 100644
--- a/www-apache/mod_fastcgi_handler/Manifest
+++ b/www-apache/mod_fastcgi_handler/Manifest
@@ -1,4 +1,4 @@
 AUX 20_mod_fastcgi_handler.conf 133 BLAKE2B f99f484da6c2e9f0f3255effa62485c9b9b81a118a6a192134d3631acd26765ef4b32ddf366d9ac0c8979206b891a07f7750a3983354488c50a950edb44d21c7 SHA512 d78c4d4f5ed85d8b42c435684d302dcbfc3f6eae6bdef3035226ad7da6225aee38dc05899b8b8c282bf77c61fe3422b4de5b48db4c948f9df49465e54f999f2f
 DIST mod_fastcgi_handler-0.6.tar.gz 10974 BLAKE2B c5613ba343510845c04e75cef815a2ab938aae9b7e2bc78cd709d562734f01f950ceb0b8bcbf2db0e0897c19d61c8d8667a01d82693d5f99971c80b57f73107d SHA512 05b86eb584b74e86924e84dad74072ea4dc318d2d3f1826477cfc45d2f5ea86b8b35d946f5cb1b6472cf21f18636dd2132af06bd27774551f5f5c8c557ed7d6b
-EBUILD mod_fastcgi_handler-0.6-r1.ebuild 503 BLAKE2B bce092cba87da7d4919f231b0e786566e1396194eeca9079dd52d629e9659a36bac0aedc9ab18514f7e526951cea30bc880ee7873eb596e8d53a51c394ef293c SHA512 61ae327b5def49d7bf7946499ad39f9ff589a4f37f6282d83cd40bce75fc7c4d28a41942a9b205595caf420898c09456cc244b66295c570d3b406fb500bcaea4
+EBUILD mod_fastcgi_handler-0.6-r2.ebuild 601 BLAKE2B b0c1c9fcde80fd1bba887219121ed28ff7d40c809eba36bdb298ce778c01c1d3e6ff1155e86625baa46d0a0791107a1ad5b8fff07762378854a145a162540774 SHA512 10470b7e78dcf41f80a2a802a1200527e6c2b240084f3d07d934b23b979c248719bdd323d5107cf9aba4fd435c6b4deede734eb3f00946daa7469b14318cf222
 MISC metadata.xml 256 BLAKE2B c1fbb4c1da18b6fc2606522adbdc0664fb41dae1885814501260ac4250a2cccd2fcc7640379b5b49db22b01665a9f2b073863296e21daaeae0ecd11289c94dd3 SHA512 14a333be6e0a728be16e8aab5591223f0d987c930cd6b61a2b51ee4de8bbec64e6ee03a3c660cd8f2f378aac70629f77fc06016a268035993530df94ac80eb79
diff --git a/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r1.ebuild b/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r2.ebuild
index 83ca086002c3..fb9676278d0d 100644
--- a/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r1.ebuild
+++ b/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit apache-module
 
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/hollow/mod_fastcgi_handler/archive/v${PV}.tar.gz ->
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 APACHE2_MOD_CONF="20_${PN}"
 APACHE2_MOD_DEFINE="FASTCGI_HANDLER"
@@ -20,3 +19,10 @@ APACHE2_MOD_DEFINE="FASTCGI_HANDLER"
 APXS2_ARGS="-o ${PN}.so -c *.c"
 
 need_apache2
+
+pkg_setup() {
+	# bug #653606
+	# but true cause seems to be bug #616612
+	_init_apache2
+	_init_apache2_late
+}
diff --git a/www-apache/mod_xsendfile/Manifest b/www-apache/mod_xsendfile/Manifest
index ceff9dca639c..5bc622103aa2 100644
--- a/www-apache/mod_xsendfile/Manifest
+++ b/www-apache/mod_xsendfile/Manifest
@@ -1,4 +1,5 @@
 AUX 50_mod_xsendfile.conf 451 BLAKE2B 7bacc1828434238520af0fde4f877ba64277d515f3abd7bdc8e4ccded1ec5ec5556fede98d02ffc2aa96ae9840fa3dc68a110bf81a6a09487e265018cacb50f3 SHA512 b138d82adbf2a145ff5bef22750826eabe58daf94eabdfebd8d540be4b9b242a69b9ab9333e0ceb4da0cbad947978e7bf928978b6cf8560abe5695d6b533df3c
 DIST mod_xsendfile-1.0b1.tar.gz 14883 BLAKE2B fe250070ae8b7f2f00b8b0616ad53803b0c2d5cbec897f98a9af45e3b2a4e5c598b93ce3f0ffe65d6ec083a0201e1f1c07a8d6109fc77dd761d2aa7e4d3caf10 SHA512 96745a5c753af329cabc10b1551e199425abf28c058222e118e67c604a53cfebb4fd8e27558caa58269ca8b4ca805ac6c4a71654c8414331c095bd600a4b3914
 EBUILD mod_xsendfile-1.0_beta1-r1.ebuild 764 BLAKE2B 2134b09bf78494fbb65a277a9369b9e218edf42726e32bd3cec5f11db770c0cab9c1d49bf74a50e3004205be2dd04b9d0f09d05528db0d39e16dfa8fdba25a20 SHA512 302321f9be26bb65e7bf1c38f8ab683456b49e9f8d02e06d09fa018750bba126e194118aee394b1b08cdf170f5c2cedd1320bb3d16d7828bb70a626bfd87dae9
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD mod_xsendfile-1.0_beta1-r2.ebuild 650 BLAKE2B 0d6e8d0738f74cec20651202e7588e2c1fb913088c476a6d5c25633efd68629a19daafd2bc402ca6ec098c0093e1d12f068d8bac06793058d3fadecb25eb7526 SHA512 573cc3f24ac1c8e426837687980e1661c4bd52a3f4f8b562b5d78d993d5c9d0ffdd197bc059451942be0677bef0ec4b6a65ecd63c7916256b2be7de64737e154
+MISC metadata.xml 221 BLAKE2B 62f515310d9bccb1e3747264848ac800fc9489f83567f3e23f1b3a2f6636f6a499652435e153728de911f47a8534279f3ade767815414523f15077584397a632 SHA512 9ca3dafa7e44ec0f210681f8f524549f103695d57d0f8463a9044ac9456e6bf99ad6c7448e62a672471b7e82535b76214b924e3b336f186bced032750e68754b
diff --git a/www-apache/mod_xsendfile/metadata.xml b/www-apache/mod_xsendfile/metadata.xml
index 7a38bb900964..8bf69628e798 100644
--- a/www-apache/mod_xsendfile/metadata.xml
+++ b/www-apache/mod_xsendfile/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>graaff@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r2.ebuild b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r2.ebuild
new file mode 100644
index 000000000000..c80385f181c5
--- /dev/null
+++ b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module
+
+MY_PV="1.0b1"
+DESCRIPTION="Apache module that processes X-SENDFILE headers registered by the output handler"
+HOMEPAGE="https://tn123.org/mod_xsendfile/"
+SRC_URI="https://tn123.org/mod_xsendfile/beta/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux"
+
+need_apache2
+
+src_install() {
+	APACHE2_MOD_CONF="50_${PN}"
+	APACHE2_MOD_DEFINE="XSENDFILE"
+	APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
+
+	apache-module_src_install
+
+	dodoc docs/Readme.html
+}