commit: ac9711d1ba3c62defd5560ca827c8959f68386f1 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Apr 27 16:35:04 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Apr 27 20:27:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac9711d1
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 <AT> gentoo.org> net-nds/openldap/openldap-2.4.45-r1.ebuild | 10 ++++++---- net-nds/openldap/openldap-2.4.45.ebuild | 12 +++++++----- net-nds/openldap/openldap-2.4.47-r1.ebuild | 5 ++--- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/net-nds/openldap/openldap-2.4.45-r1.ebuild b/net-nds/openldap/openldap-2.4.45-r1.ebuild index 7d16acea025..027f4e6a258 100644 --- 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 7f5cd3fc1bd..afafb6f7063 100644 --- 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 e63077460b1..5b6b5239e46 100644 --- 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:= )
