gentoo resync : 04.05.2021

6 files changed, 4 insertions, 8 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 708bb2088d77..40835f9b58c2 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest
index 55c9c0cb7324..7de7aaed6f8b 100644
--- a/www-apache/libapreq2/Manifest
+++ b/www-apache/libapreq2/Manifest
@@ -4,6 +4,6 @@ DIST libapreq2-2.13.tar.gz 891320 BLAKE2B 6e896b95a17d7e4eede651bd74f21280d77b38
 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 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
+EBUILD libapreq2-2.15-r1.ebuild 1619 BLAKE2B 1351cb6d208f5ef42d1c1f6468fc669316ed3349fbb425098a6da8f771d3a457a4a76842bea20674d0601fb993a057d3c053c12d17b2a67e7afa099bff71a919 SHA512 a219bd0ae70dab6ecc313a52fcfb3434097e7e18bf9ab0ebefde61934f9e7178b39918100060c4c3b4e6f123f9cd5616bcc75db59c4c37ce56c78c9bf4e204d8
+EBUILD libapreq2-2.16.ebuild 1682 BLAKE2B f6b62f2734d71882d90254961079b47a61c36fd085f66d3d6fc19d1a0d39b18fc183cb193470d01b73588339c634565a5ab775b69a3f61501c89da7faefaeb6d SHA512 1a7211f516136cdce1cbcaa4d19b8fea95ab368021ff5d0a8ccfc3536d43b69e133eb41675f5197d1657575b927aec1d9e817a8c119468cb86d64bd213181fa2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/libapreq2/libapreq2-2.15-r1.ebuild b/www-apache/libapreq2/libapreq2-2.15-r1.ebuild
index fa4bb408b239..027983ac1849 100644
--- a/www-apache/libapreq2/libapreq2-2.15-r1.ebuild
+++ b/www-apache/libapreq2/libapreq2-2.15-r1.ebuild
@@ -18,7 +18,6 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	|| (
 		dev-libs/apr-util[openssl]
-		dev-libs/apr-util[libressl]
 		dev-libs/apr-util[nss]
 	)
 	perl? (
diff --git a/www-apache/libapreq2/libapreq2-2.16.ebuild b/www-apache/libapreq2/libapreq2-2.16.ebuild
index cf4d3ef38e4f..4963079f25bf 100644
--- a/www-apache/libapreq2/libapreq2-2.16.ebuild
+++ b/www-apache/libapreq2/libapreq2-2.16.ebuild
@@ -18,7 +18,6 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	|| (
 		dev-libs/apr-util[openssl]
-		dev-libs/apr-util[libressl]
 		dev-libs/apr-util[nss]
 	)
 	perl? (
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index 772833495cc6..1ddcfc3538db 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -4,5 +4,5 @@ DIST mod_qos-11.65.tar.gz 1247087 BLAKE2B 145af39814f974855520415c3bf114aa11ac90
 DIST mod_qos-11.66.tar.gz 1247819 BLAKE2B a835722363a816637411b434eba60bc91f04fe48efd1dd5a3b63f046feb2fb60d776a64d0a4e889c8f827f6a3002fa731743d079b5f3ebd3bde3edf2023c983c SHA512 19541c72d72cd9c4f055f6c0908e1ddbfa0b27f33e13edbecf9abcf61c2fe334ef797e3ad44c7d8343d5d2df714744b4f1a3f0f96a6de02ff7d7999385393db6
 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
+EBUILD mod_qos-11.66.ebuild 1142 BLAKE2B 8b9f5e9626719ec8390b401df2b9f17a00231cad9135c5a107f9e965a24f6823c60d99faec0a6dcaecd18a957ac1930078f9937d3694fa66edede3fd960e34ca SHA512 aea1e1ffaddbb25679e7815e1ad48f76cc8ab59606c20beaf8dcfe54640c9a939f2dd864550911d0257554ad39f529fa9a09bead62e2ab04d029fefc8fbe9887
 MISC metadata.xml 325 BLAKE2B 322d2ee01e15bccbfc982530d0d51a66646a30d3c937d514dd5967ad5501325ecb6d2ead18b63f6255532fbcd80208b29fa325d90cfe8d65414fa7013c2af7e0 SHA512 392b5e28cca1b7b253349524117b22242a465f5413ed06ad844f51873f0c8b2c1d90d6b6b79c7dd6ebc2004be5d0b1757cd24ddcfb56ee12d0e1be325a460be5
diff --git a/www-apache/mod_qos/mod_qos-11.66.ebuild b/www-apache/mod_qos/mod_qos-11.66.ebuild
index 32b1e831b2e3..412c8e3c8eb5 100644
--- a/www-apache/mod_qos/mod_qos-11.66.ebuild
+++ b/www-apache/mod_qos/mod_qos-11.66.ebuild
@@ -12,12 +12,10 @@ SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
 
 RDEPEND="
 	dev-libs/libpcre:3
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	media-libs/libpng:0=
 	sys-libs/zlib:0=
 "