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)

5 files changed, 35 insertions, 17 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index e6867e527730..040cc531ad88 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.310 2014/10/28 17:27:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.311 2014/11/02 09:54:49 swift Exp $
+
+  02 Nov 2014; Sven Vermeulen <swift@gentoo.org> metadata.xml,
+  openrc-0.12.4.ebuild, openrc-0.13.1.ebuild, openrc-9999.ebuild:
+  Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
+  #527698)
 
   28 Oct 2014; William Hubbs <williamh@gentoo.org> openrc-0.12.4.ebuild,
   openrc-0.13.1.ebuild, openrc-0.13.2.ebuild, openrc-9999.ebuild:
diff --git a/sys-apps/openrc/metadata.xml b/sys-apps/openrc/metadata.xml
index 00439362b480..8c3b63ef0966 100644
--- a/sys-apps/openrc/metadata.xml
+++ b/sys-apps/openrc/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>openrc</herd>
 	<use>
+		<flag name="audit">enable support for Linux audit subsystem</flag>
 		<flag name="netifrc">enable Gentoo's network stack (net.* scripts)</flag>
 		<flag name="newnet">enable the new network stack (experimental)</flag>
 		<flag name="tools">build optional tools</flag>
diff --git a/sys-apps/openrc/openrc-0.12.4.ebuild b/sys-apps/openrc/openrc-0.12.4.ebuild
index 1732de93c180..1bd395d8a2b0 100644
--- a/sys-apps/openrc/openrc-0.12.4.ebuild
+++ b/sys-apps/openrc/openrc-0.12.4.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/sys-apps/openrc/openrc-0.12.4.ebuild,v 1.13 2014/10/28 17:27:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.12.4.ebuild,v 1.14 2014/11/02 09:54:49 swift Exp $
 
 EAPI=5
 
@@ -30,7 +30,6 @@ COMMON_DEPEND=" kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-pro
 	kernel_linux? (
 		sys-process/psmisc
 	)
-	selinux? ( sec-policy/selinux-openrc )
 	!<sys-apps/baselayout-2.1-r1
 	!<sys-fs/udev-init-scripts-17
 	!<sys-fs/udev-133"
@@ -41,7 +40,9 @@ RDEPEND="${COMMON_DEPEND}
 	!prefix? (
 		kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
 		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-	)"
+	)
+	selinux? ( sec-policy/selinux-openrc )
+"
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
 
diff --git a/sys-apps/openrc/openrc-0.13.1.ebuild b/sys-apps/openrc/openrc-0.13.1.ebuild
index 139860743564..9c42cc9f945a 100644
--- a/sys-apps/openrc/openrc-0.13.1.ebuild
+++ b/sys-apps/openrc/openrc-0.13.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/sys-apps/openrc/openrc-0.13.1.ebuild,v 1.2 2014/10/28 17:27:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.13.1.ebuild,v 1.3 2014/11/02 09:54:49 swift Exp $
 
 EAPI=5
 
@@ -31,9 +31,7 @@ COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-proc
 		sys-process/psmisc
 		!<sys-process/procps-3.3.9-r2
 	)
-	selinux? ( sec-policy/selinux-base-policy
-		sec-policy/selinux-openrc
-		sys-libs/libselinux )
+	selinux? ( sys-libs/libselinux )
 	!<sys-apps/baselayout-2.1-r1
 	!<sys-fs/udev-init-scripts-27"
 DEPEND="${COMMON_DEPEND}
@@ -43,7 +41,12 @@ RDEPEND="${COMMON_DEPEND}
 	!prefix? (
 		kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
 		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-	)"
+	)
+	selinux? (
+		sec-policy/selinux-base-policy
+		sec-policy/selinux-openrc
+	)
+"
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
 
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index d3c0bc7f1595..4cb43d16ddfa 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-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/sys-apps/openrc/openrc-9999.ebuild,v 1.140 2014/10/28 17:27:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.141 2014/11/02 09:54:49 swift Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
 	tools unicode kernel_linux kernel_FreeBSD"
 
 COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
@@ -27,13 +27,15 @@ COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-proc
 	ncurses? ( sys-libs/ncurses )
 	pam? ( sys-auth/pambase )
 	tools? ( dev-lang/perl )
+	audit? ( sys-process/audit )
 	kernel_linux? (
 		sys-process/psmisc
 		!<sys-process/procps-3.3.9-r2
 	)
-	selinux? ( sec-policy/selinux-base-policy
-		sec-policy/selinux-openrc
-		sys-libs/libselinux )
+	selinux? (
+		sys-apps/policycoreutils
+		sys-libs/libselinux
+	)
 	!<sys-apps/baselayout-2.1-r1
 	!<sys-fs/udev-init-scripts-27"
 DEPEND="${COMMON_DEPEND}
@@ -43,7 +45,12 @@ RDEPEND="${COMMON_DEPEND}
 	!prefix? (
 		kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
 		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-	)"
+	)
+	selinux? (
+		sec-policy/selinux-base-policy
+		sec-policy/selinux-openrc
+	)
+"
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
 
@@ -67,8 +74,10 @@ src_compile() {
 		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
 		MKNET=$(usex newnet)
 		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
 		MKSTATICLIBS=$(usex static-libs)
-	MKTOOLS=$(usex tools)"
+		MKTOOLS=$(usex tools)"
 
 	local brand="Unknown"
 	if use kernel_linux ; then
@@ -81,7 +90,6 @@ src_compile() {
 	export BRANDING="Gentoo ${brand}"
 	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
 	export DEBUG=$(usev debug)
-	export MKPAM=$(usev pam)
 	export MKTERMCAP=$(usev ncurses)
 
 	tc-export CC AR RANLIB