[gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/

["Michał Górny" <mgorny@gentoo.org>]

commit:     16a3fccdbd45c81eb4b609ea0cc3d10bf1eba5bb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 06:44:08 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 06:44:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=16a3fccd

sys-apps/systemd: Update the deps for in-tree inclusion.

(Portage version: 2.2.0_alpha37_p23/git/Linux x86_64, signed Manifest commit with key 42B9401D)

---
 sys-apps/systemd/Manifest                          |   14 +++++++-------
 .../{systemd-28.ebuild => systemd-28-r1.ebuild}    |   17 ++++++++++++-----
 sys-apps/systemd/systemd-9999.ebuild               |   17 ++++++++++++-----
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 36febf3..8fcdb71 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA256
 
 DIST systemd-28.tar.bz2 810357 RMD160 0d91101b158af98cbd7d9be35f5a9dae51d565fc SHA1 8c8e04f4577afcc7fa5f28205d581594fe69367b SHA256 dd11cc85b2f2afc8094cefb47af519d5a03a9ec1abce0fb82bc19d48fa471b33
-EBUILD systemd-28.ebuild 3386 RMD160 dcb4593cd1337dea0e587851d346a137d611668e SHA1 b9cb0bf74246ddfb0bcd224a48b5684ff87ab453 SHA256 5b81c828d02f29ffcdf6cf2568628e12f3edc464f0371427b1919233b009940a
-EBUILD systemd-9999.ebuild 3495 RMD160 b0d15d4f8baa1263f6d7ef3526d0d0a63147768e SHA1 84cbe9deac0ab79c3890ed62da1d58c01c8eb977 SHA256 5896e0b4dfdefcbe6ed2a16a3c8a66d5e3ef3abd0a680dfaf71bea982977fc4c
+EBUILD systemd-28-r1.ebuild 3704 RMD160 34a3cf887e73fc580c64cfac82c5d71fddde7132 SHA1 77f3e905d85428130f76c6c39b724b10423f7365 SHA256 ebff12228ad1aeacc25432f5706b31cad420111ef048ff3568bf79fa928d11bf
+EBUILD systemd-9999.ebuild 3813 RMD160 850f2d314cf55839da56f12dfa59faeffdd99d4f SHA1 253ebd40cc43f8b42313af4c2bb7312a798ce790 SHA256 cc024c0cf9f1b60f96b8123a42855f353ed9e5fb303bfd832d4777be5e9c3511
 MISC metadata.xml 346 RMD160 0a87c8fe5dab7495fbe54aac0bbefa83a05ac451 SHA1 b3a588f46564c9dc4dc186c7e6d8a31c37d2bbfd SHA256 1ea5b2ad74881e6dec7d2ff29067cd6fced2dd838cc3bdec3638971e80c5870d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk3falEACgkQfXuS5UK5QB04OwP/aAFtPxOdZE3AnDmiCyTiGuKC
-K3cAsn9MmSSXIX6J4u4XGLCQqW8F+yaMgn07Oe2Ae4TnLsy8H2qa5oQKngbbRc/G
-hndZPmieCDjV9TNd59XJg7sULe5Vg7MuM9/hpBhOAjJvA/N5mFuzXUr5M6wLCUZD
-aE+pdxn65Myc+jM3Vto=
-=RqH1
+iJwEAQEIAAYFAk3sdzgACgkQfXuS5UK5QB0svQP/bOjqs6ZCuYT1nsObOf07J5mg
+zGPecK+PNmFSLIdVZDMtvPhUygYEB3iZAgHl6mENeD0KTLzKcN4rHe2H1YzbE5Ww
+SZDvjzXAQC6arvtT8fE4Vjx3ByTmerweU7slx/n1ZUV25NA4RGtEK1AXa5+EtfwC
+56zv+ZvHaRIq/o9PCyU=
+=Pnuj
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/systemd/systemd-28.ebuild b/sys-apps/systemd/systemd-28-r1.ebuild
similarity index 87%
rename from sys-apps/systemd/systemd-28.ebuild
rename to sys-apps/systemd/systemd-28-r1.ebuild
index 0397644..2da53e9 100644
--- a/sys-apps/systemd/systemd-28.ebuild
+++ b/sys-apps/systemd/systemd-28-r1.ebuild
@@ -17,9 +17,10 @@ IUSE="audit gtk pam selinux tcpd"
 
 # XXX: libcryptsetup
 
-COMMON_DEPEND="sys-apps/dbus
+COMMON_DEPEND=">=sys-apps/dbus-1.4.8-r1
+	>=sys-fs/udev-171
+	>=sys-apps/util-linux-2.19
 	sys-libs/libcap
-	>=sys-fs/udev-160
 	audit? ( sys-process/audit )
 	gtk? (
 		dev-libs/dbus-glib
@@ -28,15 +29,21 @@ COMMON_DEPEND="sys-apps/dbus
 		>=x11-libs/libnotify-0.7 )
 	pam? ( virtual/pam )
 	selinux? ( sys-libs/libselinux )
-	tcpd? ( sys-apps/tcp-wrappers )
-	>=sys-apps/util-linux-2.19"
+	tcpd? ( sys-apps/tcp-wrappers )"
 
 # Vala-0.10 doesn't work with libnotify 0.7.1
 VALASLOT="0.12"
+# A little higher than upstream requires
+# but I had real trouble with 2.6.37 and systemd.
 MINKV="2.6.38"
 
+# dbus, udev versions because of systemd units
+# blocker on old packages to avoid collisions with above
+# openrc blocker to avoid udev rules starting openrc scripts
 RDEPEND="${COMMON_DEPEND}
-	sys-apps/systemd-units"
+	!!sys-apps/systemd-dbus
+	!!sys-apps/systemd-udev
+	!<sys-apps/openrc-0.8.3"
 DEPEND="${COMMON_DEPEND}
 	gtk? ( dev-lang/vala:${VALASLOT} )
 	>=sys-kernel/linux-headers-${MINKV}"

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 9d3974f..5b738f3 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -19,9 +19,10 @@ IUSE="audit gtk pam selinux tcpd"
 
 # XXX: libcryptsetup
 
-COMMON_DEPEND="sys-apps/dbus
+COMMON_DEPEND=">=sys-apps/dbus-1.4.8-r1
+	>=sys-apps/util-linux-2.19
+	>=sys-fs/udev-171
 	sys-libs/libcap
-	>=sys-fs/udev-160
 	audit? ( sys-process/audit )
 	gtk? (
 		dev-libs/dbus-glib
@@ -30,15 +31,21 @@ COMMON_DEPEND="sys-apps/dbus
 		>=x11-libs/libnotify-0.7 )
 	pam? ( virtual/pam )
 	selinux? ( sys-libs/libselinux )
-	tcpd? ( sys-apps/tcp-wrappers )
-	>=sys-apps/util-linux-2.19"
+	tcpd? ( sys-apps/tcp-wrappers )"
 
 # Vala-0.10 doesn't work with libnotify 0.7.1
 VALASLOT="0.12"
+# A little higher than upstream requires
+# but I had real trouble with 2.6.37 and systemd.
 MINKV="2.6.38"
 
+# dbus, udev versions because of systemd units
+# blocker on old packages to avoid collisions with above
+# openrc blocker to avoid udev rules starting openrc scripts
 RDEPEND="${COMMON_DEPEND}
-	sys-apps/systemd-units"
+	!!sys-apps/systemd-dbus
+	!!sys-apps/systemd-udev
+	!<sys-apps/openrc-0.8.3"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.2
 	gtk? ( dev-lang/vala:${VALASLOT} )