Move selinux policy to RDEPEND, bug #527730.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x64D4CF24)

6 files changed, 29 insertions, 25 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 060c15dff76a..55e617283bd2 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/screen
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.201 2014/10/02 18:41:59 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.202 2014/11/01 11:47:25 swegener Exp $
+
+  01 Nov 2014; Sven Wegener <swegener@gentoo.org> screen-4.0.3-r6.ebuild,
+  screen-4.0.3-r7.ebuild, screen-4.0.3-r8.ebuild, screen-4.2.1-r2.ebuild,
+  screen-9999.ebuild:
+  Move selinux policy to RDEPEND, bug #527730.
 
   02 Oct 2014; Fabian Groffen <grobian@gentoo.org> screen-4.2.1-r2.ebuild:
   Extend Solaris fix to allow compilation
diff --git a/app-misc/screen/screen-4.0.3-r6.ebuild b/app-misc/screen/screen-4.0.3-r6.ebuild
index 57b9f6b101b8..acee3f35575f 100644
--- a/app-misc/screen/screen-4.0.3-r6.ebuild
+++ b/app-misc/screen/screen-4.0.3-r6.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/app-misc/screen/screen-4.0.3-r6.ebuild,v 1.5 2014/03/10 21:21:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r6.ebuild,v 1.6 2014/11/01 11:47:25 swegener Exp $
 
 EAPI=4
 
@@ -17,10 +17,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nethack pam selinux multiuser"
 
-RDEPEND=">=sys-libs/ncurses-5.2
-	pam? ( virtual/pam )
+DEPEND=">=sys-libs/ncurses-5.2
+	pam? ( virtual/pam )"
+RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	# Make sure utmp group exists, as it's used later on.
diff --git a/app-misc/screen/screen-4.0.3-r7.ebuild b/app-misc/screen/screen-4.0.3-r7.ebuild
index 0a741fde7a18..c3f3d0ac228b 100644
--- a/app-misc/screen/screen-4.0.3-r7.ebuild
+++ b/app-misc/screen/screen-4.0.3-r7.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/app-misc/screen/screen-4.0.3-r7.ebuild,v 1.5 2014/03/10 21:21:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r7.ebuild,v 1.6 2014/11/01 11:47:25 swegener Exp $
 
 EAPI=4
 
@@ -17,10 +17,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nethack pam selinux multiuser"
 
-RDEPEND=">=sys-libs/ncurses-5.2
-	pam? ( virtual/pam )
+DEPEND=">=sys-libs/ncurses-5.2
+	pam? ( virtual/pam )"
+RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	# Make sure utmp group exists, as it's used later on.
diff --git a/app-misc/screen/screen-4.0.3-r8.ebuild b/app-misc/screen/screen-4.0.3-r8.ebuild
index c5f264b4a9de..296f7176846f 100644
--- a/app-misc/screen/screen-4.0.3-r8.ebuild
+++ b/app-misc/screen/screen-4.0.3-r8.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/app-misc/screen/screen-4.0.3-r8.ebuild,v 1.7 2014/08/30 10:32:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r8.ebuild,v 1.8 2014/11/01 11:47:25 swegener Exp $
 
 EAPI=4
 
@@ -17,11 +17,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nethack pam selinux multiuser"
 
-RDEPEND=">=sys-libs/ncurses-5.2
-	pam? ( virtual/pam )
-	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
+DEPEND=">=sys-libs/ncurses-5.2
+	pam? ( virtual/pam )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-screen )
 	!<sys-apps/openrc-0.11.6"
 
 pkg_setup() {
diff --git a/app-misc/screen/screen-4.2.1-r2.ebuild b/app-misc/screen/screen-4.2.1-r2.ebuild
index a1c374c112c7..fcf6ef95beed 100644
--- a/app-misc/screen/screen-4.2.1-r2.ebuild
+++ b/app-misc/screen/screen-4.2.1-r2.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/app-misc/screen/screen-4.2.1-r2.ebuild,v 1.5 2014/10/02 18:41:59 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.2.1-r2.ebuild,v 1.6 2014/11/01 11:47:25 swegener Exp $
 
 EAPI=5
 
@@ -15,12 +15,12 @@ SLOT="0"
 KEYWORDS=" ~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nethack pam selinux multiuser"
 
-RDEPEND=">=sys-libs/ncurses-5.2
-	pam? ( virtual/pam )
+CDEPEND=">=sys-libs/ncurses-5.2
+	pam? ( virtual/pam )"
+RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	sys-apps/texinfo"
-RDEPEND="${RDEPEND}"
 
 pkg_setup() {
 	# Make sure utmp group exists, as it's used later on.
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 208dbd69d6c1..db742d6baa8d 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.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/app-misc/screen/screen-9999.ebuild,v 1.4 2014/08/30 10:32:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-9999.ebuild,v 1.5 2014/11/01 11:47:25 swegener Exp $
 
 EAPI=5
 
@@ -20,12 +20,12 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug nethack pam selinux multiuser"
 
-RDEPEND=">=sys-libs/ncurses-5.2
-	pam? ( virtual/pam )
+CDEPEND=">=sys-libs/ncurses-5.2
+	pam? ( virtual/pam )"
+RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	sys-apps/texinfo"
-RDEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${P}/src