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]
