Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug #527698)

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)

8 files changed, 39 insertions, 26 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 3e37bc28526f..4682661df2dd 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.689 2014/10/21 21:59:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.690 2014/11/02 12:33:27 swift Exp $
+
+  02 Nov 2014; Sven Vermeulen <swift@gentoo.org> samba-3.6.23-r1.ebuild,
+  samba-3.6.23.ebuild, samba-3.6.24.ebuild, samba-4.0.21.ebuild,
+  samba-4.0.22.ebuild, samba-4.1.12.ebuild, samba-4.1.13.ebuild:
+  Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
+  #527698)
 
 *samba-4.1.13 (21 Oct 2014)
 
diff --git a/net-fs/samba/samba-3.6.23-r1.ebuild b/net-fs/samba/samba-3.6.23-r1.ebuild
index 142d87fa0daa..786465bbc01b 100644
--- a/net-fs/samba/samba-3.6.23-r1.ebuild
+++ b/net-fs/samba/samba-3.6.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.23-r1.ebuild,v 1.11 2014/10/11 12:06:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.23-r1.ebuild,v 1.12 2014/11/02 12:33:27 swift Exp $
 
 EAPI=5
 
@@ -41,12 +41,13 @@ DEPEND="dev-libs/popt
 		winbind? ( >=dev-libs/iniparser-3.1-r1[${MULTILIB_USEDEP}] )
 	)
 	readline? ( >=sys-libs/readline-5.2 )
-	selinux? ( sec-policy/selinux-samba )
 	syslog? ( virtual/logger )"
 
 RDEPEND="${DEPEND}
 	kernel_linux? ( ads? ( net-fs/cifs-utils[ads] )
-			client? ( net-fs/cifs-utils ) )"
+			client? ( net-fs/cifs-utils ) )
+	selinux? ( sec-policy/selinux-samba )
+"
 
 # Disable tests since we don't want to build that much here
 RESTRICT="test"
diff --git a/net-fs/samba/samba-3.6.23.ebuild b/net-fs/samba/samba-3.6.23.ebuild
index 9744971e5a5b..046db884c6e9 100644
--- a/net-fs/samba/samba-3.6.23.ebuild
+++ b/net-fs/samba/samba-3.6.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.23.ebuild,v 1.10 2014/05/14 16:14:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.23.ebuild,v 1.11 2014/11/02 12:33:27 swift Exp $
 
 EAPI=4
 
@@ -41,12 +41,13 @@ DEPEND="dev-libs/popt
 		winbind? ( dev-libs/iniparser )
 	)
 	readline? ( >=sys-libs/readline-5.2 )
-	selinux? ( sec-policy/selinux-samba )
 	syslog? ( virtual/logger )"
 
 RDEPEND="${DEPEND}
 	kernel_linux? ( ads? ( net-fs/cifs-utils[ads] )
-			client? ( net-fs/cifs-utils ) )"
+			client? ( net-fs/cifs-utils ) )
+	selinux? ( sec-policy/selinux-samba )
+"
 
 # Disable tests since we don't want to build that much here
 RESTRICT="test"
diff --git a/net-fs/samba/samba-3.6.24.ebuild b/net-fs/samba/samba-3.6.24.ebuild
index 223ef7e6c97f..39a747bc3f0a 100644
--- a/net-fs/samba/samba-3.6.24.ebuild
+++ b/net-fs/samba/samba-3.6.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.24.ebuild,v 1.1 2014/07/11 13:07:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.24.ebuild,v 1.2 2014/11/02 12:33:27 swift Exp $
 
 EAPI=5
 
@@ -41,12 +41,13 @@ DEPEND="dev-libs/popt
 		winbind? ( >=dev-libs/iniparser-3.1-r1[${MULTILIB_USEDEP}] )
 	)
 	readline? ( >=sys-libs/readline-5.2 )
-	selinux? ( sec-policy/selinux-samba )
 	syslog? ( virtual/logger )"
 
 RDEPEND="${DEPEND}
 	kernel_linux? ( ads? ( net-fs/cifs-utils[ads] )
-			client? ( net-fs/cifs-utils ) )"
+			client? ( net-fs/cifs-utils ) )
+	selinux? ( sec-policy/selinux-samba )
+"
 
 # Disable tests since we don't want to build that much here
 RESTRICT="test"
