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

[Michał Górny]

commit:     8430dce5bad88290bb9b9c0a71ff64adef15503c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 07:15:51 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 07:15:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=8430dce5

sys-apps/systemd: Move kernel checks to pkg_preinst().

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

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

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index ef56818..9b8a156 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD systemd-9999.ebuild 4066 RMD160 19a25459d2a04983621343817a35327a92a48922 SHA1 edcd9c4658e96f194632a2e1720cc248fe048b18 SHA256 6eecbea970905e70e26b25138b5d7c4c47f58c8fe40f72c5c7252071907f7c97
+EBUILD systemd-9999.ebuild 4082 RMD160 0da0346e9f8d3008fa253bd33809ed38fd545454 SHA1 065ab4d289c0e2f09f2c2107407cef6963fd1cb4 SHA256 744701d13146f7b4e3dd198a444657f67aa6ca2f7eabc8a1cb7438ee1214fcb4
 MISC metadata.xml 524 RMD160 d51fb3f45aefd84a637f2f67cead553e12d389ab SHA1 4f86cab283737af9e58633d466e2588d80bec18c SHA256 0ee1c96fc4604189104897c95e2ded166e55be2e04af40523b2afb5564dbbe33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk4gHFcACgkQfXuS5UK5QB0XrAP/fPEoMHHx69uF2gjPMNj/xYYm
-PzDdr77ajznUbXH5BI79osSiepKYPjlW11DNMsJQ0CfeM4PfEXVCJaCN9ytIwPGo
-s6MmZskuCdFu8aJwRqDM2qcE/NQCH4vAfIw9U+xEo377fDrmir0Vz4oEdkYr+eRj
-09S+KhpdavMkI7IDrxs=
-=foA7
+iJwEAQEIAAYFAk4vuycACgkQfXuS5UK5QB1KbQQArtw3YO4IdVDrwxvTmMgD4ssE
+z/VgLUBXCszMGTOdFSzlVhD6/KCXHgBB4heBEyYfZn2qMapkb/PHVFrQpgY2Fdrd
+aaSucSm1Ztm/JFLdROhh7YkNGsn+AaEVb1DyF6daDRAzhuLhxTcQ2LS7+VgYyTEM
+NLR73727gjJU8/yl4b8=
+=Bi3e
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 7f4fd22..2703d86 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -64,10 +64,6 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 #endif
 
 pkg_setup() {
-	local CONFIG_CHECK="~AUTOFS4_FS ~CGROUPS ~DEVTMPFS ~FANOTIFY ~IPV6"
-	linux-info_pkg_setup
-	kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required"
-
 	enewgroup lock # used by var-lock.mount
 	enewgroup tty 5 # used by mount-setup for /dev/pts
 }
@@ -121,6 +117,12 @@ src_install() {
 	keepdir /run
 }
 
+pkg_preinst() {
+	local CONFIG_CHECK="~AUTOFS4_FS ~CGROUPS ~DEVTMPFS ~FANOTIFY ~IPV6"
+	kernel_is -ge ${MINKV//./ } || ewarn "Kernel version at least ${MINKV} required"
+	check_extra_config
+}
+
 optfeature() {
 	elog "	[$(has_version ${1} && echo I || echo ' ')] ${1} (${2})"
 }