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

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

6 files changed, 54 insertions, 26 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/Manifest b/sys-apps/openrc/Manifest
index 95d741ab5642..44e6b8c126ea 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -10,16 +10,26 @@ AUX start-stop-daemon.pam 63 SHA256 2681da17e4a122656b5303b7c7eca82b8fb182641290
 DIST openrc-0.12.4.tar.bz2 131914 SHA256 c4edda2fff4b613f50b9cc265bb457a9ab0170fbc1fe7c26eccd4a5d63b2625c SHA512 14e188e382dfe02037d3e4211fa3265152d5ec92ca491b1e86154c0615583ddfc0a2592ca849ab453068dd60000886e57e7da024036fa58d7474acdbb6b92208 WHIRLPOOL 7bdc2c310ee6e87a439574f377a3c1541a118b4122d098d727f6d4464e9f645e5a4d40bedfc82f401b53e640e78494f74fac94f9b6813eb202cc18d1c5391280
 DIST openrc-0.13.1.tar.bz2 135712 SHA256 c2eeea257aa8b6b614fa69a73dd1dbc8b8a0a80e283a73e12356c212414540f6 SHA512 01e92c213cd9cda8f6d16b5428c63338f836dd047d2dd6032f37dd192a791b05be7233c20210219b594d4ef8b0851f7f64f04503e484a577f085991028d30b36 WHIRLPOOL 4f61a8a97ad53eeb8af0796ae2460538598d3f8f7ac6938f55ed454753a2e6542fef818e832d4a667dd1a924981383c87c7805ee2ea1d77b31a6fe9132616523
 DIST openrc-0.13.2.tar.bz2 141784 SHA256 6552cbc58f86ad6cb680c3ee5544ced1865bee8edb3543473eccc6aeaaf47855 SHA512 e4209691136cbe7bb66c4b0a927c416afe54ae1fbf9678d51b5766e6dab51ab7f59ccdf16e6b375e97c53707f486b6e19b49a27b762ad6fd3eecac391033e801 WHIRLPOOL 7e2bfe3f3fc17aaa9a8a8cb0f7294e16d80eba256ed1e40fb2e4075af25b4c196f22a132e6aeab386bd31077529cd5feaeb23e07a851ab51af4a4d68f1bc0047
-EBUILD openrc-0.12.4.ebuild 10528 SHA256 a205628a178892ca3887da9141c7bcb7a30bc7088112eca814f799a54eb11b1a SHA512 4b421e32a867754007cc077f21b9c254a80cfae82f10ea43f548d0e48bffea12c2b36982c495ab176517ce4cd53a182f27883ed3e729939a33b5610e1d6bfcdd WHIRLPOOL bed8ab46f3f04f29adaabf4c1be678f193397ead232fe6f952b6d8e5d95fc6fecb2a08e31ae54374451a2f53ffbb2204e3071efa870b96013ddde860c4085c68
-EBUILD openrc-0.13.1.ebuild 10626 SHA256 e4595aef0a69cfba948ad6ed32b720abd06b96e35380a5272833714887cf5659 SHA512 ebfc13b1b949471b3b80937c6704ad95fd78f614a76351228cf6ad4d7fd4b2f39fa1e04d8b96f26289f55ff3059fb68edc2acd9e6589044a9b0bec69860007d1 WHIRLPOOL 2a84a29c08daafe67b21c60a0a4efb5f92e3aa881772995e8d4773fc981a2720a993daf7e997a9dafc277e5b515d9f4e92255d713157c850691079c05438557f
+EBUILD openrc-0.12.4.ebuild 10526 SHA256 ab99de60778f73bbd9586baee6076a89d9940e75132ece301800b3503b890199 SHA512 7c5f845188914577e227acb1a4a12683a2ee02c0629480ca0d9424f0270ec0108a05008dadb277887eca0cf9294bdb30cf5bc1daa6563c573a69b59ef98c60e8 WHIRLPOOL faa90225269168bda71f7bd91f676cf285ac7ebde5b4f8dcda4b52a1a5189a3de808d2f1bee11474f39df520d331644f0bc92f866e74d21fa51507d5856b80fe
+EBUILD openrc-0.13.1.ebuild 10639 SHA256 809d365303800e8d328167bbe38ede56dea33909373ddbb2bb4613f61b7ccd16 SHA512 82b2a6555ab816c03737b3460541ac37e38cf4001853fda4bc4210ee17be0d2c8572da385edd4a9935f148f505d169d8f34eaf7f3d7e60b0d3b03c69597c2787 WHIRLPOOL 064ebc4249bcd134b726a01b0869ac71f9eb17ba163675895e102b5e28e05f821de035a0a74a99f29ad457f73f99ddb8c1c74e6b8c929aef5cd59b7b1ad7ca25
 EBUILD openrc-0.13.2.ebuild 10676 SHA256 21b191d0509672629d87b6f924622b5ac913e8e0fe4540cb560557b7e41ab0f9 SHA512 d5796d0058342d8bada81b2922f0a6351aa09aef22fb03f1555e333acd23f66f2013f958a8cd81fd9216274ae41522fb5dd60f8e7c2415a0678af75b6bec17e8 WHIRLPOOL e300d0bcb215ce42ef052ce0b85cad1dd2b1aa1bf55399978374a5bab72a79b35af99bac0a35ceb5f148ee98c6d6163ae00f9b24c076606c03b338ca36e64e69
