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

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

commit:     7a5750b78c772c7b60ba91a02c4cba44f3080eec
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 18:14:40 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May  3 18:14:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=7a5750b7

sys-apps/systemd: Bump to EAPI=4, do kernel checks in pkg_pretend().

(Portage version: 2.2.0_alpha30_p40/git/Linux x86_64, signed Manifest commit with key 05DE07BB)

---
 sys-apps/systemd/Manifest            |    8 ++++----
 sys-apps/systemd/systemd-9999.ebuild |   12 +++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index ac8047e..73dbe27 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -3,12 +3,12 @@ Hash: SHA1
 
 DIST systemd-25.tar.bz2 784742 RMD160 da63a9a28e844e74a1000a8ec32c3afaf7929924 SHA1 24981d944b52337741ed1144ded54dd06c18ea3b SHA256 626992eeb8636e81b87f190cb58e80fd82cb7e29cf335a119be425034e9a4d6c
 EBUILD systemd-25.ebuild 3300 RMD160 5fbfa4ca8a99fee953da1b91d7fbe30d6b0ee106 SHA1 118914affbc9fff6d1149bc10c96765c7d219d4f SHA256 669bf7f7e2cde0e63baf8ed4181c260df14fa20efe75dece5f62a6f646a209aa
-EBUILD systemd-9999.ebuild 3374 RMD160 1826074e47e8c8492f8264fef0eaf1819bf233e2 SHA1 36e01bb56859216236c46261cad3864ab3b4d7ed SHA256 f6e7d36d0e1c54400a47943cc1bf513992f290a94b28f97e3e98cde881d9369f
+EBUILD systemd-9999.ebuild 3354 RMD160 c94518354b38b52aed9084b7a296aac5e733665d SHA1 0378f1d04833fb902d9a98fa16ffa1bfdbcef925 SHA256 4d09583f1d2f1049fdb0c031d6c4b5de31b8cf18c7fe67fb05cf9c2c5706e6fa
 MISC metadata.xml 346 RMD160 0a87c8fe5dab7495fbe54aac0bbefa83a05ac451 SHA1 b3a588f46564c9dc4dc186c7e6d8a31c37d2bbfd SHA256 1ea5b2ad74881e6dec7d2ff29067cd6fced2dd838cc3bdec3638971e80c5870d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk23978ACgkQnGSe5QXeB7voGQCfX1pFXhX5ONlhtgMj1uXbrPTc
-ErUAn0PLnDziINMeieLSRHSSwnsDlM6Y
-=080X
+iEYEARECAAYFAk3ARhAACgkQnGSe5QXeB7uaMACeJHbXapjV3+W6LLcbemBDPLSV
+vtMAnj9dd8UwjCz/2i8A1datZmgRyMg0
+=0/XW
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 9d73b3e..c06501c 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=4
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/systemd"
 inherit autotools autotools-utils git-2 linux-info pam
@@ -44,8 +44,11 @@ DEPEND="${COMMON_DEPEND}
 CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
-pkg_setup() {
+pkg_pretend() {
 	linux-info_pkg_setup
+}
+
+pkg_setup() {
 	enewgroup lock # used by var-lock.mount
 	enewgroup tty 5 # used by mount-setup for /dev/pts
 }
@@ -79,7 +82,7 @@ src_configure() {
 src_install() {
 	autotools-utils_src_install
 
-	dodoc "${D}"/usr/share/doc/systemd/* || die
+	dodoc "${D}"/usr/share/doc/systemd/*
 	rm -rf "${D}"/usr/share/doc/systemd
 
 	cd "${D}"/usr/share/man/man8/
@@ -91,8 +94,7 @@ src_install() {
 	# This a temporary workaround for gx86 packages.
 	rm -f "${D}"/usr/share/pkgconfig/systemd.pc
 
-	# XXX: maybe /var/run ?
-	keepdir /run || die
+	keepdir /run
 }
 
 check_mtab_is_symlink() {