commit: 4117767bbc179bfd13c0268b08984fe3dfddcf06 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu Mar 15 08:33:33 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Mar 15 08:34:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4117767b
net-fs/samba: USE="cluster" requires USE="ads" Closes: https://bugs.gentoo.org/625138 Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-fs/samba/samba-4.5.15.ebuild | 7 +++++-- net-fs/samba/samba-4.5.16.ebuild | 4 +++- net-fs/samba/samba-4.6.14.ebuild | 9 ++++++--- net-fs/samba/samba-4.7.6.ebuild | 9 ++++++--- net-fs/samba/samba-4.8.0.ebuild | 1 + 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/net-fs/samba/samba-4.5.15.ebuild b/net-fs/samba/samba-4.5.15.ebuild index 66526019e60..4d0ebd052ba 100644 --- a/net-fs/samba/samba-4.5.15.ebuild +++ b/net-fs/samba/samba-4.5.15.ebuild @@ -96,11 +96,14 @@ RDEPEND="${CDEPEND} !dev-perl/Parse-Yapp " -REQUIRED_USE="addc? ( gnutls !system-mitkrb5 ) +REQUIRED_USE=" + addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) + cluster? ( ads ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) - ${PYTHON_REQUIRED_USE}" + ${PYTHON_REQUIRED_USE} +" S="${WORKDIR}/${MY_P}" diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild index b74545cc6d5..ddb232887a7 100644 --- a/net-fs/samba/samba-4.5.16.ebuild +++ b/net-fs/samba/samba-4.5.16.ebuild @@ -96,8 +96,10 @@ RDEPEND="${CDEPEND} !dev-perl/Parse-Yapp " -REQUIRED_USE="addc? ( gnutls !system-mitkrb5 ) +REQUIRED_USE=" + addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) + cluster? ( ads ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) ${PYTHON_REQUIRED_USE}" diff --git a/net-fs/samba/samba-4.6.14.ebuild b/net-fs/samba/samba-4.6.14.ebuild index ff66041de15..4768bc39a8b 100644 --- a/net-fs/samba/samba-4.6.14.ebuild +++ b/net-fs/samba/samba-4.6.14.ebuild @@ -99,13 +99,16 @@ RDEPEND="${CDEPEND} !dev-perl/Parse-Yapp " -REQUIRED_USE="addc? ( python gnutls !system-mitkrb5 ) - test? ( python ) +REQUIRED_USE=" + addc? ( python gnutls !system-mitkrb5 ) addns? ( python ) ads? ( acl gnutls ldap ) + cluster? ( ads ) gpg? ( addc ) + test? ( python ) ?? ( system-heimdal system-mitkrb5 ) - ${PYTHON_REQUIRED_USE}" + ${PYTHON_REQUIRED_USE} +" # the test suite is messed, it uses system-installed samba # bits instead of what was built, tests things disabled via use diff --git a/net-fs/samba/samba-4.7.6.ebuild b/net-fs/samba/samba-4.7.6.ebuild index ae147981edc..da9d5260b04 100644 --- a/net-fs/samba/samba-4.7.6.ebuild +++ b/net-fs/samba/samba-4.7.6.ebuild @@ -103,13 +103,16 @@ RDEPEND="${CDEPEND} !dev-perl/Parse-Yapp " -REQUIRED_USE="addc? ( python gnutls ) - test? ( python ) +REQUIRED_USE=" + addc? ( python gnutls ) addns? ( python ) ads? ( acl gnutls ldap ) + cluster? ( ads ) gpg? ( addc ) + test? ( python ) ?? ( system-heimdal system-mitkrb5 ) - ${PYTHON_REQUIRED_USE}" + ${PYTHON_REQUIRED_USE} +" # the test suite is messed, it uses system-installed samba # bits instead of what was built, tests things disabled via use diff --git a/net-fs/samba/samba-4.8.0.ebuild b/net-fs/samba/samba-4.8.0.ebuild index 32e5b412fc3..94639695536 100644 --- a/net-fs/samba/samba-4.8.0.ebuild +++ b/net-fs/samba/samba-4.8.0.ebuild @@ -107,6 +107,7 @@ REQUIRED_USE=" addc? ( python gnutls winbind ) addns? ( python ) ads? ( acl gnutls ldap winbind ) + cluster? ( ads ) gpg? ( addc ) python? ( ldap ) test? ( python )