-EBUILD openrc-9999.ebuild 10676 SHA256 0c64f4c90f71b5c60616e3d05d9aa119ebf5a93d885fe52a9d21a5c7e046c488 SHA512 910ca280574907a64d7127645555d598d2cd971881412dd2d6f4401c6dc49ee1c2b0d42ffef035688b666143284a16fdef1710914f58d0bbe721b89b7f1e0133 WHIRLPOOL 4328fd65f36ad66d097dff4d46e4aeedfe56f99a8a0e756025082bc6c80a69a65dd3751386db936d86fd46fe3e0bf1cc9804ed31ce39ce04279d2cf768507b52
-MISC ChangeLog 50970 SHA256 65c9ee845466f64169f3a08fded186e2350e703b27a002a5dff6c44f3b42dc7a SHA512 af9618261d14d99ecd773a3ecdaff4a44fb39b8c769b4217f5a7ee16aeb20f6a1b79136b6f257cefb01a8dd23f1d19c37834638f408f0d73c8c55e9692ad15c0 WHIRLPOOL b1d295feffb9583666e305b7dc00bf5bc6fc70601e29af69c0607557be2499ff2ac9b8bd9fc1b60a964e6158355c26255343a7585ebbc9f94236e07d324513a8
-MISC metadata.xml 373 SHA256 02f4a9ad32e00c6c046a55dd14949c4b5a3b9a8f5d4725aa07c698c107bbc1cf SHA512 80d1f2a14cddd37e7d8866ff556c753e631eca6239c0474f8a067bf387778e702a8d15152b1324744110b2f5972c2e2858eb195f8448001f322e19acc589e033 WHIRLPOOL 8a8176f52fd07682ee407923e956962ded7ce45f1b9b535e80b84195f6407954f504c44dc1b0f2cb2af8ed8a84a1e8b4cd5dc956163431c59bbc1f7785fb9151
+EBUILD openrc-9999.ebuild 10774 SHA256 4ba73d545afb4298ed653593b3e3018dc1c277ba9bed8600018bd1d758758699 SHA512 6d9da38500cc4663cfa114308976d3070f9b210c75bad41009b27ccb5d707fe45d197f4bb36797cbf77a1cecf5228dad106b817b77c001c8eda996633173747b WHIRLPOOL 724f2d7485418ae1537a566139e948a714892a9d6fb47fab4e36973eabedffdbfa8cc8da525fd36ce4cbebacdf67ecc78ca804bc3c8e4c0e54075e82de3db331
+MISC ChangeLog 51186 SHA256 009f348ce45b1fb86dda2f9f8d9647e5b30d37bef765e18d088e4afe6c956605 SHA512 8608a13c7933390d6657646bbf7ca567ddeccd706bd2575a83fd8543ea67c9b92a249fb83ffbd10a1458137434960d6ce7fa3845fb74084506064ed20aaf6d5b WHIRLPOOL b75a5f80c47f3b5439086fe61dc045f5acc9ba53a229be662740458bfc9dcd41ddbfd8cb4c18d2752ff9a87f775d7834a7003de26704a4a81a52bd1aa7a4d457
+MISC metadata.xml 442 SHA256 f823e0d3ab1b90455d2cee346582ab02c3ad2746a09a6f1ab0879ebd6d62ceff SHA512 9ab114930529ee9d146de58e3d330ec049462fcda9cf7e8627e8f5f0bc86276b0c07015d0c5758987732d09e007464849d4ee4c464c9af732fda53c125d0685e WHIRLPOOL 5339a9d7f49dc292f5cff108e576ace3492d9c685df98530a14041c41d809ef141b6785717e56ede7a63928a589cc01883b724854ba159735aab9787dea1efe3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlRP0hcACgkQblQW9DDEZTh/MACgjKNZTkW7xeg1goKkhlYlK9J+
-DtsAnR2fPJ92DINvibr9WnpVAWMDQvlz
-=jnkW
+iQIcBAEBCAAGBQJUVf9qAAoJEC7dUkA7aK9HiAMQAJVUPC+T+xX8Yj0qUj1KzyIH
+F1L1bp+fnJnnOF6XE6FZ6lXMydyf3aWhcF6T0rBzHPBaTT+FncMCUlhF7axnBbnW
+pIRQNZOlRtWYJSVEHtAIjJGcs+gZDw8scsnZ3TqYWwe1ce7xZpzCJuhiqeW4/HCi
+C46/VdpFG5VC20AlP+SdkGWIx6MSxAZ7o5BPtUKeYI8fVrYf/48RkPgFo5reroSl
+/ej6NmGHGJ7c1b8maKgA/8F4jDz5mqb2TdSt3ZvRxAg9JlucxIxYhCUICVXFjVdn
+wrDXjZrCcWs2Dhnv1RAcKo8PDe0KW605OMCneEqhFqyF50K5BTMqA6ek9kmhvlgI
+QaAI/IlvLf0Jffwvv0CyWRC7/2Bs6jAMQHTlos2fjH3is8UsNjUK4nmP5fZFOoe1
+3l2ongBNVB3bQF2nPmDH/W0arXFFQjrB0JuPRhYxEe1Kzw9z2wPE413EYzoV7lMb
+3eHBeCS7/khs4dZq/KSEwcOhtZftiz1GTYqVvPBaNKEJqiKX/BaiJShxs9AqUeT6
+2Re5rneLPGJ1pCkzDe8rqn4Jn04w4189O8AJO7dPuMfZ2HgtteIv6zYxBTSCVGtp
+rxzG6zvGmm+4oM7Xl83eicO+gX6mZ3nz+gHFrkrfqw2slKxifhczAM5hFhgn3/Y8
+a1UbzDhdwNPfgOJlQ/6z
+=egZE
 -----END PGP SIGNATURE-----
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