gentoo resync : 27.03.2021

3 files changed, 9 insertions, 17 deletions

diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index e01327f00fe6..e8e72cb9e170 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -3,10 +3,10 @@ AUX umurmurd.confd 64 BLAKE2B d98d616da50acabd055333c36699ab0dd060193fc450752837
 AUX umurmurd.initd 458 BLAKE2B e1f8dc704fa6237edfcfbb936e9d1c679e0f1a57ec862ec7215c3f263de0582baf70a0b822a1712c2423d753dda9e2602ff404d11f2f0d02df02116cdfb3729d SHA512 d60c700bf0bb54c904faff658e09dc37a6cd79edb69e4aa54f46872f474c8f673a91ebe022a47dc0d6b4f624a86f70be99f661a1e80a672b04dff6af3328b28d
 AUX umurmurd.service 363 BLAKE2B 373b02c3d2d9f80e3b1a44dc98032f68310e8c5b82682efc1001cf130bef21f6f925f4b535d0d02209617c92b4d4a3dad4a7b459c8dbbcf6f97b050bab933de0 SHA512 3366dc2b35623daf4704e30bc6207cf795e31cb4c9cd0c7e19f64fa9d92da772fcc309e5799261b6c07c95cfeacd2d9b898ec4a4be7b5acc46efda7a98308913
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
-DIST umurmur-0.2.18.tar.gz 93039 BLAKE2B 45a6e247dee604861e70698350b7b0ee28fd7ee82a94f684eae8ff5ab7daa0c3446b32c4aa28b39e64588944b8b81c4e2a11db79d0bde9e4a2012e67b4125be2 SHA512 bd1cd7149684dbe42b9804c9a5539cdb2becf6b721d74bd88d154e9037d3289ab57ee816c0592a0167ddd302da68d94017c86deb96348d272ec9bd21e9628656
 DIST umurmur-0.2.19.tar.gz 93117 BLAKE2B 54d6fe6e67f51f24d6c9f0125fa330292004cd5df71791c40ece6aa7c2938bce98ca981e873a1e2b43598f99ea57c687963fd7cd8708400f5f2ce00ab11386eb SHA512 4a10c41d8396d6bd2b195578ff6a29e69a105f8830daf85141217f768cc2c4ea6204a2b3b65599d07d76c841090750db4ad6264c4e9d7e5afa7f1b4cf27bc768
+DIST umurmur-0.2.20.tar.gz 93152 BLAKE2B 7850d0f3a5c35db1f5ed2b2eea7725d288901eb7e49b9bf2f715963a102c6c6345ed90fd066d80a2666137918c73a58dd2c954321b69d0ce59f686e1c6d01e5a SHA512 0913f5ba84b30fec4ae6a1521c442ff8c48121bbbca5de9082e04e41b36434fadb5f81cb2ea0bd0a8c63f6e541d15eeda3637667d8cc7113d38935ded320cef4
 EBUILD umurmur-0.2.17-r4.ebuild 2631 BLAKE2B d5ee8f085fcdc6721821fd8cdcc09170d4643779543e3b19645fe0b350ee351a2890bfc15e95518442d600ccf4c8426d5daa841ce55cf95993cab6f8d59759c7 SHA512 a4fd25d49c4d53d58d9ef17db266d428648d9cd77f9c5aeca1f4c857f90c5c975895401bf0b77eb6addc18cdb1073f994bce4ee816b5b2646c9279580d22c123
-EBUILD umurmur-0.2.18.ebuild 2634 BLAKE2B 439488afcd30893130a98e21e63ce862ce8c620cc284056fcbc8475657b4a104b6a3658d82b1f085557e568a3e40269779ff827905bcc866ca38b94245c45e18 SHA512 437aa84ae793e82073cb038a206ea19eaaef3749b8c4bf9c78b3db7bee8f9b55329224263f5456cf65c451c69bc23a69fb3cbf94c977f0587651f5350a5b7b27
 EBUILD umurmur-0.2.19.ebuild 2527 BLAKE2B f38babbe818b6b5d5a1c856d4ccf70b4f8d86f3abbd2c517351486c726456cebe197fda69a34f414eff407da4bf47e1ca524a3f0dae7328e9dedf83e5bc403c5 SHA512 2aa0eea1635dd225fe9b00cc263674c39ace325e05010f1dd6d8055600a482333ed379e5d524268043ec58606bbe974b3c682e36f41ef72e9370f8e6e098759c
