gentoo resync : 09.07.2022

7 files changed, 78 insertions, 24 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index a94d6c04184b..572da9b9799b 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest
index 9fd7fc27a0aa..0796ee2337bb 100644
--- a/www-apache/libapreq2/Manifest
+++ b/www-apache/libapreq2/Manifest
@@ -1,5 +1,5 @@
 AUX 76_mod_apreq.conf 316 BLAKE2B 368a404fae7bf917eb61090c90b19d090d607f54ffb717f1fa7154af6db0c1b71f6022e4ee38b1588c56b6777adb5eee4402377a33c4d78601bb19d0074a8de3 SHA512 2a4d7c8415162d27ae182f091b8a2219c2865ff7ace0a5b8944e853cd256955888482877ab7cce55342a3d30686f9d7932bbbfdcc8c037e15c92e60de9eab20b
 AUX libapreq2-2.08-doc.patch 1188 BLAKE2B 296bf0b1e23389c0d418df23768e68932c22f0b4f51f1b7e3e4e2d0f4d96dde2a687c9c2e5885fbdba2b936efd5947d13c3aacc7ba69d40ce5a956593fce4ca4 SHA512 dc889d7890d9059efdb3fcd4d6b1e485929b69c073ff6266b90f82e89efe5bdd633fd4dc09ccd4aac3f8816271c00dca69b39ffe4706baf7d3094404784cd766
 DIST libapreq2-2.16.tar.gz 839264 BLAKE2B 6a79e0281bb24962775f6c2fcc906d07a2f7643f608871018a647a225329c45516f1afe12e27c432449765463b2a4e823a728051fa73938e97ddc828b94c4732 SHA512 aa9e751a3f0d6a9cb587aa1c5408e8d9a073560860d7f653776196fe3739516df16abe943c9cb0460cfb9b68a2d79ad651cfd5e4a30a2ca34d6dc3ced73f628c
-EBUILD libapreq2-2.16.ebuild 1678 BLAKE2B 038bc31535beeef479f03cd94bf8531bf06333e37966f92f32dca62d832448f64ee85c57f18e483d67611dac0e259fb83a82c70d9072af6a596c81a6952a07e8 SHA512 36b759b3a184538dbcefb2f3a06b53b9800ded7aaa35bd657ed58e9e14dae542b005c84df6ae68efab2557e392c0c8eddea462652ebbc1bd4f932c3d3a2f90af
+EBUILD libapreq2-2.16-r1.ebuild 1640 BLAKE2B 1bb13f488751319ab29288b37f799f933a54865aee666ea796b1108567d2d7fd4ca99b351213d7ad0eeefcb793195f484b264b115e548a531409a7127c8da083 SHA512 ec28ac5a8a2eb6175c4fb6b7cabe99d762e180d5360e6bdb501ddb3be23a3fc0053631ee2121de837457b057929c49500cdae8dc888b2fa3534501bfd9bd0025
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/libapreq2/libapreq2-2.16.ebuild b/www-apache/libapreq2/libapreq2-2.16-r1.ebuild
index 1b153b066441..4d50482c8c95 100644
--- a/www-apache/libapreq2/libapreq2-2.16.ebuild
+++ b/www-apache/libapreq2/libapreq2-2.16-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit apache-module perl-module
 
 DESCRIPTION="A library for manipulating client request data via the Apache API"
-SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz"
 HOMEPAGE="https://httpd.apache.org/apreq/"
+SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
@@ -25,23 +25,17 @@ RDEPEND="
 		virtual/perl-version
 		>=www-apache/mod_perl-2
 	)
-"
-# sys-apps/file should be BDEPEND when we can use EAPI 7
-# bug #778173
+	virtual/libcrypt:="
 DEPEND="
 	${RDEPEND}
-	sys-apps/file
-	test? ( dev-perl/Apache-Test )
-"
+	test? ( dev-perl/Apache-Test )"
+BDEPEND="sys-apps/file"
 
