Depend on baselayout to handle /run. Remove old warnings.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

3 files changed, 23 insertions, 26 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index a894d64bda2b..74058ba97a05 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,9 @@
 # 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.96 2013/03/26 16:24:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.97 2013/03/26 16:35:45 mgorny Exp $
+
+  26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild:
+  Depend on baselayout to handle /run. Remove old warnings.
 
   26 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd-198-r5.ebuild,
   systemd-9999.ebuild:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 1d2bca2eb0f4..cc6448b5f178 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -16,25 +16,25 @@ DIST systemd-198.tar.xz 2140964 SHA256 444492355e5ff0ad99e0691ecaff1081ee8d45901
 EBUILD systemd-197-r1.ebuild 6496 SHA256 0069c8127574ee382c55b790a3ef807c1db064057dc7ab9a24aec195e8907aa5 SHA512 ce8fdb78c5cce5e34474b12e29bed83814746949b676025e8780206ac716c1dab863be31f3d83db02de09be00a5ac26ebe70ca2474ea2e244f4903bbd5e6871a WHIRLPOOL 2f316c077c6fa23d02e12985131a915947aac265009094ff851d65cc403ca10aefbc8c3f3b6ced4ce6f9c551f52223ca01ec46545bc4b3cccd78633c04534dc1
 EBUILD systemd-198-r1.ebuild 6869 SHA256 bd68d6866eed550d86f04c1f365caf2256fb9f552711073864833599a55eb632 SHA512 76394453ded9cdbf364f79c0e1426ee575b3ad88e38dc53661db0ae87b03fafaaae6720c3f231340995af4db73172515e5a0fd6c997ec42d70a4edb70041eb51 WHIRLPOOL a82174d69c02fcbb6ed5c262c6a58706181f047bb306a053500f5833d3819e272282a0bf5d88ca4116e719b8cb50fefaefe105570bd4f35e26ece1caf741fa72
 EBUILD systemd-198-r5.ebuild 7203 SHA256 e919cc434b34107294156166236558170d093db7633adcb9664403b8e975cf2a SHA512 8b20498ad093a387fffc0b338fd4a48441ee38bce903e6ee41c919b4b8d9eee4b2b157aee376f880396fd5dfd01702785db50cd13ff6c11dfee82ee6fe42a850 WHIRLPOOL 7c8409b9c0ea08bc9d1021267cd0613df49d8aaa16399711e87bf6c7d30f2de4d29592ef57c6bf4d23146edbdf73231bb809176181cfc5bed489cc42dfb1e461
-EBUILD systemd-9999.ebuild 7430 SHA256 f5ccbf0bf4b5988bf82fc529d72da3f4847721e52ee91b7c669a08c42bc211c8 SHA512 75d170e7c9214e9c945c5a0e59aaa050804df5233d8ba9c20251b13bc388361bf47a9720d0c136929237e15d93132f22129ef3ea652ddbb563a9349b8999333e WHIRLPOOL 749bacb62e22c3539dbf4a3e9eb04c5c98538da62d79e710a2fc3367eb14841d1d947d7762b6c5b183939621d91294861f4121b1c8909ad80e72583e30da3642
-MISC ChangeLog 19088 SHA256 abb6d3b134c4f17c70359f854f392b41e2b6c309fc2fcb8aa9c555dfd3405ac9 SHA512 419cc283c8443d714b3dc73c55b41230ec29837f4472e7e17f0aaac01c6c94adbc6aaf0f78f59567e2b4e2e44c1e083d13d78ad8f276240961b8025f94d9897e WHIRLPOOL 6e853a8520e26ce466ed0dfb4e8a0257281247805eaef0b5926d2bdec3b7a63dde073cccf4d9c1660e0726e5b3f785fa0c97fb4bda29544530c06551383a8ddc
+EBUILD systemd-9999.ebuild 7097 SHA256 98e724b52d2a771cbd22cbb51144dbeb0639e2fcb3feaaaec74ec69fb5f8c158 SHA512 e98a537339c7b4cde309bd1ba005aae95811fb7f6795e2ef861ca260a4d7d8aaceb2e49b7f4aa150cd5738a98f38cee5e3d7b3c478d95ce7dd31729548092d90 WHIRLPOOL 14fb48872006096e9e39e326414585b06a6e360c162cfbca1fc2de3de3747f93a3e0421af3bf96535cf3968dc3e18965e380602663ed4d094b4f53271dd7251c
+MISC ChangeLog 19220 SHA256 ae504861c9ef3d27f1b5a689a69d3e701ac9a286b16e77a6429fc3af27228c39 SHA512 122d4987eb361bf9260f97803c86d94226376b7eba44bb39b147a91c92431c6fd54a51d867015dba1d69f7683a5c53dcf3f0daa1df96cc5b94160d0ea8e9c85b WHIRLPOOL 04c043e25f029a714907adb630b015e98fad7d324573228009b5d8bb55e5e94b33551232c8a16257df76d023749464043bd82fdb3f15fd05c82fc9f1cb98b613
 MISC metadata.xml 931 SHA256 62b80c12536efbf1d14d93155aa18e3af1011709efd96c66c0176300d6a468b3 SHA512 ca3eedc144f671828d3555820d4effaccd24e86dedb894fd173d044c08a4213166f2dfe6c58fb6b80cdfa79e5ab2a9a3918971b49b433947389580b75f77ad97 WHIRLPOOL fd5185112548fea3c9f3710e53e073366a2285b6e0e3d30a653db24b9e868cfb57f839ca90ffd9955e0d4b6d687e9946f01ef1f8dd3b724fd1b1197a0285bc1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRUcv5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRUc6ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDoloP/i/sp/aXFg4Cfrc2ZFiEwkJz
