commit: 37dc446c5ca493b697603311b3e8d35f47a88e8d Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Apr 27 16:35:03 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> 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 <soap <AT> 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 }
