Add openrc use flag to control dependency on sys-fs/udev-init-scripts, bug 464502.

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 13 insertions, 7 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index dda5456ff58d..1266f9b511cd 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.112 2013/04/05 11:00:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.113 2013/04/06 01:39:15 floppym Exp $
+
+  06 Apr 2013; Mike Gilbert <floppym@gentoo.org> metadata.xml,
+  systemd-200-r1.ebuild, systemd-9999.ebuild:
+  Add openrc use flag to control dependency on sys-fs/udev-init-scripts, bug
+  464502.
 
   05 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-200-r1.ebuild,
   systemd-9999.ebuild:
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 04f7dcb34cf6..5e0d9d6bee4e 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -14,6 +14,7 @@
 		<flag name="gudev">enable libudev gobject interface</flag>
 		<flag name='http'>Enable embedded HTTP server in journald</flag>
 		<flag name='kmod'>Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
+		<flag name='openrc'>Depend on <pkg>sys-fs/udev-init-scripts</pkg></flag>
 		<flag name='qrcode'>Enable qrcode output support in journal</flag>
 		<flag name='vanilla'>Disable Gentoo-specific behavior and compatibility quirks</flag>
 	</use>
diff --git a/sys-apps/systemd/systemd-200-r1.ebuild b/sys-apps/systemd/systemd-200-r1.ebuild
index beaa83e5d07c..cc66e3b9e84c 100644
--- a/sys-apps/systemd/systemd-200-r1.ebuild
+++ b/sys-apps/systemd/systemd-200-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-200-r1.ebuild,v 1.2 2013/04/05 11:00:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-200-r1.ebuild,v 1.3 2013/04/06 01:39:15 floppym Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="acl audit cryptsetup doc gcrypt gudev http
-	introspection +kmod lzma pam python qrcode selinux static-libs
+	introspection +kmod lzma openrc pam python qrcode selinux static-libs
 	tcpd vanilla xattr"
 
 MINKV="2.6.39"
@@ -42,7 +42,7 @@ COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
 	>=sys-apps/baselayout-2.2
-	>=sys-fs/udev-init-scripts-25
+	openrc? ( >=sys-fs/udev-init-scripts-25 )
 	|| (
 		>=sys-apps/util-linux-2.22
 		<sys-apps/sysvinit-2.88-r4
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 55c53b9bf602..cee86a730b71 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.40 2013/04/05 11:00:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.41 2013/04/06 01:39:15 floppym Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="acl audit cryptsetup doc gcrypt gudev http
-	introspection +kmod lzma pam python qrcode selinux static-libs
+	introspection +kmod lzma openrc pam python qrcode selinux static-libs
 	tcpd vanilla xattr"
 
 MINKV="2.6.39"
@@ -50,7 +50,7 @@ COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
 	>=sys-apps/baselayout-2.2
-	>=sys-fs/udev-init-scripts-25
+	openrc? ( >=sys-fs/udev-init-scripts-25 )
 	|| (
 		>=sys-apps/util-linux-2.22
 		<sys-apps/sysvinit-2.88-r4