-V8swr8zmBMsyyzyEMRUxJuIovLgA7JEgO6lKgFYTvwznqEYrTMSLQiiPjtuEZtIw
-yng8D4dh1JWYwsDCGDVyT52P6ZuTe1hezpNJomV5BtqCqW6KEpcBvp4dElygG2HG
-qpZZqXXC51RQ8tKjEc0oKnSgFP23SDfGAEiMzLncGQ/67vSH7sGeip3d1k5JzjCp
-Qbdq7cVahTC8Mkg7oee+qNxC0pEI9YDv/LrheEtK44KCPHgH9kgkECVZzftay3Qe
-8SjUSrOuHZxBmWYyu8y+gfjfkshwHQBarYcqn2hWCv9VBlx2hjoDTqE23h2J1Tsz
-zO2Dm2P5ju7zA+ldBbbWNbmf/FtH/sPwgQcO7jwhEpQQtXJM5tHL/nGUeq7xsrh/
-IJAgB2iiDyklzxP0SD4jV/u8XifLmRJxYPN01yOzmTDIBK4nCQEr4Qkv/w65/OUe
-bgjLCGd9gSobHZrcIE2XwyG0NUmhM22R0gfzVlTdtQoXAdM1Lur7MavPs13ApNle
-Y76nbVSXT/FhpHXoxBsPwyBLTMc7MwY9dI12BQfDmL2DLCtbXKz0wK5tmvI2SE38
-jQwcs7yJBRRJldo0m/g9yj6GGTEE0OOMzNphNwonelzQcIWE/dwac9cwM2feCFY+
-FqQv3qQwIr1KoJh0PBxF
-=V/M2
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDsQMP/Rcb+fHEfzo3x+KdypB0weTB
+4kpzr/aZQ2qUgtj/TSvEV2u12QwJfWtKFvpt/rdn7rS7jZdsz11A8S/6YYjoeSps
+H8RE46bLzf13ghOVG9dmgknecXZeDEnOOOyjN2SSw7bZTSTmwJ8/Q3yoU8qC/XLT
+UrCSJoJOI7dp7qd6sTfuUH3iqDh95Ix/ptDRfiFjtY5m2sBXv8P6Od3r1r/AWuyA
+lYRyaYvOxm6Kxiw0rqOfaJEl/7577H6XJPldzn6fv/fSUaDpFLAydS4DubrWwPUz
+jysfWHd2g6HfJZB592rWi8vkb+UQ8HXcAPDVOvnDDjLOY8Mu+r4B6VfaivuSj/cb
+r8uaugDF6WdXCjJCBMkSiPntabIH3s+iMdAycvvqj5BDShvGQEYpVUuNDoJZrxyV
+l8HoOmUlVAtrxDIJnZ4vFAl6C2phXs63s43BTCE5d0DwO9roidS2mbXi9IlWhM7h
+foX0p1i7mRQJoCF0NcPjWLLg0or7iJrzUmW80og5Mg3YDNkbCenU+B1SONHQyXFf
+9RI2YxtLN/9GzmLZ6TJtAwEZyw5V58t+djL5nqQ52Gm0FdEkvHTwu+qZz2F/mdZq
+DsnLPY8F9ijO0ExzCsTpB4z2dpTxW2v59s3dMR+JB2pnX5M7vMyRkUUkqoEBK8WN
+gP7troUH+5LO+eJ+v4pA
+=hSUL
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index f06e363f8482..0dd252450ee0 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.27 2013/03/26 16:24:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.28 2013/03/26 16:35:45 mgorny Exp $
 
 EAPI=5
 
@@ -47,7 +47,9 @@ COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
 	tcpd? ( sys-apps/tcp-wrappers )
 	xattr? ( sys-apps/attr )"
 
+# baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
 	>=sys-apps/hwids-20130309-r1[udev]
 	|| (
 		>=sys-apps/util-linux-2.22
@@ -228,7 +230,6 @@ pkg_postinst() {
 	fi
 	systemd_update_catalog
 
-	mkdir -p "${ROOT}"/run || ewarn "Unable to mkdir /run, this could mean trouble."
 	if [[ ! -L "${ROOT}"/etc/mtab ]]; then
 		ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts."
 		ewarn "It is known to cause users being unable to unmount user mounts. If you don't"
@@ -241,13 +242,6 @@ pkg_postinst() {
 	elog "be installed:"
 	optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \
 		'sys-apps/systemd-ui'
-	elog
-
-	ewarn "Please note this is a work-in-progress and many packages in Gentoo"
-	ewarn "do not supply systemd unit files yet. You are testing it on your own"
-	ewarn "responsibility. Please remember than you can pass:"
-	ewarn "	init=/sbin/init"
-	ewarn "to your kernel to boot using sysvinit / OpenRC."
 }
 
 pkg_prerm() {