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@gentoo.org>

diff --git a/dev-libs/librelp/librelp-1.2.18.ebuild b/dev-libs/librelp/librelp-1.2.18.ebuild
index bd8997fcf000a7fbd64333c712257063b4c1ed41..fd69546976e4af3689b70decc5e7b2357ef5ff83 100644 (file)
--- 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 17fe8ff33f4e9ded801db3c1d54938bb346dffda..b5359490d5fcd033145a1fd705673d5524db9a95 100644 (file)
--- 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 eb73628561b13a8cc8ca455d5d3fb6961bc979e5..7f2f302f832308ac77c6cd0e779ffcd08f6e5017 100644 (file)
--- 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
 }