| 1 |
commit: c2bee47c146acccd2e6fa0f708a986f2cb63f17d |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 1 17:50:43 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 1 18:06:48 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2bee47c |
| 7 |
|
| 8 |
media-sound/umurmur: drop obsolete LibreSSL support |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
media-sound/umurmur/umurmur-0.2.17-r4.ebuild | 14 +++++--------- |
| 14 |
media-sound/umurmur/umurmur-0.2.19.ebuild | 7 ++----- |
| 15 |
media-sound/umurmur/umurmur-0.2.20.ebuild | 2 +- |
| 16 |
media-sound/umurmur/umurmur-9999.ebuild | 2 +- |
| 17 |
4 files changed, 9 insertions(+), 16 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild |
| 20 |
index 5f27975b77c..a840c65de76 100644 |
| 21 |
--- a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild |
| 22 |
+++ b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild |
| 23 |
@@ -16,9 +16,9 @@ else |
| 24 |
fi |
| 25 |
LICENSE="BSD" |
| 26 |
SLOT="0" |
| 27 |
-IUSE="gnutls libressl mbedtls shm" |
| 28 |
+IUSE="gnutls mbedtls shm" |
| 29 |
|
| 30 |
-# ssl-provider precendence: gnutls, mbedtls, libressl |
| 31 |
+# ssl-provider precendence: gnutls, mbedtls |
| 32 |
# and openssl if none specified |
| 33 |
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:= |
| 34 |
dev-libs/libconfig:= |
| 35 |
@@ -28,10 +28,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:= |
| 36 |
) |
| 37 |
!gnutls? ( |
| 38 |
mbedtls? ( net-libs/mbedtls:= ) |
| 39 |
- !mbedtls? ( |
| 40 |
- libressl? ( dev-libs/libressl:0= ) |
| 41 |
- !libressl? ( dev-libs/openssl:0= ) |
| 42 |
- ) |
| 43 |
+ !mbedtls? ( dev-libs/openssl:0= ) |
| 44 |
) |
| 45 |
" |
| 46 |
|
| 47 |
@@ -52,9 +49,8 @@ get_ssl_impl() { |
| 48 |
|
| 49 |
use gnutls && ssl_provider+=( gnutls ) |
| 50 |
use mbedtls && ssl_provider+=( mbedtls ) |
| 51 |
- use libressl && ssl_provider+=( libressl ) |
| 52 |
|
| 53 |
- if ! use gnutls && ! use mbedtls && ! use libressl ; then |
| 54 |
+ if ! use gnutls && ! use mbedtls; then |
| 55 |
ssl_provider+=( openssl ) |
| 56 |
fi |
| 57 |
echo ${ssl_provider[@]} |
| 58 |
@@ -75,7 +71,7 @@ src_prepare() { |
| 59 |
} |
| 60 |
|
| 61 |
src_configure() { |
| 62 |
- local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) ) |
| 63 |
+ local ssl_provider=( $(get_ssl_impl) ) |
| 64 |
|
| 65 |
local myeconfargs=( |
| 66 |
--with-ssl="${ssl_provider[@]}" |
| 67 |
|
| 68 |
diff --git a/media-sound/umurmur/umurmur-0.2.19.ebuild b/media-sound/umurmur/umurmur-0.2.19.ebuild |
| 69 |
index 5bc252e176b..ca21485b1db 100644 |
| 70 |
--- a/media-sound/umurmur/umurmur-0.2.19.ebuild |
| 71 |
+++ b/media-sound/umurmur/umurmur-0.2.19.ebuild |
| 72 |
@@ -16,7 +16,7 @@ else |
| 73 |
fi |
| 74 |
LICENSE="BSD" |
| 75 |
SLOT="0" |
| 76 |
-IUSE="gnutls libressl mbedtls shm" |
| 77 |
+IUSE="gnutls mbedtls shm" |
| 78 |
|
| 79 |
# ssl-provider precendence: gnutls, mbedtls and openssl if none specified |
| 80 |
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:= |
| 81 |
@@ -27,10 +27,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:= |
| 82 |
) |
| 83 |
!gnutls? ( |
| 84 |
mbedtls? ( net-libs/mbedtls:= ) |
| 85 |
- !mbedtls? ( |
| 86 |
- libressl? ( dev-libs/libressl:0= ) |
| 87 |
- !libressl? ( dev-libs/openssl:0= ) |
| 88 |
- ) |
| 89 |
+ !mbedtls? ( dev-libs/openssl:0= ) |
| 90 |
) |
| 91 |
" |
| 92 |
|
| 93 |
|
| 94 |
diff --git a/media-sound/umurmur/umurmur-0.2.20.ebuild b/media-sound/umurmur/umurmur-0.2.20.ebuild |
| 95 |
index 7b9bed7d269..ca21485b1db 100644 |
| 96 |
--- a/media-sound/umurmur/umurmur-0.2.20.ebuild |
| 97 |
+++ b/media-sound/umurmur/umurmur-0.2.20.ebuild |
| 98 |
@@ -16,7 +16,7 @@ else |
| 99 |
fi |
| 100 |
LICENSE="BSD" |
| 101 |
SLOT="0" |
| 102 |
-IUSE="gnutls libressl mbedtls shm" |
| 103 |
+IUSE="gnutls mbedtls shm" |
| 104 |
|
| 105 |
# ssl-provider precendence: gnutls, mbedtls and openssl if none specified |
| 106 |
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:= |
| 107 |
|
| 108 |
diff --git a/media-sound/umurmur/umurmur-9999.ebuild b/media-sound/umurmur/umurmur-9999.ebuild |
| 109 |
index 7b9bed7d269..ca21485b1db 100644 |
| 110 |
--- a/media-sound/umurmur/umurmur-9999.ebuild |
| 111 |
+++ b/media-sound/umurmur/umurmur-9999.ebuild |
| 112 |
@@ -16,7 +16,7 @@ else |
| 113 |
fi |
| 114 |
LICENSE="BSD" |
| 115 |
SLOT="0" |
| 116 |
-IUSE="gnutls libressl mbedtls shm" |
| 117 |
+IUSE="gnutls mbedtls shm" |
| 118 |
|
| 119 |
# ssl-provider precendence: gnutls, mbedtls and openssl if none specified |
| 120 |
DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:= |
Archives