gentoo resync : 14.12.2020

5 files changed, 9 insertions, 4 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 208ecdc6854f..35c870df4161 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest
index 6549d672fc22..114cdd2efcd2 100644
--- a/www-apache/libapreq2/Manifest
+++ b/www-apache/libapreq2/Manifest
@@ -3,5 +3,5 @@ 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
 EBUILD libapreq2-2.13-r1.ebuild 1431 BLAKE2B 3fb9ee38eca5794203c451fc80cce1b6c5871559142b0410a0ab639ca9333d82e29440a38eb09521b2af89c7e257794ec5973d846a4375a6dab280a36f5ea642 SHA512 751c34af300a3b020a0df6ad82882ffdf840f6fd28295c3bc388d3c902080efab7537e9ea349880a478e274b9966c8eefa8f27a1db4295dfe53df11ad189e60a
-EBUILD libapreq2-2.15.ebuild 1559 BLAKE2B 5be336e3f8fa03d4c0234df4fdf11b08cd8bd28093f98ac45047bbf5defa0e14c5cc07a607a2bbfe9abb4acf372f4ac7c16371161b7f7f89b8828c66b9cdd39e SHA512 aa0e32e960db21598b1878cc59a0876a3099be11da15002e71c3e023e228f0cf9d5afa9a83a772479e68e3dada4c6ebbbe6b5215a070b19afc4c6fc3235141fe
+EBUILD libapreq2-2.15-r1.ebuild 1650 BLAKE2B 9ce1e1c5d96f70b2f624efcbcf1d640f503b9aae3d6d972c8052dbea9ddea780b8b5147b9b9ed188b59ba14507086ea6c9b1a3cf3c6b8639d5445f92520b852d SHA512 53510d3b25dcb4a9e7c5dfa85e7eab647a5bd22f64889f233b676e1cfe25f049751f49f39e0c690415da3fc2f883827c9cdc4ea406696a05ab481863dd9fc464
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/libapreq2/libapreq2-2.15.ebuild b/www-apache/libapreq2/libapreq2-2.15-r1.ebuild
index 03aadcb290e7..2b233532fee5 100644
--- a/www-apache/libapreq2/libapreq2-2.15.ebuild
+++ b/www-apache/libapreq2/libapreq2-2.15-r1.ebuild
@@ -11,11 +11,16 @@ HOMEPAGE="https://httpd.apache.org/apreq/"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+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
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index f7e70b956a37..f712bfa7ceb5 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -2,5 +2,5 @@ AUX 70_mod_wsgi.conf 100 BLAKE2B e0df283f4b825628cceb7538231afbba10d3dc1eaab64da
 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 839 BLAKE2B b647de594d4eaa18a99402346c3fb549d15fa474f0d8144a880bf17cf0f3d714a4cc3a7724e1db0cc78d1f845102d7b3bc2f7cca5b1937ac0352a7311a6dc2b0 SHA512 ffaacb13a03e8ebb52b138eccf2548fe6173c37c726a097798ae0cbed17c2044ae9c534aa20b8985e8aeeca09f53ac799cf13eecb8e01e031e76cff4a8455b23
-EBUILD mod_wsgi-4.7.1.ebuild 1240 BLAKE2B ec3c657361e9490b534c2c2529f2ae7820451ae72a62d2b721859a5e5ea145ded8bf6d1f091c791463dc5a44f77960d9e20c046728a7533ef73b043676ad3cbd SHA512 76cbb9e16745d9f4ff78d267efa2af2c5b3739b33c8e7f5fcfd04d2679241a9fead3bbd723e29bff4672d0d7cf950759088a4e7768ef0a1fc6c98280b8f7a164
+EBUILD mod_wsgi-4.7.1.ebuild 1237 BLAKE2B 8de9a5e4e7d77f87cdca792e2843ffe98ec3b31ccd0cdeb16693576cc7904fde79b6e75092d53d1a48d80da5a225607551b20395c9156fa865714e32ffff3e8f SHA512 6cb2cb340156d10013d799fb547150948b1714a40433c05cb8fc41804c77ef222b56935ca77952947bfeb37db5da30ce9844cc051828851ccf470284f39df22b
 MISC metadata.xml 380 BLAKE2B 1b06e8ab30ece204c3b5926675346cca70352c9a0ffd7fef754fc25473b9e4040111da0005e24da304add76f1a56ccd0ab9247ae10faca316dca982052c6853a SHA512 b62536a8a79d3d5198b6cbd7eb51be455a8c7de53add3810120edc1beee7d0684e09e43de355c5da7a61486c8764c4619c809d9fadde9e9502cb5c0b364d7b68
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 9415402eae83..6366d33571d4 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"