commit: d7c74b87e45f95c143e87b122dee9afea290ab53 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Dec 23 21:02:53 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Dec 23 21:05:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7c74b87
net-nds/openldap: add REQUIRED_USE for conflicting features Closes: https://bugs.gentoo.org/885359 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-nds/openldap/openldap-2.4.57-r2.ebuild | 3 ++- net-nds/openldap/openldap-2.4.58-r2.ebuild | 3 ++- net-nds/openldap/openldap-2.4.59-r2.ebuild | 3 ++- net-nds/openldap/openldap-2.6.3-r3.ebuild | 5 +++-- net-nds/openldap/openldap-2.6.3-r4.ebuild | 5 +++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/net-nds/openldap/openldap-2.4.57-r2.ebuild b/net-nds/openldap/openldap-2.4.57-r2.ebuild index 92d0abe3c671..eee236d147bd 100644 --- a/net-nds/openldap/openldap-2.4.57-r2.ebuild +++ b/net-nds/openldap/openldap-2.4.57-r2.ebuild @@ -36,7 +36,8 @@ RESTRICT="!test? ( test )" REQUIRED_USE="cxx? ( sasl ) pbkdf2? ( ssl ) test? ( berkdb ) - ?? ( test minimal )" + ?? ( test minimal ) + kerberos? ( ?? ( kinit smbkrb5passwd ) )" # always list newer first # Do not add any AGPL-3 BDB here! diff --git a/net-nds/openldap/openldap-2.4.58-r2.ebuild b/net-nds/openldap/openldap-2.4.58-r2.ebuild index 41c31f8ea973..bf9fe1d3e87b 100644 --- a/net-nds/openldap/openldap-2.4.58-r2.ebuild +++ b/net-nds/openldap/openldap-2.4.58-r2.ebuild @@ -36,7 +36,8 @@ RESTRICT="!test? ( test )" REQUIRED_USE="cxx? ( sasl ) pbkdf2? ( ssl ) test? ( berkdb ) - ?? ( test minimal )" + ?? ( test minimal ) + kerberos? ( ?? ( kinit smbkrb5passwd ) )" # always list newer first # Do not add any AGPL-3 BDB here! diff --git a/net-nds/openldap/openldap-2.4.59-r2.ebuild b/net-nds/openldap/openldap-2.4.59-r2.ebuild index f04abefec1a4..2a36b6a3884a 100644 --- a/net-nds/openldap/openldap-2.4.59-r2.ebuild +++ b/net-nds/openldap/openldap-2.4.59-r2.ebuild @@ -36,7 +36,8 @@ RESTRICT="!test? ( test )" REQUIRED_USE="cxx? ( sasl ) pbkdf2? ( ssl ) test? ( berkdb ) - ?? ( test minimal )" + ?? ( test minimal ) + kerberos? ( ?? ( kinit smbkrb5passwd ) )" # always list newer first # Do not add any AGPL-3 BDB here! diff --git a/net-nds/openldap/openldap-2.6.3-r3.ebuild b/net-nds/openldap/openldap-2.6.3-r3.ebuild index e494e314b828..00691826a18e 100644 --- a/net-nds/openldap/openldap-2.6.3-r3.ebuild +++ b/net-nds/openldap/openldap-2.6.3-r3.ebuild @@ -37,7 +37,8 @@ REQUIRED_USE="cxx? ( sasl ) pbkdf2? ( ssl ) test? ( cleartext sasl ) autoca? ( !gnutls ) - ?? ( test minimal )" + ?? ( test minimal ) + kerberos? ( ?? ( kinit smbkrb5passwd ) )" # openssl is needed to generate lanman-passwords required by samba COMMON_DEPEND=" @@ -68,7 +69,7 @@ COMMON_DEPEND=" smbkrb5passwd? ( dev-libs/openssl:0= kerberos? ( app-crypt/heimdal ) - ) + ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) diff --git a/net-nds/openldap/openldap-2.6.3-r4.ebuild b/net-nds/openldap/openldap-2.6.3-r4.ebuild index d180bd321343..14a589aac4b0 100644 --- a/net-nds/openldap/openldap-2.6.3-r4.ebuild +++ b/net-nds/openldap/openldap-2.6.3-r4.ebuild @@ -37,7 +37,8 @@ REQUIRED_USE="cxx? ( sasl ) pbkdf2? ( ssl ) test? ( cleartext sasl ) autoca? ( !gnutls ) - ?? ( test minimal )" + ?? ( test minimal ) + kerberos? ( ?? ( kinit smbkrb5passwd ) )" # openssl is needed to generate lanman-passwords required by samba COMMON_DEPEND=" @@ -68,7 +69,7 @@ COMMON_DEPEND=" smbkrb5passwd? ( dev-libs/openssl:0= kerberos? ( app-crypt/heimdal ) - ) + ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal )
