commit: c2bee47c146acccd2e6fa0f708a986f2cb63f17d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 1 17:50:43 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 1 18:06:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2bee47c
media-sound/umurmur: drop obsolete LibreSSL support
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/umurmur/umurmur-0.2.17-r4.ebuild | 14 +++++---------
media-sound/umurmur/umurmur-0.2.19.ebuild | 7 ++-----
media-sound/umurmur/umurmur-0.2.20.ebuild | 2 +-
media-sound/umurmur/umurmur-9999.ebuild | 2 +-
4 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
index 5f27975b77c..a840c65de76 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
@@ -16,9 +16,9 @@ else
fi
LICENSE="BSD"
SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
+IUSE="gnutls mbedtls shm"
-# ssl-provider precendence: gnutls, mbedtls, libressl
+# ssl-provider precendence: gnutls, mbedtls
# and openssl if none specified
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
dev-libs/libconfig:=
@@ -28,10 +28,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 +49,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,7 +71,7 @@ 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[@]}"
diff --git a/media-sound/umurmur/umurmur-0.2.19.ebuild
b/media-sound/umurmur/umurmur-0.2.19.ebuild
index 5bc252e176b..ca21485b1db 100644
--- a/media-sound/umurmur/umurmur-0.2.19.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.19.ebuild
@@ -16,7 +16,7 @@ else
fi
LICENSE="BSD"
SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
+IUSE="gnutls mbedtls shm"
# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
@@ -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= )
)
"
diff --git a/media-sound/umurmur/umurmur-0.2.20.ebuild
b/media-sound/umurmur/umurmur-0.2.20.ebuild
index 7b9bed7d269..ca21485b1db 100644
--- a/media-sound/umurmur/umurmur-0.2.20.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.20.ebuild
@@ -16,7 +16,7 @@ else
fi
LICENSE="BSD"
SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
+IUSE="gnutls mbedtls shm"
# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
diff --git a/media-sound/umurmur/umurmur-9999.ebuild
b/media-sound/umurmur/umurmur-9999.ebuild
index 7b9bed7d269..ca21485b1db 100644
--- a/media-sound/umurmur/umurmur-9999.ebuild
+++ b/media-sound/umurmur/umurmur-9999.ebuild
@@ -16,7 +16,7 @@ else
fi
LICENSE="BSD"
SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
+IUSE="gnutls mbedtls shm"
# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
