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

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

commit:     5df8f13d7ca443f85f7a0f5e06eead43d7757b42
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 20:44:06 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May  3 20:44:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=5df8f13d

sys-apps/systemd: Version bump, sync with live ebuild.

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

---
 sys-apps/systemd/Manifest                          |   10 +++++-----
 .../{systemd-25.ebuild => systemd-26.ebuild}       |   20 ++++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 5a8da88..192edd5 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
+DIST systemd-26.tar.bz2 791117 RMD160 06836ca8daf0c5ebc113940357289348561dac56 SHA1 901486904aeb1d8a3ae20e5971afd9b42b847450 SHA256 d7a222c09cdb0a9eebe97c7c499c458cc29ef8b3b2d0ca79bb949b2fd3d077d3
+EBUILD systemd-26.ebuild 3386 RMD160 dcb4593cd1337dea0e587851d346a137d611668e SHA1 b9cb0bf74246ddfb0bcd224a48b5684ff87ab453 SHA256 5b81c828d02f29ffcdf6cf2568628e12f3edc464f0371427b1919233b009940a
 EBUILD systemd-9999.ebuild 3461 RMD160 6b9cdacbb4169cee9bd110ba85788a4b8d6613c0 SHA1 cd266a9723212be6c09eae7456990cbd0b08c564 SHA256 7f988ebd8c6746451af61ae02c6aab292eb11206f887f8d2fb5cc043a2833300
 MISC metadata.xml 346 RMD160 0a87c8fe5dab7495fbe54aac0bbefa83a05ac451 SHA1 b3a588f46564c9dc4dc186c7e6d8a31c37d2bbfd SHA256 1ea5b2ad74881e6dec7d2ff29067cd6fced2dd838cc3bdec3638971e80c5870d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3AZ2gACgkQnGSe5QXeB7v86ACfVBfKAOg43Caq2IHTeUK+8kRw
-NrAAoL9/9qheua+7ppIdGgdPWvRGNfn/
-=9c3O
+iEYEARECAAYFAk3AaRYACgkQnGSe5QXeB7unpACdG060s+rypOh1LWVpgT49PzZI
+eRMAn1LBTn8mS4ME/z9cyhDFnQ6wK98F
+=UfKq
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/systemd/systemd-25.ebuild b/sys-apps/systemd/systemd-26.ebuild
similarity index 90%
rename from sys-apps/systemd/systemd-25.ebuild
rename to sys-apps/systemd/systemd-26.ebuild
index 041aac7..0397644 100644
--- a/sys-apps/systemd/systemd-25.ebuild
+++ b/sys-apps/systemd/systemd-26.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=4
 
 inherit autotools-utils linux-info pam
 
@@ -33,16 +33,21 @@ COMMON_DEPEND="sys-apps/dbus
 
 # Vala-0.10 doesn't work with libnotify 0.7.1
 VALASLOT="0.12"
+MINKV="2.6.38"
+
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/systemd-units"
 DEPEND="${COMMON_DEPEND}
-	gtk? ( dev-lang/vala:$VALASLOT )
-	>=sys-kernel/linux-headers-2.6.32"
+	gtk? ( dev-lang/vala:${VALASLOT} )
+	>=sys-kernel/linux-headers-${MINKV}"
 
-CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
+pkg_pretend() {
+	local CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
+	linux-info_pkg_setup
+	kernel_is -ge ${MINKV//./ } || die "Kernel version at least ${MINKV} required"
+}
 
 pkg_setup() {
-	linux-info_pkg_setup
 	enewgroup lock # used by var-lock.mount
 	enewgroup tty 5 # used by mount-setup for /dev/pts
 }
@@ -75,7 +80,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/
@@ -87,8 +92,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() {