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: net-libs/liboauth/
Date: Thu, 14 Sep 2023 03:55:24 +0000 (UTC)	[thread overview]
Message-ID: <1694663708.20c656742979f17385161643e03e9d7a64d3d72d.sam@gentoo> (raw)

commit:     20c656742979f17385161643e03e9d7a64d3d72d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 14 03:53:11 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 03:55:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20c65674

net-libs/liboauth: adapt to curl dropping NSS support

Upstream recommended NSS in the past for licencing reasons but w/ OpenSSL 3 that's
no longer a problem, plus curl >= 8.3 doesn't support NSS anymore.

* In stable (r1->r2), just adapt in the naive way wrt USE dep default on curl
now the flag is gone for NSS.

*
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{liboauth-1.0.3-r1.ebuild => liboauth-1.0.3-r2.ebuild}   |  2 +-
 .../{liboauth-1.0.3-r1.ebuild => liboauth-1.0.3-r3.ebuild}   | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild b/net-libs/liboauth/liboauth-1.0.3-r2.ebuild
similarity index 97%
copy from net-libs/liboauth/liboauth-1.0.3-r1.ebuild
copy to net-libs/liboauth/liboauth-1.0.3-r2.ebuild
index 6a60bfa23920..5e47ba416dae 100644
--- a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.3-r2.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	nss? (
 		dev-libs/nss
 		curl? ( || (
-			net-misc/curl[ssl,curl_ssl_nss]
+			net-misc/curl[ssl,curl_ssl_nss(-)]
 			net-misc/curl[-ssl]
 		) )
 	)

diff --git a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild b/net-libs/liboauth/liboauth-1.0.3-r3.ebuild
similarity index 75%
rename from net-libs/liboauth/liboauth-1.0.3-r1.ebuild
rename to net-libs/liboauth/liboauth-1.0.3-r3.ebuild
index 6a60bfa23920..a1ed30b8023b 100644
--- a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.3-r3.ebuild
@@ -9,9 +9,10 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 MIT )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
-# Upstream recommend NSS by default for licencing reasons (may change w/ openssl 3?)
-IUSE="bindist curl doc +nss"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+# Upstream recommended NSS in the past for licencing reasons but w/ OpenSSL 3 that's
+# no longer a problem, plus curl >= 8.3 doesn't support NSS anymore.
+IUSE="bindist curl doc nss"
 REQUIRED_USE="bindist? ( nss )"
 
 PATCHES=(
@@ -20,17 +21,18 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.3-openssl-1.1_2.patch
 )
 
+# TODO: Drop curl + nss support entirely given it doesn't make sense anymore
 RDEPEND="
 	curl? ( net-misc/curl )
 	nss? (
 		dev-libs/nss
 		curl? ( || (
-			net-misc/curl[ssl,curl_ssl_nss]
+			net-misc/curl[ssl,curl_ssl_nss(-)]
 			net-misc/curl[-ssl]
 		) )
 	)
 	!nss? (
-		dev-libs/openssl:=
+		>=dev-libs/openssl-3:=
 		curl? ( || (
 			net-misc/curl[ssl,curl_ssl_openssl]
 			net-misc/curl[-ssl]


             reply	other threads:[~2023-09-14  3:55 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-14  3:55 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-16 18:30 [gentoo-commits] repo/gentoo:master commit in: net-libs/liboauth/ Andreas K. Hüttel
2024-09-15 17:16 Petr Vaněk
2023-12-29 22:43 Sam James
2023-12-29 22:43 Sam James
2023-12-29 21:41 Sam James
2023-12-29 19:22 Arthur Zamarin
2023-12-29 18:08 Arthur Zamarin
2023-11-25  5:46 Sam James
2023-07-27  5:46 WANG Xuerui
2023-05-27 10:47 Sam James
2022-01-27  9:30 David Seifert
2021-05-02 10:16 Mikle Kolyada
2019-05-22 21:20 Aaron Bauman
2019-05-04  9:50 Pacho Ramos
2019-05-03 20:30 Sergei Trofimovich
2019-05-02 22:11 Mikle Kolyada
2019-05-02 22:11 Mikle Kolyada
2019-04-01 20:14 Pacho Ramos
2019-04-01 19:58 Thomas Deutschmann
2019-03-25 22:18 Sergei Trofimovich
2019-03-24 20:25 Sergei Trofimovich
2019-03-24 20:12 Sergei Trofimovich
2019-03-24 19:44 Sergei Trofimovich
2019-03-06 19:13 Aaron Bauman
2017-06-27 15:48 Alexis Ballier
2017-03-18  7:45 Michael Palimaka
2017-01-31 14:40 Jeroen Roovers
2017-01-08 18:21 Markus Meier
2016-11-27 18:31 Pacho Ramos
2016-11-27 17:51 Tobias Klausmann
2016-11-09  8:59 Pacho Ramos
2016-11-09  8:59 Pacho Ramos

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=1694663708.20c656742979f17385161643e03e9d7a64d3d72d.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