-EBUILD umurmur-9999.ebuild 2527 BLAKE2B f38babbe818b6b5d5a1c856d4ccf70b4f8d86f3abbd2c517351486c726456cebe197fda69a34f414eff407da4bf47e1ca524a3f0dae7328e9dedf83e5bc403c5 SHA512 2aa0eea1635dd225fe9b00cc263674c39ace325e05010f1dd6d8055600a482333ed379e5d524268043ec58606bbe974b3c682e36f41ef72e9370f8e6e098759c
+EBUILD umurmur-0.2.20.ebuild 2469 BLAKE2B dc72a7c10f35247247dcf0266ccd879283a82ee0f0027e5ba36ff6eb0d8e04f77cbbb1e6be3a1c50f69b2b7905856eccfbdb63e028385a3d6a692c0ed1dbdc09 SHA512 7d25262e17974df36e6c9de02eabfefc3b722013ef2c6d5a1f38e8169267bde6c183ac98824143e7ea91b4bb2dcf85d946443dc2dc0212a057416c6d8c40a2b3
+EBUILD umurmur-9999.ebuild 2469 BLAKE2B dc72a7c10f35247247dcf0266ccd879283a82ee0f0027e5ba36ff6eb0d8e04f77cbbb1e6be3a1c50f69b2b7905856eccfbdb63e028385a3d6a692c0ed1dbdc09 SHA512 7d25262e17974df36e6c9de02eabfefc3b722013ef2c6d5a1f38e8169267bde6c183ac98824143e7ea91b4bb2dcf85d946443dc2dc0212a057416c6d8c40a2b3
 MISC metadata.xml 1091 BLAKE2B fc7db1a6e1f3d32e9e579a8ba870b1d0322042cc2e9b723d0dcc120a4a714cb9d3a9e2e5da51e73c7d45e41976ae13b6566aaf0da856e0ef692d997f2ddf17bb SHA512 3e45f70e658253e9eb2fda16e3c054c0a670083142cb699247f47aac208ae67249fa66588a07730588e0ce64677a90e77dcd7015eb9d5478aef8b70933855831
diff --git a/media-sound/umurmur/umurmur-0.2.18.ebuild b/media-sound/umurmur/umurmur-0.2.20.ebuild
index 2eaae13bc97a..7b9bed7d2694 100644
--- a/media-sound/umurmur/umurmur-0.2.18.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.20.ebuild
@@ -18,8 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="gnutls libressl mbedtls shm"
 
-# ssl-provider precendence: gnutls, mbedtls, libressl
-# and openssl if none specified
+# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
 	dev-libs/libconfig:=
 	gnutls? (
@@ -28,10 +27,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
 	)
 	!gnutls? (
 		mbedtls? ( net-libs/mbedtls:= )
-		!mbedtls? (
-			libressl? ( dev-libs/libressl:0= )
-			!libressl? ( dev-libs/openssl:0= )
-		)
+		!mbedtls? ( dev-libs/openssl:0= )
 	)
 "
 
@@ -52,9 +48,8 @@ get_ssl_impl() {
 
 	use gnutls && ssl_provider+=( gnutls )
 	use mbedtls && ssl_provider+=( mbedtls )
-	use libressl && ssl_provider+=( libressl )
 
-	if ! use gnutls && ! use mbedtls && ! use libressl ; then
+	if ! use gnutls && ! use mbedtls ; then
 		ssl_provider+=( openssl )
 	fi
 	echo ${ssl_provider[@]}
@@ -75,10 +70,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
+	local ssl_provider=( $(get_ssl_impl) )
 
 	local myeconfargs=(
-		--with-ssl="${ssl_provider[@]}"
+		--with-ssl="${ssl_provider[0]}"
 		$(use_enable shm shmapi)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/media-sound/umurmur/umurmur-9999.ebuild b/media-sound/umurmur/umurmur-9999.ebuild
index 5bc252e176bb..7b9bed7d2694 100644
--- a/media-sound/umurmur/umurmur-9999.ebuild
+++ b/media-sound/umurmur/umurmur-9999.ebuild
@@ -27,10 +27,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
 	)
 	!gnutls? (
 		mbedtls? ( net-libs/mbedtls:= )
-		!mbedtls? (
-			libressl? ( dev-libs/libressl:0= )
-			!libressl? ( dev-libs/openssl:0= )
-		)
+		!mbedtls? ( dev-libs/openssl:0= )
 	)
 "