gentoo resync : 04.05.2021

8 files changed, 26 insertions, 39 deletions

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index b492ccb4ba2b..42b0af2c66d5 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -15,10 +15,10 @@ DIST rsyslog-doc-8.2010.0.tar.gz 8428326 BLAKE2B ee8eb2bdbb1f6c7122559b63ddc1ae6
 DIST rsyslog-doc-8.2012.0.tar.gz 6417145 BLAKE2B d8377f40b0311e8e7dcca274c251c0de7706490e3048c8d69d479120e06ca1e0b3ec9fce0a04928984d440da3aef196965f8c1b45afe8931c893b4baa72f4e87 SHA512 5647f499230276066abced34c2ca352268ba24fbd00cb7b5e3d0a2494977dd6f781cf8d1e7c7a9210d23c451ff162acda81ee93afa3f8f08fd555123e9daeece
 DIST rsyslog-doc-8.2102.0.tar.gz 6419104 BLAKE2B 134c7ccde6f7435b35840fa37f5774223ac1ebd7dc10db961900a7b1600483156518433c7f70d0981e96ea750e1916ab53e346abacf58066bf141e85c719ae00 SHA512 a5dc4fb9bd8892fac693c5692b926c8d7d9fa36667d6b4c6eccba750713af88d4317f6232efc2a16de38c2e58c4a8bc4d04c9ebb2e7ebc3b0878d53eef20dd2e
 DIST rsyslog-doc-8.2104.0.tar.gz 6451275 BLAKE2B cb8a38b28caec17babd190e463070b862071a75c4c63a7208e56f039f84ae7a5c6045112697c61635d328e56d9427f692e67a9d6fefc94b59ad28481210f1481 SHA512 6c898fa606190c5cf214822503f060b1692cd907731858736a395511b66d7b0d1cf6dfcc90c4cecbe21b099197ae2187db53d719f44f85f26a1bd34971539d36
-EBUILD rsyslog-8.2008.0.ebuild 12538 BLAKE2B 24a92fd62ec2254ee00e5b47afca9a1460254e860e0545c3b9db01cb6f951e06145f79ee158244a94184e8a8192099d5dafa5f9ef9ebabcbe09b806aa5b940af SHA512 2d6a9a7c7bcc4ef1b51f7233d24dc08b9ddb1e22e4dc94783c612a9ed864d0fd29a05c3642679807a0c48567b0a2d6f0babf4f4555dfb3ad37e79980ebf5b6f0
-EBUILD rsyslog-8.2010.0.ebuild 12889 BLAKE2B eb56b396c1613b38355971a2251b6b341160f4e806c2235469efa49d9b52d40cc9dee89d3ed0ba4c1c657431617fc2d510afffefee9a45610767f947fa796c37 SHA512 ff532d1e9e1b203be3aaf0fea0fbfca4e6ea5d2fb29f883f309d92f4605b19529abe957b1ad2d624c4f9b80fbd890bfee578f4ff7771a309906352b918c7a978
-EBUILD rsyslog-8.2012.0-r1.ebuild 12949 BLAKE2B 5043b13319455f26430a85c8bccf427bc59ffbc20739f39127de55afe72542903ebd108de75939bef1099203cad75aad836e96fc3e954a7b90867820be3bcb90 SHA512 1e772f0e010e9247993b1a22f0ea8360e269146cd6581ac6b73513431f23c292bedf09ab832e85ea9a00db1cc077a36499af8061a40dec172059453655173240
-EBUILD rsyslog-8.2012.0.ebuild 12889 BLAKE2B eb56b396c1613b38355971a2251b6b341160f4e806c2235469efa49d9b52d40cc9dee89d3ed0ba4c1c657431617fc2d510afffefee9a45610767f947fa796c37 SHA512 ff532d1e9e1b203be3aaf0fea0fbfca4e6ea5d2fb29f883f309d92f4605b19529abe957b1ad2d624c4f9b80fbd890bfee578f4ff7771a309906352b918c7a978
-EBUILD rsyslog-8.2102.0.ebuild 12947 BLAKE2B fbdf1798b6bfd8a252f3b13a1f1cecaef1db3ab1f0fc1e72771a26ca469efb989bb8faffa64b76a0b079333d897ab1d11bdd3c05ee4a20eb9d202820a94bd39d SHA512 a877b9bd66bd18782851ccf85925ec052d9d55c8e1d2623af411378f38e0615191f8944832e36df989a15f8d8833f0c1b5e20b7bb885f99bba89e441797f2c90
-EBUILD rsyslog-8.2104.0.ebuild 12981 BLAKE2B 8950958ca4f79c46c8c6adb5bbe76a6d53794e90156479d24ca7ba17a1f3912e71d54cd19e5cb566b8dc8e0d7a8b8de34eae0d6788259655fbc230f484eee519 SHA512 f18ad974f9be0617342f7b385e3f6919faab027dba8c3a0800a0fc676aa2c34f5ed8d944a962acd8d8e45ff013219d6ae3e88c87a16397840bc09a0e8f2a3fc4
-MISC metadata.xml 4070 BLAKE2B 3fde04df2bf0b93058d14787780f7f78b5014cdaa303101ef0fb637d1f0b165e453885ae307f137d98052719f992cd1a3f46da2f923bc97030ba629801190d5d SHA512 df868d04339eade02eb55b218f43c85c9efe2bf70cadf2ec1d59dc9f0d546ba9dbcd9ac5e3f9cbad05a8f4629ce5979668aba1fb8b027c51c7f8468b2e9b732a
+EBUILD rsyslog-8.2008.0.ebuild 12425 BLAKE2B 15ab2bafbf82cc912f135f96d634e0fe3f525d5171d84a302e8ef97258ac8b9ead00c27ff72120733fa7c5864ff434b1d179cb9404a98bd2aa2f8ec10dcdf938 SHA512 f6f5af2f835a89bfa0fc15a33360b54f668bf5e59aa9e75d5893da2eadf6422494cde151e286c245985d963ba8745e7316f36927776b9593fb8592095eaac900
+EBUILD rsyslog-8.2010.0.ebuild 12776 BLAKE2B 08ebe02ef4addd04ec2f36e5d5553deb0db1c89fb0c56e1b2e2ee01e8607c985c4b32e3afdb74cd03953dcd0749e61c691ec66e8abffd7c42b3c58f2dae9ef72 SHA512 701d0a91be68fc0ee6ce84eccfe58b6113c5f44e10c53e1aef86adb3bb892fee44c97d3be8a6a0c28efb68c9bf6eabed718ee7feb3065f1a3a4e320d94d333b8
+EBUILD rsyslog-8.2012.0-r1.ebuild 12836 BLAKE2B 54cd60b31f9d66a6be4ac468454eb84ba93ff17d0aa197a9f1b4e4236e09086162904a34db59b40369d16975d57211be23464dc7f07709ee31af85818561167c SHA512 4fbadeb0ab42de4a2896e5618f67c15db54309f73ede92d9f49830bc14c0947a439a8e833b9a6f9a4b0089b0c1e1f4076854b1d856ff50d4f45d47ee734d5443
+EBUILD rsyslog-8.2012.0.ebuild 12776 BLAKE2B 08ebe02ef4addd04ec2f36e5d5553deb0db1c89fb0c56e1b2e2ee01e8607c985c4b32e3afdb74cd03953dcd0749e61c691ec66e8abffd7c42b3c58f2dae9ef72 SHA512 701d0a91be68fc0ee6ce84eccfe58b6113c5f44e10c53e1aef86adb3bb892fee44c97d3be8a6a0c28efb68c9bf6eabed718ee7feb3065f1a3a4e320d94d333b8
+EBUILD rsyslog-8.2102.0.ebuild 12834 BLAKE2B 600f7e571aec90717770b4200607f430bea6e830ccb9b26495a64575cc0ac664dfaa1394c5895beae8e69a7152e6b97f4b038559a969a09a94a2a07320572ba2 SHA512 8e0ad535b2d8d0991e5165a9829af81b6870651346d2929a9aae8c6398e7e0684847c0a68c26ddff3817f06a3af827c98e5e749ff19bd71ef3c2146f8d870397
+EBUILD rsyslog-8.2104.0.ebuild 12868 BLAKE2B 5da76dd6fc4e5f74b8fba99aeed95fcff313c9ddf1893b459eca2ccff4396b58822dd3402b96ad56f705ba47a6072294e887eef9eb701a3e33070a0da7a08c74 SHA512 7e2e0a905548bec785bf86198ca6822528209e9f4faa51599ebaeb472d9ad78b847bf983ddbedc6ae03c1ee2fa85a88eeef8a75843d0a335cb0c30a9c2c0ed71
+MISC metadata.xml 3871 BLAKE2B 33e83d286bb5a62a851dc3ca10e8920071c9c16c9c7f54bde875a97d195e2b0c34615318adfc6d919df7cebd33e053b398267e4159753e597c97551b8ff0fbb7 SHA512 275939880de65c264e14b782169d760a61f0e5d9ae49e3f14861c9ddf5e66c0a78761cebc6c62e2f18426530ac4145bf8b8e71533eb103776be3164127c1b585
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index 8edddd33ee54..a5c7f6b9d28d 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
 		<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
 		<flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag>