-PATCHES=(
-	"${FILESDIR}"/libapreq2-2.08-doc.patch
-)
+PATCHES=( "${FILESDIR}"/libapreq2-2.08-doc.patch )
 
 APACHE2_MOD_FILE="module/apache2/.libs/mod_apreq2.so"
 APACHE2_MOD_CONF="76_mod_apreq"
 APACHE2_MOD_DEFINE="APREQ"
-DOCFILES="docs/html/*.html CHANGES README INSTALL MANIFEST"
 
 need_apache2
 
@@ -52,13 +46,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/acinclude.m4 || die
-	sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/aclocal.m4 || die
-	sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/configure  || die
+	sed -i -e "s/PERL \$PERL_OPTS/PERL/" acinclude.m4 aclocal.m4 configure || die
 }
 
 src_configure() {
 	econf \
+		--disable-static \
 		--with-apache2-apxs=${APXS} \
 		$(use_enable perl perl-glue)
 }
@@ -72,9 +65,16 @@ src_install() {
 
 	perl_delete_localpod
 
-	for i in $(find "${D}" -type f -not -name '*.so'); do
-		if file ${i} | grep -i " text"; then
-			sed -i -e "s:${D}:/:g" ${i} || die
+	HTML_DOCS=( docs/html/. )
+	einstalldocs
+	dodoc INSTALL MANIFEST
+
+	local f
+	while IFS="" read -d $'\0' -r f ; do
+		if file "${f}" | grep -i " text"; then
+			sed -i -e "s:${ED}:/:g" "${f}" || die
 		fi
-	done
+	done < <(find "${ED}" -type f -not -name '*.so' -print0)
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest
index 80dd94b54cff..2a096df24ed5 100644
--- a/www-apache/mod_gnutls/Manifest
+++ b/www-apache/mod_gnutls/Manifest
@@ -2,5 +2,5 @@ AUX 47_mod_gnutls.conf 1125 BLAKE2B f4e9a48be5abda5f9ac0af5ae6621e1d35f4b52c4d00
 DIST mod_gnutls-0.11.0.tar.bz2 458966 BLAKE2B 6d81be7b7d48255173d028a8e3207badbce0c1ba541124a241b63d4ed4eb36833156e9cd7194318138b6f16667a971d5311d56b9b0036e5b3d9dac8d352a4335 SHA512 090d244823f15a6b23dd2ad9b35db202ebbe96210ec8fd06e06f13e32c327e9d9a449834c899755f1ec8c1a3a71db1b125d436ce661caee1002a8719b4c1320e
 DIST mod_gnutls-0.12.0.tar.bz2 461643 BLAKE2B ffbb4bd50cae7c974c59067908712e104e6d77b121e5e6114a1a45279b9396331f353a53ddae8e3d58259cd7669f047edc4d2b5ebebe94bb40df55f3546b0a02 SHA512 1ec32d0641dc8dc520726a4439edf2e9dbe582651aa4c782047d0499e5e7418b3145eb071d9e97aa4ec803e6818974efea2ed8ed18e5062cd7fdb90ef2e9e0f2
 EBUILD mod_gnutls-0.11.0.ebuild 2011 BLAKE2B 9ba5504d3b8e24f2f6ed1be16a821559799f43e081454b1f45d8a01e263697077fd95b59bb9de74eee22f99246019b529a407081941f1be9a2873c4eab63f445 SHA512 2285ee4e71a949211df2a8251f941f0bad7debb19c9cbbcc0fc615978c3f6a85bc3f89778aba5a1c102108bf8bba5f2864bbcec14c415ba7fe150b4bc183fd47
-EBUILD mod_gnutls-0.12.0.ebuild 1915 BLAKE2B 5552cf150f3f3b75a33876399c9b38d1116017fef92a881795c09e84208fbdc2c58424971f5ff3c9160da54a05c861ea2736cbde6a570d2a7acbbb5f1c76ae47 SHA512 c357a5ed917688d48ddcaeea2eafb22e3342cb301b30fa575f4f47d02b05e7796fa4822eec21b11823be14e2d8c4ca4d0741078fa42e8172396f628503138464
+EBUILD mod_gnutls-0.12.0-r1.ebuild 1991 BLAKE2B 1aae7bbfc6e9be425abdfb86627fdf7b107e435cfc21d961d75ac0384e038c6c60a44a4ff537c38d25cef7b5eb4b34a5c8fbb153afb4396da42e5b5758411e82 SHA512 5eb05bc71ed94fb1c9430176cdf28c57d828b6f4c446365f4de0850596321389bc7b5e3ecb60f791fd84ec5bf066c3890de765277b2d63cf62f647c9a3b3cf19
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.12.0.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.12.0-r1.ebuild
index 2b9dea4ff9d5..677b06b80b28 100644
--- a/www-apache/mod_gnutls/mod_gnutls-0.12.0.ebuild
+++ b/www-apache/mod_gnutls/mod_gnutls-0.12.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools apache-module python-any-r1
+inherit autotools apache-module flag-o-matic python-any-r1
 
 DESCRIPTION="mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)"
 HOMEPAGE="https://mod.gnutls.org/"
@@ -13,7 +13,7 @@ SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 TEST_REQUIRED_APACHE_MODULES="apache2_modules_proxy,apache2_modules_proxy_http"
@@ -69,6 +69,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Add LFS flags, enable x86 support. #856349
+	append-lfs-flags
+
 	local myeconfargs=(
 		--with-apxs="${APXS}"
 		--disable-strict
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index bed7069f4aaa..b88e5d49958c 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,7 +1,9 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
 DIST mod_h2-2.0.1.tar.gz 664404 BLAKE2B 94ee488f205e4ca0fdeb40e743b5679208698af97a33f965b2828e2b4f66bed4bb4ca99a23113039ed4766c73aa0aaf00377d379cfd52a5f605c197269702303 SHA512 2e2d6fb01abe34549a6ea81f33356ebbc667223d5ccb23f3027685deb9a4482cacf26be8d5cd30738afbf52be4f777f896bb8c0061bbfbbfc4ea5f2ace267468
 DIST mod_h2-2.0.2.tar.gz 665479 BLAKE2B 9f23ffec269925aac6b3d7d336c740acf0c326b3e63a36b390f09f68cdb94ba3304f4144ef81c29b277c3fd6d0de515e205a42c580da1f9b12835dbd6a2cd03b SHA512 06271742bd50dd3b4c910612289d705e2b65df0557d1d34be49dd1fa1b20776384784fbefb8afc9b74ab87a70ecb6fc834ff3c7c8216b01b24f8e9358b9485ae
+DIST mod_h2-2.0.3.tar.gz 669349 BLAKE2B cafd93b7a9b19024db579cd95830082adef302f7231cd3849aefe02ccaa708422f63793ba9f2a98bf98409367fc7bb4d2fd789b4abcd2d9946ed94f9cbcfd1f8 SHA512 a4d4fcd8f9add7342af3e99ddb5398f988d0e6a7181e86850dd548af81225d47a92e8dc381ca8436a87f78b32d51f81306709dfbcaebf06c3339bee71fb69b71
 EBUILD mod_h2-2.0.1.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
 EBUILD mod_h2-2.0.2.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
+EBUILD mod_h2-2.0.3.ebuild 935 BLAKE2B 6c4ebc185351916c2a983f59c52c4c207b76f283068cd7a7de81c973e8c245112186a96b0e0815ea82adadf6f27301b10c6e38ac826873b5704f7f7f9246ab5b SHA512 1de444a765a898fc3f8203c8f5d4d441379375cfc59575403b7285e337f4f4f594d30242d56ec2376486d4567feed96795a57c7e6815d7de4c275ba25a1832aa
 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-2.0.3.ebuild b/www-apache/mod_h2/mod_h2-2.0.3.ebuild
new file mode 100644
index 000000000000..34f8a15777b3
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-2.0.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 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"
+}