Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/
Date: Tue, 03 May 2011 20:44:17
Message-Id: 5df8f13d7ca443f85f7a0f5e06eead43d7757b42.mgorny@gentoo
1 commit: 5df8f13d7ca443f85f7a0f5e06eead43d7757b42
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 3 20:44:06 2011 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 20:44:06 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=5df8f13d
7
8 sys-apps/systemd: Version bump, sync with live ebuild.
9
10 (Portage version: 2.2.0_alpha30_p40/git/Linux x86_64, signed Manifest commit with key 05DE07BB)
11
12 ---
13 sys-apps/systemd/Manifest | 10 +++++-----
14 .../{systemd-25.ebuild => systemd-26.ebuild} | 20 ++++++++++++--------
15 2 files changed, 17 insertions(+), 13 deletions(-)
16
17 diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
18 index 5a8da88..192edd5 100644
19 --- a/sys-apps/systemd/Manifest
20 +++ b/sys-apps/systemd/Manifest
21 @@ -1,14 +1,14 @@
22 -----BEGIN PGP SIGNED MESSAGE-----
23 Hash: SHA1
24
25 -DIST systemd-25.tar.bz2 784742 RMD160 da63a9a28e844e74a1000a8ec32c3afaf7929924 SHA1 24981d944b52337741ed1144ded54dd06c18ea3b SHA256 626992eeb8636e81b87f190cb58e80fd82cb7e29cf335a119be425034e9a4d6c
26 -EBUILD systemd-25.ebuild 3300 RMD160 5fbfa4ca8a99fee953da1b91d7fbe30d6b0ee106 SHA1 118914affbc9fff6d1149bc10c96765c7d219d4f SHA256 669bf7f7e2cde0e63baf8ed4181c260df14fa20efe75dece5f62a6f646a209aa
27 +DIST systemd-26.tar.bz2 791117 RMD160 06836ca8daf0c5ebc113940357289348561dac56 SHA1 901486904aeb1d8a3ae20e5971afd9b42b847450 SHA256 d7a222c09cdb0a9eebe97c7c499c458cc29ef8b3b2d0ca79bb949b2fd3d077d3
28 +EBUILD systemd-26.ebuild 3386 RMD160 dcb4593cd1337dea0e587851d346a137d611668e SHA1 b9cb0bf74246ddfb0bcd224a48b5684ff87ab453 SHA256 5b81c828d02f29ffcdf6cf2568628e12f3edc464f0371427b1919233b009940a
29 EBUILD systemd-9999.ebuild 3461 RMD160 6b9cdacbb4169cee9bd110ba85788a4b8d6613c0 SHA1 cd266a9723212be6c09eae7456990cbd0b08c564 SHA256 7f988ebd8c6746451af61ae02c6aab292eb11206f887f8d2fb5cc043a2833300
30 MISC metadata.xml 346 RMD160 0a87c8fe5dab7495fbe54aac0bbefa83a05ac451 SHA1 b3a588f46564c9dc4dc186c7e6d8a31c37d2bbfd SHA256 1ea5b2ad74881e6dec7d2ff29067cd6fced2dd838cc3bdec3638971e80c5870d
31 -----BEGIN PGP SIGNATURE-----
32 Version: GnuPG v2.0.17 (GNU/Linux)
33
34 -iEYEARECAAYFAk3AZ2gACgkQnGSe5QXeB7v86ACfVBfKAOg43Caq2IHTeUK+8kRw
35 -NrAAoL9/9qheua+7ppIdGgdPWvRGNfn/
36 -=9c3O
37 +iEYEARECAAYFAk3AaRYACgkQnGSe5QXeB7unpACdG060s+rypOh1LWVpgT49PzZI
38 +eRMAn1LBTn8mS4ME/z9cyhDFnQ6wK98F
39 +=UfKq
40 -----END PGP SIGNATURE-----
41
42 diff --git a/sys-apps/systemd/systemd-25.ebuild b/sys-apps/systemd/systemd-26.ebuild
43 similarity index 90%
44 rename from sys-apps/systemd/systemd-25.ebuild
45 rename to sys-apps/systemd/systemd-26.ebuild
46 index 041aac7..0397644 100644
47 --- a/sys-apps/systemd/systemd-25.ebuild
48 +++ b/sys-apps/systemd/systemd-26.ebuild
49 @@ -2,7 +2,7 @@
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: $
52
53 -EAPI=2
54 +EAPI=4
55
56 inherit autotools-utils linux-info pam
57
58 @@ -33,16 +33,21 @@ COMMON_DEPEND="sys-apps/dbus
59
60 # Vala-0.10 doesn't work with libnotify 0.7.1
61 VALASLOT="0.12"
62 +MINKV="2.6.38"
63 +
64 RDEPEND="${COMMON_DEPEND}
65 sys-apps/systemd-units"
66 DEPEND="${COMMON_DEPEND}
67 - gtk? ( dev-lang/vala:$VALASLOT )
68 - >=sys-kernel/linux-headers-2.6.32"
69 + gtk? ( dev-lang/vala:${VALASLOT} )
70 + >=sys-kernel/linux-headers-${MINKV}"
71
72 -CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
73 +pkg_pretend() {
74 + local CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
75 + linux-info_pkg_setup
76 + kernel_is -ge ${MINKV//./ } || die "Kernel version at least ${MINKV} required"
77 +}
78
79 pkg_setup() {
80 - linux-info_pkg_setup
81 enewgroup lock # used by var-lock.mount
82 enewgroup tty 5 # used by mount-setup for /dev/pts
83 }
84 @@ -75,7 +80,7 @@ src_configure() {
85 src_install() {
86 autotools-utils_src_install
87
88 - dodoc "${D}"/usr/share/doc/systemd/* || die
89 + dodoc "${D}"/usr/share/doc/systemd/*
90 rm -rf "${D}"/usr/share/doc/systemd
91
92 cd "${D}"/usr/share/man/man8/
93 @@ -87,8 +92,7 @@ src_install() {
94 # This a temporary workaround for gx86 packages.
95 rm -f "${D}"/usr/share/pkgconfig/systemd.pc
96
97 - # XXX: maybe /var/run ?
98 - keepdir /run || die
99 + keepdir /run
100 }
101
102 check_mtab_is_symlink() {