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, 62 insertions, 34 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index b0da310318d7..710a61ed8e7a 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.801 2014/09/21 22:11:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.802 2014/11/02 10:35:21 swift Exp $
+
+  02 Nov 2014; Sven Vermeulen <swift@gentoo.org> xorg-server-1.14.5.ebuild,
+  xorg-server-1.14.7.ebuild, xorg-server-1.15.0.ebuild,
+  xorg-server-1.15.1.ebuild, xorg-server-1.15.2.ebuild,
+  xorg-server-1.16.0.ebuild, xorg-server-1.16.1.ebuild:
+  Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
+  #527698)
 
 *xorg-server-1.16.1 (21 Sep 2014)
 
diff --git a/x11-base/xorg-server/xorg-server-1.14.5.ebuild b/x11-base/xorg-server/xorg-server-1.14.5.ebuild
index 849c1bf96f15..a385b78062d2 100644
--- a/x11-base/xorg-server/xorg-server-1.14.5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.14.5.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/x11-base/xorg-server/xorg-server-1.14.5.ebuild,v 1.12 2014/07/26 09:31:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.14.5.ebuild,v 1.13 2014/11/02 10:35:21 swift Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
 
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
+CDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
 	media-libs/freetype
 	>=x11-apps/iceauth-1.0.2
@@ -58,10 +58,9 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	)
 	tslib? ( >=x11-libs/tslib-1.0 )
 	udev? ( >=virtual/udev-150 )
-	>=x11-apps/xinit-1.3
-	selinux? ( sec-policy/selinux-xserver )"
+	>=x11-apps/xinit-1.3"
 
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	sys-devel/flex
 	>=x11-proto/bigreqsproto-1.1.0
 	>=x11-proto/compositeproto-0.4
@@ -100,6 +99,10 @@ DEPEND="${RDEPEND}
 		>=x11-proto/dri2proto-2.8
 	)"
 
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+"
+
 PDEPEND="
 	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
 
diff --git a/x11-base/xorg-server/xorg-server-1.14.7.ebuild b/x11-base/xorg-server/xorg-server-1.14.7.ebuild
index 86b926ab4b45..6e1114a012f8 100644
--- a/x11-base/xorg-server/xorg-server-1.14.7.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.14.7.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/x11-base/xorg-server/xorg-server-1.14.7.ebuild,v 1.2 2014/07/26 09:31:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.14.7.ebuild,v 1.3 2014/11/02 10:35:21 swift Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
 
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
+CDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
 	media-libs/freetype
 	>=x11-apps/iceauth-1.0.2
@@ -58,10 +58,9 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	)
 	tslib? ( >=x11-libs/tslib-1.0 )
 	udev? ( >=virtual/udev-150 )
-	>=x11-apps/xinit-1.3
-	selinux? ( sec-policy/selinux-xserver )"
+	>=x11-apps/xinit-1.3"
 
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	sys-devel/flex
 	>=x11-proto/bigreqsproto-1.1.0
 	>=x11-proto/compositeproto-0.4
@@ -100,6 +99,10 @@ DEPEND="${RDEPEND}
 		>=x11-proto/dri2proto-2.8
 	)"
 
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+"
+
 PDEPEND="
 	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
 
diff --git a/x11-base/xorg-server/xorg-server-1.15.0.ebuild b/x11-base/xorg-server/xorg-server-1.15.0.ebuild
index 31e9a463bffa..0b2ac5c9a51a 100644
--- a/x11-base/xorg-server/xorg-server-1.15.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.15.0.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/x11-base/xorg-server/xorg-server-1.15.0.ebuild,v 1.14 2014/07/26 09:31:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.0.ebuild,v 1.15 2014/11/02 10:35:21 swift Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind"
 
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
+CDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
 	media-libs/freetype
 	>=x11-apps/iceauth-1.0.2
@@ -58,10 +58,9 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	tslib? ( >=x11-libs/tslib-1.0 )
 	udev? ( >=virtual/udev-150 )
 	unwind? ( sys-libs/libunwind )
-	>=x11-apps/xinit-1.3
-	selinux? ( sec-policy/selinux-xserver )"
+	>=x11-apps/xinit-1.3"
 
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	sys-devel/flex
 	>=x11-proto/bigreqsproto-1.1.0
 	>=x11-proto/compositeproto-0.4
@@ -102,6 +101,10 @@ DEPEND="${RDEPEND}
 		>=x11-proto/dri2proto-2.8
 	)"
 
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+"
+
 PDEPEND="
 	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
 
