From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 01D8B15806E for ; Sat, 27 May 2023 10:47:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D925E0636; Sat, 27 May 2023 10:47:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 233E8E0636 for ; Sat, 27 May 2023 10:47:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E2D133BEF8 for ; Sat, 27 May 2023 10:47:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DFA06A6C for ; Sat, 27 May 2023 10:47:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1685184400.ebd88795c44b57f91049e1ff745a0b6682422cef.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/liboauth/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/liboauth/liboauth-1.0.3-r1.ebuild X-VCS-Directories: net-libs/liboauth/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ebd88795c44b57f91049e1ff745a0b6682422cef X-VCS-Branch: master Date: Sat, 27 May 2023 10:47:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 363a6ec5-d3a7-4cec-8d37-36a6ba89fa34 X-Archives-Hash: a62032265f7ef9ae1ea78210e7af2717 commit: ebd88795c44b57f91049e1ff745a0b6682422cef Author: Sam James gentoo org> AuthorDate: Sat May 27 10:42:55 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat May 27 10:46:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd88795 net-libs/liboauth: modernise Signed-off-by: Sam James gentoo.org> net-libs/liboauth/liboauth-1.0.3-r1.ebuild | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild index f0475e3b43d8..911945ae3847 100644 --- a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild +++ b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz" LICENSE="|| ( GPL-2 MIT )" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 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" - REQUIRED_USE="bindist? ( nss )" PATCHES=( @@ -20,36 +20,34 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0.3-openssl-1.1_2.patch ) -CDEPEND=" +RDEPEND=" curl? ( net-misc/curl ) - nss? ( dev-libs/nss + nss? ( + dev-libs/nss curl? ( || ( net-misc/curl[ssl,curl_ssl_nss] net-misc/curl[-ssl] ) ) ) !nss? ( - dev-libs/openssl:0= + dev-libs/openssl:= curl? ( || ( net-misc/curl[ssl,curl_ssl_openssl] net-misc/curl[-ssl] ) ) ) " - -RDEPEND="${CDEPEND}" - -DEPEND=" - ${CDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz media-fonts/freefont ) " -BDEPEND=" - virtual/pkgconfig -" + +DOCS=( AUTHORS ChangeLog LICENSE.OpenSSL README ) src_configure() { local myeconfargs=( @@ -71,8 +69,6 @@ src_compile() { fi } -DOCS=( AUTHORS ChangeLog LICENSE.OpenSSL README ) - src_install() { use doc && HTML_DOCS=( doc/html/. ) default