-		<flag name="libressl">Use <pkg>dev-libs/libressl</pkg> instead of <pkg>dev-libs/openssl</pkg> (you still need to enable functionality which requires OpenSSL)</flag>
 		<flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag>
 		<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/mongo-c-driver</pkg>)</flag>
 		<flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag>
@@ -31,7 +30,7 @@
 		<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
 		<flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
 		<flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag>
-		<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/libressl</pkg>)</flag>
+		<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg>)</flag>
 		<flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
 		<flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
 		<flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag>
diff --git a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
index 102b62ab8755..b27254f48898 100644
--- a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes mdblookup"
 IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
 IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
 RESTRICT="!test? ( test )"
@@ -58,15 +58,13 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.2.17:= )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
 	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.8y:0=
 	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
 		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
index 5302087c872d..82437e2752e3 100644
--- a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
 
 IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
 IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
 IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
 IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.2.17:= )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
 	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.8y:0=
 	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
 		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
index cd133449943a..e2470ad673f1 100644
--- a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
 
 IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
 IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
 IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
 IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.2.17:= )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
 	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.8y:0=
 	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
 		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
index 5302087c872d..82437e2752e3 100644
--- a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
 
 IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
 IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
 IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
 IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.2.17:= )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
 	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.8y:0=
 	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
 		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2102.0.ebuild b/app-admin/rsyslog/rsyslog-8.2102.0.ebuild
index 657d9410a1c8..02784fa99086 100644
--- a/app-admin/rsyslog/rsyslog-8.2102.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2102.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
 
 IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
 IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
 IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
 IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.2.17:= )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
 	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.8y:0=
 	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
 		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2104.0.ebuild b/app-admin/rsyslog/rsyslog-8.2104.0.ebuild
index 4fd8716916c3..731eb7f499cf 100644
--- a/app-admin/rsyslog/rsyslog-8.2104.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2104.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
 
 IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
 IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
 IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
 IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
 	relp? ( >=dev-libs/librelp-1.2.17:= )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
 	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
+		>=dev-libs/openssl-0.9.8y:0=
 	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
 		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
+			dev-libs/openssl:0=
 		)
 	)
 	systemd? ( >=sys-apps/systemd-234 )