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

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

commit:     34f28b3ae184827b97c84ef8f626217386a10ce5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 07:38:10 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 07:38:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=34f28b3a

sys-apps/systemd: Sync with gx86, switch to unifdef-live, make autofs4 optional (suggested).

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

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

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 89e7730..4720e00 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 3625 RMD160 288ca11347ab2385a0763fee22901dd9d602b28d SHA1 3503f5d7cb56d9041fea5279e0080b6d1d63de3e SHA256 91d4f23952c1fa0002a3e8d378a9e8039b3cb56116ff62f2a2a4e5acf12e5553
+EBUILD systemd-9999.ebuild 3853 RMD160 304433f01d74aa6910902606c0df92b145da804c SHA1 e94f4034a6fcaac796778b7c4b2c49f47c49cbe1 SHA256 a9c60ecda8cd7985527fa207b8e9c104b7297a34f8378697aa9398b579a4d0f1
 MISC metadata.xml 524 RMD160 d51fb3f45aefd84a637f2f67cead553e12d389ab SHA1 4f86cab283737af9e58633d466e2588d80bec18c SHA256 0ee1c96fc4604189104897c95e2ded166e55be2e04af40523b2afb5564dbbe33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk4F/xsACgkQfXuS5UK5QB0EmAP/Z3AjSmI72W0mrPWqO9U3x7+f
-ymcuINbZW3Oin2G2CHsLaA6qv4UtRXjGI4bw6Nw9QZed/eIKYADiFoa8yYPUtjKB
-7n8Ql7j/skt7Uc+YovKryJfb0HduF6gqxVt3SOEqEcLDylbBTbNeadjtssz3nTS2
-8igJhx9Sam7Rh6k7y1c=
-=HVaN
+iJwEAQEIAAYFAk4NeWIACgkQfXuS5UK5QB14lAQAjzv2/HfylbVTWhBeUcVRYnnP
+MOXJoCqb2npxspW/VijaVTEnoIA5N85WvIjjMu5ZG/bW4m9+Xogr4vLxCmzYiC/v
+M/O7OUgpJfxLw7GU0cC121BGBCNJoZw1AVy9dJO4XeaucPEvEtF400anIIPhM0Cx
+bs7Uzocgt6MMw0n3d4U=
+=6eHj
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 05bc5d7..d9f0bc3 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -4,17 +4,21 @@
 
 EAPI=4
 
+inherit autotools-utils bash-completion linux-info pam systemd
+
+#if LIVE
 EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}
 	http://cgit.freedesktop.org/${PN}/"
-inherit autotools autotools-utils bash-completion git-2 linux-info pam systemd
+inherit autotools git-2
+#endif
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI=""
+SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="audit cryptsetup gtk pam plymouth selinux tcpd"
 
 COMMON_DEPEND=">=sys-apps/dbus-1.4.10
@@ -47,14 +51,21 @@ RDEPEND="${COMMON_DEPEND}
 	!!sys-apps/systemd-udev
 	!<sys-apps/openrc-0.8.3"
 DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.2
 	gtk? ( dev-lang/vala:${VALASLOT} )
 	>=sys-kernel/linux-headers-${MINKV}"
 
+#if LIVE
+SRC_URI=
+KEYWORDS=
+
+DEPEND="${DEPEND}
+	app-text/docbook-xml-dtd:4.2"
+
 AUTOTOOLS_IN_SOURCE_BUILD=1
+#endif
 
 pkg_pretend() {
-	local CONFIG_CHECK="AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
+	local CONFIG_CHECK="~AUTOFS4_FS CGROUPS DEVTMPFS ~FANOTIFY ~IPV6"
 	linux-info_pkg_setup
 	kernel_is -ge ${MINKV//./ } || die "Kernel version at least ${MINKV} required"
 }
@@ -65,8 +76,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Force the rebuild of .vala sources
+	touch src/*.vala || die
 	autotools-utils_src_prepare
+#if LIVE
 	eautoreconf
+#endif
 }
 
 src_configure() {