From 00c564dee67ae6da88c6407bd2bbe0b515d336c7 Mon Sep 17 00:00:00 2001 From: Rick Farina <zerochaos@gentoo.org> Date: Fri, 15 Nov 2013 23:25:46 +0000 Subject: moving cifs-utils to an RDEP per bug #489472 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key DD11F94A) --- net-fs/samba/ChangeLog | 7 ++++++- net-fs/samba/samba-3.6.19.ebuild | 12 ++++++------ net-fs/samba/samba-3.6.20.ebuild | 12 ++++++------ net-fs/samba/samba-4.0.10-r1.ebuild | 9 +++++---- net-fs/samba/samba-4.0.11.ebuild | 9 +++++---- net-fs/samba/samba-4.1.0-r1.ebuild | 9 +++++---- net-fs/samba/samba-4.1.1.ebuild | 9 +++++---- 7 files changed, 38 insertions(+), 29 deletions(-) (limited to 'net-fs') diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 8400c9cc327a..02f678d0e4dd 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-fs/samba # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.622 2013/11/12 09:28:07 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.623 2013/11/15 23:25:46 zerochaos Exp $ + + 15 Nov 2013; Rick Farina <zerochaos@gentoo.org> samba-3.6.19.ebuild, + samba-3.6.20.ebuild, samba-4.0.10-r1.ebuild, samba-4.0.11.ebuild, + samba-4.1.0-r1.ebuild, samba-4.1.1.ebuild: + moving cifs-utils to an RDEP per bug #489472 *samba-4.1.1 (12 Nov 2013) *samba-4.0.11 (12 Nov 2013) diff --git a/net-fs/samba/samba-3.6.19.ebuild b/net-fs/samba/samba-3.6.19.ebuild index dbcda4e539ce..89f98633e5e7 100644 --- a/net-fs/samba/samba-3.6.19.ebuild +++ b/net-fs/samba/samba-3.6.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.19.ebuild,v 1.12 2013/11/02 12:44:18 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.19.ebuild,v 1.13 2013/11/15 23:25:46 zerochaos Exp $ EAPI=4 @@ -25,13 +25,11 @@ DEPEND="dev-libs/popt >=sys-libs/tevent-0.9.18 virtual/libiconv ads? ( virtual/krb5 sys-fs/e2fsprogs - client? ( sys-apps/keyutils - kernel_linux? ( net-fs/cifs-utils[ads] ) ) ) + client? ( sys-apps/keyutils ) ) avahi? ( net-dns/avahi[dbus] ) caps? ( sys-libs/libcap ) client? ( !net-fs/mount-cifs - dev-libs/iniparser - kernel_linux? ( net-fs/cifs-utils ) ) + dev-libs/iniparser ) cluster? ( >=dev-db/ctdb-1.13 ) cups? ( net-print/cups ) debug? ( dev-libs/dmalloc ) @@ -46,7 +44,9 @@ DEPEND="dev-libs/popt selinux? ( sec-policy/selinux-samba ) syslog? ( virtual/logger )" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + kernel_linux? ( ads? ( net-fs/cifs-utils[ads] ) + client? ( net-fs/cifs-utils ) )" # Disable tests since we don't want to build that much here RESTRICT="test" diff --git a/net-fs/samba/samba-3.6.20.ebuild b/net-fs/samba/samba-3.6.20.ebuild index d42771260598..e4f02eef3693 100644 --- a/net-fs/samba/samba-3.6.20.ebuild +++ b/net-fs/samba/samba-3.6.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.20.ebuild,v 1.1 2013/11/12 09:28:07 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.20.ebuild,v 1.2 2013/11/15 23:25:46 zerochaos Exp $ EAPI=4 @@ -25,13 +25,11 @@ DEPEND="dev-libs/popt >=sys-libs/tevent-0.9.18 virtual/libiconv ads? ( virtual/krb5 sys-fs/e2fsprogs - client? ( sys-apps/keyutils - kernel_linux? ( net-fs/cifs-utils[ads] ) ) ) + client? ( sys-apps/keyutils ) ) avahi? ( net-dns/avahi[dbus] ) caps? ( sys-libs/libcap ) client? ( !net-fs/mount-cifs - dev-libs/iniparser - kernel_linux? ( net-fs/cifs-utils ) ) + dev-libs/iniparser ) cluster? ( >=dev-db/ctdb-1.13 ) cups? ( net-print/cups ) debug? ( dev-libs/dmalloc ) @@ -46,7 +44,9 @@ DEPEND="dev-libs/popt selinux? ( sec-policy/selinux-samba ) syslog? ( virtual/logger )" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + kernel_linux? ( ads? ( net-fs/cifs-utils[ads] ) + client? ( net-fs/cifs-utils ) )" # Disable tests since we don't want to build that much here RESTRICT="test" diff --git a/net-fs/samba/samba-4.0.10-r1.ebuild b/net-fs/samba/samba-4.0.10-r1.ebuild index adc3c3c2262a..fd9b0ab435e8 100644 --- a/net-fs/samba/samba-4.0.10-r1.ebuild +++ b/net-fs/samba/samba-4.0.10-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.10-r1.ebuild,v 1.2 2013/10/29 14:06:56 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.10-r1.ebuild,v 1.3 2013/11/15 23:25:46 zerochaos Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} ) @@ -32,7 +32,7 @@ ldap quota selinux swat syslog test winbind" # sys-apps/attr is an automagic dependency (see bug #489748) # dev-libs/libaio is an automagic dependency (see bug #489764) # sys-libs/pam is an automagic dependency (see bug #489770) -RDEPEND="${PYTHON_DEPS} +CDEPEND="${PYTHON_DEPS} >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/libaio @@ -51,15 +51,16 @@ RDEPEND="${PYTHON_DEPS} virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) - client? ( net-fs/cifs-utils[ads?] ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) selinux? ( sec-policy/selinux-samba )" -DEPEND="${RDEPEND} +DEPEND="${CDEPEND} virtual/pkgconfig" +RDEPEND="${CDEPEND} + client? ( net-fs/cifs-utils[ads?] )" REQUIRED_USE="ads? ( acl ldap )" diff --git a/net-fs/samba/samba-4.0.11.ebuild b/net-fs/samba/samba-4.0.11.ebuild index c8db2b6ebb84..63aa7af7a989 100644 --- a/net-fs/samba/samba-4.0.11.ebuild +++ b/net-fs/samba/samba-4.0.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.11.ebuild,v 1.1 2013/11/12 09:28:07 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.11.ebuild,v 1.2 2013/11/15 23:25:46 zerochaos Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} ) @@ -31,7 +31,7 @@ ldap quota selinux swat syslog test winbind" # sys-apps/attr is an automagic dependency (see bug #489748) # dev-libs/libaio is an automagic dependency (see bug #489764) # sys-libs/pam is an automagic dependency (see bug #489770) -RDEPEND="${PYTHON_DEPS} +CDEPEND="${PYTHON_DEPS} >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/libaio @@ -49,7 +49,6 @@ RDEPEND="${PYTHON_DEPS} virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) - client? ( net-fs/cifs-utils[ads?] ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) @@ -57,8 +56,10 @@ RDEPEND="${PYTHON_DEPS} >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) selinux? ( sec-policy/selinux-samba )" -DEPEND="${RDEPEND} +DEPEND="${CDEPEND} virtual/pkgconfig" +RDEPEND="${CDEPEND} + client? ( net-fs/cifs-utils[ads?] )" REQUIRED_USE="ads? ( acl ldap )" diff --git a/net-fs/samba/samba-4.1.0-r1.ebuild b/net-fs/samba/samba-4.1.0-r1.ebuild index 4f8b150361d7..0f1d5f5e58ce 100644 --- a/net-fs/samba/samba-4.1.0-r1.ebuild +++ b/net-fs/samba/samba-4.1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.0-r1.ebuild,v 1.2 2013/10/29 14:06:56 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.0-r1.ebuild,v 1.3 2013/11/15 23:25:46 zerochaos Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} ) @@ -26,7 +26,7 @@ ldap quota selinux syslog test winbind" # sys-apps/attr is an automagic dependency (see bug #489748) # dev-libs/libaio is an automagic dependency (see bug #489764) # sys-libs/pam is an automagic dependency (see bug #489770) -RDEPEND="${PYTHON_DEPS} +CDEPEND="${PYTHON_DEPS} >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/libaio @@ -45,15 +45,16 @@ RDEPEND="${PYTHON_DEPS} virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) - client? ( net-fs/cifs-utils[ads?] ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) selinux? ( sec-policy/selinux-samba )" -DEPEND="${RDEPEND} +DEPEND="${CDEPEND} virtual/pkgconfig" +RDEPEND="${CDEPEND} + client? ( net-fs/cifs-utils[ads?] )" REQUIRED_USE="ads? ( acl ldap )" diff --git a/net-fs/samba/samba-4.1.1.ebuild b/net-fs/samba/samba-4.1.1.ebuild index 2ab4549c3fc8..ce633d296050 100644 --- a/net-fs/samba/samba-4.1.1.ebuild +++ b/net-fs/samba/samba-4.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.1.ebuild,v 1.1 2013/11/12 09:28:07 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.1.ebuild,v 1.2 2013/11/15 23:25:46 zerochaos Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} ) @@ -25,7 +25,7 @@ ldap quota selinux syslog test winbind" # sys-apps/attr is an automagic dependency (see bug #489748) # dev-libs/libaio is an automagic dependency (see bug #489764) # sys-libs/pam is an automagic dependency (see bug #489770) -RDEPEND="${PYTHON_DEPS} +CDEPEND="${PYTHON_DEPS} >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/libaio @@ -43,7 +43,6 @@ RDEPEND="${PYTHON_DEPS} virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) - client? ( net-fs/cifs-utils[ads?] ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) @@ -51,8 +50,10 @@ RDEPEND="${PYTHON_DEPS} >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) selinux? ( sec-policy/selinux-samba )" -DEPEND="${RDEPEND} +DEPEND="${CDEPEND} virtual/pkgconfig" +RDEPEND="${CDEPEND} + client? ( net-fs/cifs-utils[ads?] )" REQUIRED_USE="ads? ( acl ldap )" -- cgit v1.2.3-65-gdbad