net-nds/openldap: [QA] Fix USE=libressl semantics

Closes: https://bugs.gentoo.org/684004
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/net-nds/openldap/openldap-2.4.45-r1.ebuild b/net-nds/openldap/openldap-2.4.45-r1.ebuild
index 7d16acea025a4bd1d60c0dbd78824eb024d1463a..027f4e6a258c20ff63766686c03054ab8a618f4a 100644 (file)
--- a/net-nds/openldap/openldap-2.4.45-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.45-r1.ebuild
@@ -29,7 +29,6 @@ IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
 
 REQUIRED_USE="cxx? ( sasl )
-       ?? ( gnutls libressl )
        pbkdf2? ( ssl )"
 
 # always list newer first
@@ -45,10 +44,13 @@ CDEPEND="
        ssl? (
                !gnutls? (
                        !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+                       libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
                )
-               gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
-               libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-               >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) )
+               gnutls? (
+                       >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+                       >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+               )
+       )
        sasl? ( dev-libs/cyrus-sasl:= )
        !minimal? (
                sys-devel/libtool

diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild
index 7f5cd3fc1bd91bd401c84f8481a4a750885a3c82..afafb6f7063ae2fb8b611c9df705eb36eb13e288 100644 (file)
--- a/net-nds/openldap/openldap-2.4.45.ebuild
+++ b/net-nds/openldap/openldap-2.4.45.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="5"
@@ -29,7 +29,6 @@ IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
 
 REQUIRED_USE="cxx? ( sasl )
-       ?? ( gnutls libressl )
        pbkdf2? ( ssl )"
 
 # always list newer first
@@ -45,10 +44,13 @@ CDEPEND="
        ssl? (
                !gnutls? (
                        !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+                       libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
                )
-               gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
-               libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-               >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) )
+               gnutls? (
+                       >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+                       >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+               )
+       )
        sasl? ( dev-libs/cyrus-sasl:= )
        !minimal? (
                sys-devel/libtool

diff --git a/net-nds/openldap/openldap-2.4.47-r1.ebuild b/net-nds/openldap/openldap-2.4.47-r1.ebuild
index e63077460b18611d5acfb941c01535b94f206ef2..5b6b5239e46886640ef1362d37998fd30a45affd 100644 (file)
--- a/net-nds/openldap/openldap-2.4.47-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.47-r1.ebuild
@@ -29,7 +29,6 @@ IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
 
 REQUIRED_USE="cxx? ( sasl )
-       ?? ( gnutls libressl )
        pbkdf2? ( ssl )
        test? ( berkdb )
        ?? ( test minimal )"
@@ -50,8 +49,8 @@ CDEPEND="
                        libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
                )
                gnutls? (
-                       >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
-                       >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+                       >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+                       >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
                )
        )
        sasl? ( dev-libs/cyrus-sasl:= )