diff --git a/net-fs/samba/samba-4.0.21.ebuild b/net-fs/samba/samba-4.0.21.ebuild
index 9f560571fe1e..4b7ac87f1989 100644
--- a/net-fs/samba/samba-4.0.21.ebuild
+++ b/net-fs/samba/samba-4.0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.21.ebuild,v 1.1 2014/08/01 23:30:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.21.ebuild,v 1.2 2014/11/02 12:33:27 swift Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -54,12 +54,13 @@ CDEPEND="${PYTHON_DEPS}
 	fam? ( virtual/fam )
 	gnutls? ( dev-libs/libgcrypt:0
 		>=net-libs/gnutls-1.4.0 )
-	ldap? ( net-nds/openldap )
-	selinux? ( sec-policy/selinux-samba )"
+	ldap? ( net-nds/openldap )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
-	client? ( net-fs/cifs-utils[ads?] )"
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
 
 REQUIRED_USE="ads? ( acl ldap )"
 
diff --git a/net-fs/samba/samba-4.0.22.ebuild b/net-fs/samba/samba-4.0.22.ebuild
index 8080dd87c0ac..fedfd77db3ba 100644
--- a/net-fs/samba/samba-4.0.22.ebuild
+++ b/net-fs/samba/samba-4.0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.22.ebuild,v 1.1 2014/09/18 19:02:21 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.22.ebuild,v 1.2 2014/11/02 12:33:27 swift Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -54,12 +54,13 @@ CDEPEND="${PYTHON_DEPS}
 	fam? ( virtual/fam )
 	gnutls? ( dev-libs/libgcrypt:0
 		>=net-libs/gnutls-1.4.0 )
-	ldap? ( net-nds/openldap )
-	selinux? ( sec-policy/selinux-samba )"
+	ldap? ( net-nds/openldap )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
-	client? ( net-fs/cifs-utils[ads?] )"
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
 
 REQUIRED_USE="ads? ( acl ldap )"
 
diff --git a/net-fs/samba/samba-4.1.12.ebuild b/net-fs/samba/samba-4.1.12.ebuild
index b39ecccfadc4..a92c258c76d4 100644
--- a/net-fs/samba/samba-4.1.12.ebuild
+++ b/net-fs/samba/samba-4.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.12.ebuild,v 1.1 2014/09/08 11:31:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.12.ebuild,v 1.2 2014/11/02 12:33:27 swift Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -50,12 +50,13 @@ CDEPEND="${PYTHON_DEPS}
 	fam? ( virtual/fam )
 	gnutls? ( dev-libs/libgcrypt:0
 		>=net-libs/gnutls-1.4.0 )
-	ldap? ( net-nds/openldap )
-	selinux? ( sec-policy/selinux-samba )"
+	ldap? ( net-nds/openldap )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
-	client? ( net-fs/cifs-utils[ads?] )"
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
 
 REQUIRED_USE="ads? ( acl ldap )"
 
diff --git a/net-fs/samba/samba-4.1.13.ebuild b/net-fs/samba/samba-4.1.13.ebuild
index 4d31dd473f03..e6fbf1f807a3 100644
--- a/net-fs/samba/samba-4.1.13.ebuild
+++ b/net-fs/samba/samba-4.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.13.ebuild,v 1.1 2014/10/21 21:59:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.13.ebuild,v 1.2 2014/11/02 12:33:27 swift Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -50,12 +50,13 @@ CDEPEND="${PYTHON_DEPS}
 	fam? ( virtual/fam )
 	gnutls? ( dev-libs/libgcrypt:0
 		>=net-libs/gnutls-1.4.0 )
-	ldap? ( net-nds/openldap )
-	selinux? ( sec-policy/selinux-samba )"
+	ldap? ( net-nds/openldap )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
-	client? ( net-fs/cifs-utils[ads?] )"
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
 
 REQUIRED_USE="ads? ( acl ldap )"