diff --git a/x11-base/xorg-server/xorg-server-1.15.1.ebuild b/x11-base/xorg-server/xorg-server-1.15.1.ebuild
index efe7d0be25e1..45523e45e4d5 100644
--- a/x11-base/xorg-server/xorg-server-1.15.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.15.1.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/x11-base/xorg-server/xorg-server-1.15.1.ebuild,v 1.2 2014/07/26 09:31:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.1.ebuild,v 1.3 2014/11/02 10:35:21 swift Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind"
 
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
+CDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
 	media-libs/freetype
 	>=x11-apps/iceauth-1.0.2
@@ -58,10 +58,9 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	tslib? ( >=x11-libs/tslib-1.0 )
 	udev? ( >=virtual/udev-150 )
 	unwind? ( sys-libs/libunwind )
-	>=x11-apps/xinit-1.3
-	selinux? ( sec-policy/selinux-xserver )"
+	>=x11-apps/xinit-1.3"
 
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	sys-devel/flex
 	>=x11-proto/bigreqsproto-1.1.0
 	>=x11-proto/compositeproto-0.4
@@ -102,6 +101,10 @@ DEPEND="${RDEPEND}
 		>=x11-proto/dri2proto-2.8
 	)"
 
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+"
+
 PDEPEND="
 	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
 
diff --git a/x11-base/xorg-server/xorg-server-1.15.2.ebuild b/x11-base/xorg-server/xorg-server-1.15.2.ebuild
index f5c2674a0f49..3092ce8656ce 100644
--- a/x11-base/xorg-server/xorg-server-1.15.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.15.2.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/x11-base/xorg-server/xorg-server-1.15.2.ebuild,v 1.1 2014/09/16 17:27:13 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.2.ebuild,v 1.2 2014/11/02 10:35:21 swift Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind"
 
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
+CDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
 	media-libs/freetype
 	>=x11-apps/iceauth-1.0.2
@@ -58,10 +58,9 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	tslib? ( >=x11-libs/tslib-1.0 )
 	udev? ( >=virtual/udev-150 )
 	unwind? ( sys-libs/libunwind )
-	>=x11-apps/xinit-1.3
-	selinux? ( sec-policy/selinux-xserver )"
+	>=x11-apps/xinit-1.3"
 
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	sys-devel/flex
 	>=x11-proto/bigreqsproto-1.1.0
 	>=x11-proto/compositeproto-0.4
@@ -102,6 +101,10 @@ DEPEND="${RDEPEND}
 		>=x11-proto/dri2proto-2.8
 	)"
 
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+"
+
 PDEPEND="
 	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
 
diff --git a/x11-base/xorg-server/xorg-server-1.16.0.ebuild b/x11-base/xorg-server/xorg-server-1.16.0.ebuild
index 85c57f5d42bf..f9d4417c4ed1 100644
--- a/x11-base/xorg-server/xorg-server-1.16.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.16.0.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/x11-base/xorg-server/xorg-server-1.16.0.ebuild,v 1.2 2014/07/26 09:31:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.0.ebuild,v 1.3 2014/11/02 10:35:21 swift Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
 
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
+CDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
 	media-libs/freetype
 	>=x11-apps/iceauth-1.0.2
@@ -68,13 +68,12 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 		media-libs/libepoxy
 	)
 	>=x11-apps/xinit-1.3
-	selinux? ( sec-policy/selinux-xserver )
 	systemd? (
 		sys-apps/dbus
 		sys-apps/systemd
 	)"
 
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	sys-devel/flex
 	>=x11-proto/bigreqsproto-1.1.0
 	>=x11-proto/compositeproto-0.4
@@ -115,6 +114,10 @@ DEPEND="${RDEPEND}
 		>=x11-proto/dri2proto-2.8
 	)"
 
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+"
+
 PDEPEND="
 	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
 
diff --git a/x11-base/xorg-server/xorg-server-1.16.1.ebuild b/x11-base/xorg-server/xorg-server-1.16.1.ebuild
index dde4c6102c46..40d6ac7b1957 100644
--- a/x11-base/xorg-server/xorg-server-1.16.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.16.1.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/x11-base/xorg-server/xorg-server-1.16.1.ebuild,v 1.1 2014/09/21 22:11:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.1.ebuild,v 1.2 2014/11/02 10:35:21 swift Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
 
-RDEPEND=">=app-admin/eselect-opengl-1.0.8
+CDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
 	media-libs/freetype
 	>=x11-apps/iceauth-1.0.2
@@ -68,13 +68,12 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 		media-libs/libepoxy
 	)
 	>=x11-apps/xinit-1.3
-	selinux? ( sec-policy/selinux-xserver )
 	systemd? (
 		sys-apps/dbus
 		sys-apps/systemd
 	)"
 
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	sys-devel/flex
 	>=x11-proto/bigreqsproto-1.1.0
 	>=x11-proto/compositeproto-0.4
@@ -115,6 +114,10 @@ DEPEND="${RDEPEND}
 		>=x11-proto/dri2proto-2.8
 	)"
 
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+"
+
 PDEPEND="
 	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"