1 |
commit: 34f28b3ae184827b97c84ef8f626217386a10ce5 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 1 07:38:10 2011 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 1 07:38:10 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=34f28b3a |
7 |
|
8 |
sys-apps/systemd: Sync with gx86, switch to unifdef-live, make autofs4 optional (suggested). |
9 |
|
10 |
(Portage version: 2.2.0_alpha41_p36/git/Linux x86_64, signed Manifest commit with key 42B9401D) |
11 |
|
12 |
--- |
13 |
sys-apps/systemd/Manifest | 12 ++++++------ |
14 |
sys-apps/systemd/systemd-9999.ebuild | 25 ++++++++++++++++++++----- |
15 |
2 files changed, 26 insertions(+), 11 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest |
18 |
index 89e7730..4720e00 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: SHA256 |
24 |
|
25 |
-EBUILD systemd-9999.ebuild 3625 RMD160 288ca11347ab2385a0763fee22901dd9d602b28d SHA1 3503f5d7cb56d9041fea5279e0080b6d1d63de3e SHA256 91d4f23952c1fa0002a3e8d378a9e8039b3cb56116ff62f2a2a4e5acf12e5553 |
26 |
+EBUILD systemd-9999.ebuild 3853 RMD160 304433f01d74aa6910902606c0df92b145da804c SHA1 e94f4034a6fcaac796778b7c4b2c49f47c49cbe1 SHA256 a9c60ecda8cd7985527fa207b8e9c104b7297a34f8378697aa9398b579a4d0f1 |
27 |
MISC metadata.xml 524 RMD160 d51fb3f45aefd84a637f2f67cead553e12d389ab SHA1 4f86cab283737af9e58633d466e2588d80bec18c SHA256 0ee1c96fc4604189104897c95e2ded166e55be2e04af40523b2afb5564dbbe33 |
28 |
-----BEGIN PGP SIGNATURE----- |
29 |
Version: GnuPG v2.0.17 (GNU/Linux) |
30 |
|
31 |
-iJwEAQEIAAYFAk4F/xsACgkQfXuS5UK5QB0EmAP/Z3AjSmI72W0mrPWqO9U3x7+f |
32 |
-ymcuINbZW3Oin2G2CHsLaA6qv4UtRXjGI4bw6Nw9QZed/eIKYADiFoa8yYPUtjKB |
33 |
-7n8Ql7j/skt7Uc+YovKryJfb0HduF6gqxVt3SOEqEcLDylbBTbNeadjtssz3nTS2 |
34 |
-8igJhx9Sam7Rh6k7y1c= |
35 |
-=HVaN |
36 |
+iJwEAQEIAAYFAk4NeWIACgkQfXuS5UK5QB14lAQAjzv2/HfylbVTWhBeUcVRYnnP |
37 |
+MOXJoCqb2npxspW/VijaVTEnoIA5N85WvIjjMu5ZG/bW4m9+Xogr4vLxCmzYiC/v |
38 |
+M/O7OUgpJfxLw7GU0cC121BGBCNJoZw1AVy9dJO4XeaucPEvEtF400anIIPhM0Cx |
39 |
+bs7Uzocgt6MMw0n3d4U= |
40 |
+=6eHj |
41 |
-----END PGP SIGNATURE----- |
42 |
|
43 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
44 |
index 05bc5d7..d9f0bc3 100644 |
45 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
46 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
47 |
@@ -4,17 +4,21 @@ |
48 |
|
49 |
EAPI=4 |
50 |
|
51 |
+inherit autotools-utils bash-completion linux-info pam systemd |
52 |
+ |
53 |
+#if LIVE |
54 |
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN} |
55 |
http://cgit.freedesktop.org/${PN}/" |
56 |
-inherit autotools autotools-utils bash-completion git-2 linux-info pam systemd |
57 |
+inherit autotools git-2 |
58 |
+#endif |
59 |
|
60 |
DESCRIPTION="System and service manager for Linux" |
61 |
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" |
62 |
-SRC_URI="" |
63 |
+SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2" |
64 |
|
65 |
LICENSE="GPL-2" |
66 |
SLOT="0" |
67 |
-KEYWORDS="" |
68 |
+KEYWORDS="~amd64 ~x86" |
69 |
IUSE="audit cryptsetup gtk pam plymouth selinux tcpd" |
70 |
|
71 |
COMMON_DEPEND=">=sys-apps/dbus-1.4.10 |
72 |
@@ -47,14 +51,21 @@ RDEPEND="${COMMON_DEPEND} |
73 |
!!sys-apps/systemd-udev |
74 |
!<sys-apps/openrc-0.8.3" |
75 |
DEPEND="${COMMON_DEPEND} |
76 |
- app-text/docbook-xml-dtd:4.2 |
77 |
gtk? ( dev-lang/vala:${VALASLOT} ) |
78 |
>=sys-kernel/linux-headers-${MINKV}" |
79 |
|
80 |
+#if LIVE |
81 |
+SRC_URI= |
82 |
+KEYWORDS= |
83 |
+ |
84 |
+DEPEND="${DEPEND} |
85 |
+ app-text/docbook-xml-dtd:4.2" |
86 |
+ |
87 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
88 |
+#endif |
89 |
|
90 |
pkg_pretend() { |
91 |
- local CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6" |
92 |
+ local CONFIG_CHECK="~AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6" |
93 |
linux-info_pkg_setup |
94 |
kernel_is -ge ${MINKV//./ } || die "Kernel version at least ${MINKV} required" |
95 |
} |
96 |
@@ -65,8 +76,12 @@ pkg_setup() { |
97 |
} |
98 |
|
99 |
src_prepare() { |
100 |
+ # Force the rebuild of .vala sources |
101 |
+ touch src/*.vala || die |
102 |
autotools-utils_src_prepare |
103 |
+#if LIVE |
104 |
eautoreconf |
105 |
+#endif |
106 |
} |
107 |
|
108 |
src_configure() { |