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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F29F9138334 for ; Sat, 27 Apr 2019 20:28:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B29D1E0841; Sat, 27 Apr 2019 20:28:58 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87468E0841 for ; Sat, 27 Apr 2019 20:28:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 06722342A60 for ; Sat, 27 Apr 2019 20:28:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 70D935D1 for ; Sat, 27 Apr 2019 20:28:54 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1556396869.37dc446c5ca493b697603311b3e8d35f47a88e8d.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/librelp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/librelp/librelp-1.2.18.ebuild dev-libs/librelp/librelp-1.3.0.ebuild dev-libs/librelp/librelp-1.4.0.ebuild X-VCS-Directories: dev-libs/librelp/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 37dc446c5ca493b697603311b3e8d35f47a88e8d X-VCS-Branch: master Date: Sat, 27 Apr 2019 20:28:54 +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: 0f97e01a-e345-41f3-adbe-289e489ac263 X-Archives-Hash: 564789a8e73f8979a6a8a15cbdadd37c commit: 37dc446c5ca493b697603311b3e8d35f47a88e8d Author: David Seifert gentoo org> AuthorDate: Sat Apr 27 16:35:03 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Apr 27 20:27:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37dc446c dev-libs/librelp: [QA] Fix USE=libressl semantics Closes: https://bugs.gentoo.org/683992 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: David Seifert gentoo.org> dev-libs/librelp/librelp-1.2.18.ebuild | 21 ++++++--------------- dev-libs/librelp/librelp-1.3.0.ebuild | 19 +++++-------------- dev-libs/librelp/librelp-1.4.0.ebuild | 19 +++++-------------- 3 files changed, 16 insertions(+), 43 deletions(-) diff --git a/dev-libs/librelp/librelp-1.2.18.ebuild b/dev-libs/librelp/librelp-1.2.18.ebuild index bd8997fcf00..fd69546976e 100644 --- a/dev-libs/librelp/librelp-1.2.18.ebuild +++ b/dev-libs/librelp/librelp-1.2.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -16,26 +16,17 @@ SLOT="0/0.4.0" KEYWORDS="amd64 arm ~arm64 hppa sparc x86" IUSE="debug doc +ssl +gnutls libressl openssl static-libs" -REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) ) - gnutls? ( ssl ) - openssl? ( ssl ) - libressl? ( openssl )" +REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )" -RDEPEND="ssl? ( +RDEPEND=" + ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )" - -DEPEND="ssl? ( - gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) - openssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) +DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { @@ -70,6 +61,6 @@ src_install() { default if ! use static-libs; then - find "${ED%/}"/usr/lib* -name '*.la' -delete || die + find "${D}" -name '*.la' -delete || die fi } diff --git a/dev-libs/librelp/librelp-1.3.0.ebuild b/dev-libs/librelp/librelp-1.3.0.ebuild index 17fe8ff33f4..b5359490d5f 100644 --- a/dev-libs/librelp/librelp-1.3.0.ebuild +++ b/dev-libs/librelp/librelp-1.3.0.ebuild @@ -17,26 +17,17 @@ SLOT="0/0.4.0" KEYWORDS="amd64 arm ~arm64 ~hppa ~sparc x86" IUSE="debug doc +ssl +gnutls libressl openssl static-libs test" -REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) ) - gnutls? ( ssl ) - openssl? ( ssl ) - libressl? ( openssl )" +REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )" -RDEPEND="ssl? ( +RDEPEND=" + ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )" - -DEPEND="ssl? ( - gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) - openssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) +DEPEND="${RDEPEND} test? ( ${PYTHON_DEPS} ) virtual/pkgconfig" @@ -80,6 +71,6 @@ src_install() { default if ! use static-libs; then - find "${ED%/}"/usr/lib* -name '*.la' -delete || die + find "${D}" -name '*.la' -delete || die fi } diff --git a/dev-libs/librelp/librelp-1.4.0.ebuild b/dev-libs/librelp/librelp-1.4.0.ebuild index eb73628561b..7f2f302f832 100644 --- a/dev-libs/librelp/librelp-1.4.0.ebuild +++ b/dev-libs/librelp/librelp-1.4.0.ebuild @@ -17,26 +17,17 @@ SLOT="0/0.5.0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86" IUSE="debug doc +ssl +gnutls libressl openssl static-libs test" -REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) ) - gnutls? ( ssl ) - openssl? ( ssl ) - libressl? ( openssl )" +REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )" -RDEPEND="ssl? ( +RDEPEND=" + ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )" - -DEPEND="ssl? ( - gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) - openssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) +DEPEND="${RDEPEND} test? ( ${PYTHON_DEPS} ) virtual/pkgconfig" @@ -78,6 +69,6 @@ src_install() { default if ! use static-libs; then - find "${ED%/}"/usr/lib* -name '*.la' -delete || die + find "${D}" -name '*.la' -delete || die fi }