public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/
Date: Sat,  1 May 2021 18:07:13 +0000 (UTC)	[thread overview]
Message-ID: <1619892408.c2bee47c146acccd2e6fa0f708a986f2cb63f17d.sam@gentoo> (raw)

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:=


             reply	other threads:[~2021-05-01 18:07 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-01 18:07 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-03-26  9:31 [gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/ Lars Wendler
2021-03-26  9:31 Lars Wendler
2021-03-26  9:31 Lars Wendler
2021-01-29 10:51 Lars Wendler
2021-01-29 10:51 Lars Wendler
2021-01-05 15:20 Lars Wendler
2021-01-05 15:20 Lars Wendler
2021-01-02  1:43 Sam James
2021-01-02  0:35 Sam James
2020-12-29 14:19 Lars Wendler
2020-01-10 11:34 Lars Wendler
2019-10-17 12:14 Lars Wendler
2019-10-17 11:43 Agostino Sarubbo
2019-10-17 10:32 Agostino Sarubbo
2019-08-13 16:40 Lars Wendler
2019-08-13 16:40 Lars Wendler
2019-06-26 22:08 Lars Wendler
2019-04-30 16:08 Lars Wendler
2019-04-29 16:06 Lars Wendler
2019-04-29 16:06 Lars Wendler
2019-01-19 11:57 Jonas Stein
2018-03-16 22:50 Lars Wendler
2017-06-09 16:47 Lars Wendler
2017-05-19  8:26 Lars Wendler
2017-03-01 15:34 Lars Wendler
2017-02-28 21:07 Michael Weber
2016-08-06 14:36 Lars Wendler
2015-10-01  7:53 Lars Wendler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1619892408.c2bee47c146acccd2e6fa0f708a986f2cb63f17d.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox