From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1470522-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BDB82158020 for <garchives@archives.gentoo.org>; Fri, 23 Dec 2022 21:05:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC39EE0826; Fri, 23 Dec 2022 21:05:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FB95E0826 for <gentoo-commits@lists.gentoo.org>; Fri, 23 Dec 2022 21:05:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB8BB34085A for <gentoo-commits@lists.gentoo.org>; Fri, 23 Dec 2022 21:05:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 304E37D3 for <gentoo-commits@lists.gentoo.org>; Fri, 23 Dec 2022 21:05:22 +0000 (UTC) From: "Mike Gilbert" <floppym@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org> Message-ID: <1671829517.d7c74b87e45f95c143e87b122dee9afea290ab53.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/openldap/openldap-2.4.57-r2.ebuild net-nds/openldap/openldap-2.4.58-r2.ebuild net-nds/openldap/openldap-2.4.59-r2.ebuild net-nds/openldap/openldap-2.6.3-r3.ebuild net-nds/openldap/openldap-2.6.3-r4.ebuild X-VCS-Directories: net-nds/openldap/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: d7c74b87e45f95c143e87b122dee9afea290ab53 X-VCS-Branch: master Date: Fri, 23 Dec 2022 21:05:22 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f9f1368c-45e9-49c6-8bf5-649d3d710761 X-Archives-Hash: 6ff4f4a955e3cb29f5a962293c75aa5e 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 )