gentoo resync : 27.03.2021

5 files changed, 86 insertions, 3 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index ef7752deba79..51a5dfde2a7b 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest
index 55a1447228c1..db297d0cf039 100644
--- a/www-apache/libapreq2/Manifest
+++ b/www-apache/libapreq2/Manifest
@@ -2,6 +2,8 @@ AUX 76_mod_apreq.conf 316 BLAKE2B 368a404fae7bf917eb61090c90b19d090d607f54ffb717
 AUX libapreq2-2.08-doc.patch 1188 BLAKE2B 296bf0b1e23389c0d418df23768e68932c22f0b4f51f1b7e3e4e2d0f4d96dde2a687c9c2e5885fbdba2b936efd5947d13c3aacc7ba69d40ce5a956593fce4ca4 SHA512 dc889d7890d9059efdb3fcd4d6b1e485929b69c073ff6266b90f82e89efe5bdd633fd4dc09ccd4aac3f8816271c00dca69b39ffe4706baf7d3094404784cd766
 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.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.16.ebuild b/www-apache/libapreq2/libapreq2-2.16.ebuild
new file mode 100644
index 000000000000..cf4d3ef38e4f
--- /dev/null
+++ b/www-apache/libapreq2/libapreq2-2.16.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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/"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="perl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		dev-libs/apr-util[openssl]
+		dev-libs/apr-util[libressl]
+		dev-libs/apr-util[nss]
+	)
+	perl? (
+		>=dev-perl/ExtUtils-XSBuilder-0.23
+		virtual/perl-version
+		>=www-apache/mod_perl-2
+	)
+"
+# sys-apps/file should be BDEPEND when we can use EAPI 7
+# bug #778173
+DEPEND="
+	${RDEPEND}
+	sys-apps/file
+	test? ( dev-perl/Apache-Test )
+"
+
+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
+
+pkg_setup() {
+	perl_set_version
+}
+
+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
+}
+
+src_configure() {
+	econf \
+		--with-apache2-apxs=${APXS} \
+		$(use_enable perl perl-glue)
+}
+
+src_install() {
+	APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
+	apache-module_src_install
+
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+	doman docs/man/man3/*.3
+
+	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
+		fi
+	done
+}
diff --git a/www-apache/mod_log_sql/Manifest b/www-apache/mod_log_sql/Manifest
index 18790928a255..f2f2603f76a0 100644
--- a/www-apache/mod_log_sql/Manifest
+++ b/www-apache/mod_log_sql/Manifest
@@ -3,5 +3,5 @@ AUX 42_mod_log_sql.conf 827 BLAKE2B f96bb44047f2301a7db85e9cd9c66a53a703aa5f5426
 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 1514 BLAKE2B 69532ac3e554101c43215a5d4737cbac104751b8ed89a993f2c987a99093c73b18472acaa4b93ee7840184767c53c6e63624f96598e10f5c282e1d86936febf0 SHA512 bd9349517ed458d8d63817e765f6c5772f9d3b73dfdabab3902fe307937bd2a9edeb4afd88336ba35e98d630aa252c1c177a34c211943a4ebf659027f60e912a
+EBUILD mod_log_sql-1.101-r3.ebuild 1513 BLAKE2B 4c58e6a6e2d8933e64b70835e85a9d99e10353fe1ad90ab60c411bca0ee3163270c51922b9cf5112026f38af4c906498ad59b14d6f8c498dfd2e7dde364d4b4c SHA512 43d6f1e8ab52c8cd182299f26f4162fed7efd4f457ad9dc6e7f5b69d6f478a5ef85d4c579bec485b1d4618a5949480bb22c40b2ddabf6bef377499db69ca5fdc
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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 d7f0da75b8d4..728f2cb49d9e 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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=