Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/
Date: Fri, 29 Jan 2021 10:51:22
Message-Id: 1611917477.19367ed187244119173c6f847d1a87754227951e.polynomial-c@gentoo
1 commit: 19367ed187244119173c6f847d1a87754227951e
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 29 10:51:10 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 29 10:51:17 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19367ed1
7
8 media-sound/umurmur: Synced live ebuild
9
10 Package-Manager: Portage-3.0.14, Repoman-3.0.2
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 media-sound/umurmur/umurmur-9999.ebuild | 10 ++++------
14 1 file changed, 4 insertions(+), 6 deletions(-)
15
16 diff --git a/media-sound/umurmur/umurmur-9999.ebuild b/media-sound/umurmur/umurmur-9999.ebuild
17 index 2eaae13bc97..5bc252e176b 100644
18 --- a/media-sound/umurmur/umurmur-9999.ebuild
19 +++ b/media-sound/umurmur/umurmur-9999.ebuild
20 @@ -18,8 +18,7 @@ LICENSE="BSD"
21 SLOT="0"
22 IUSE="gnutls libressl mbedtls shm"
23
24 -# ssl-provider precendence: gnutls, mbedtls, libressl
25 -# and openssl if none specified
26 +# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
27 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
28 dev-libs/libconfig:=
29 gnutls? (
30 @@ -52,9 +51,8 @@ get_ssl_impl() {
31
32 use gnutls && ssl_provider+=( gnutls )
33 use mbedtls && ssl_provider+=( mbedtls )
34 - use libressl && ssl_provider+=( libressl )
35
36 - if ! use gnutls && ! use mbedtls && ! use libressl ; then
37 + if ! use gnutls && ! use mbedtls ; then
38 ssl_provider+=( openssl )
39 fi
40 echo ${ssl_provider[@]}
41 @@ -75,10 +73,10 @@ src_prepare() {
42 }
43
44 src_configure() {
45 - local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
46 + local ssl_provider=( $(get_ssl_impl) )
47
48 local myeconfargs=(
49 - --with-ssl="${ssl_provider[@]}"
50 + --with-ssl="${ssl_provider[0]}"
51 $(use_enable shm shmapi)
52 )
53 econf "${myeconfargs[@]}"