Convert to a more traditional live ebuild.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 36 insertions, 35 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index aaa12885f586..dd9b9fe1ec32 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.370 2015/05/28 23:53:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.371 2015/05/29 00:03:09 floppym Exp $
+
+  29 May 2015; Mike Gilbert <floppym@gentoo.org> systemd-9999.ebuild:
+  Convert to a more traditional live ebuild.
 
   28 May 2015; Mike Gilbert <floppym@gentoo.org> systemd-220-r2.ebuild:
   Add manpage deps due to autoreconf, bug 550704.
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index e857d2b859d5..019a3b9fccb2 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -28,13 +28,13 @@ EBUILD systemd-219_p112.ebuild 15488 SHA256 f82fd9bbff6598a95e749d7d573821532d88
 EBUILD systemd-220-r1.ebuild 15711 SHA256 390b9fd7131aa2d353a73fa293c1de3c7b08fa2d0c934901bbe4bf9e7294b335 SHA512 037ddbf6c373e8a075fedd1db94737a0193a17f78cb6ec19d015cf9603ba9b960e46daf902fd9967771df18bbb24105903345f9d31c96b2ac357902e0a2d68ce WHIRLPOOL c52348dd32ed5b7eabfd15613fc230b67b9f84d890636945d3b2860455ffe28dffe25c79440bfa2c7afdb7ef9ba8fae3c298f940740ad3f42033c3948d829ed0
 EBUILD systemd-220-r2.ebuild 15943 SHA256 09a8013b4bbf45e028bc31aacb2551481dc294cd0bd51394b078f5a9fbee0221 SHA512 a4a38c1e404a6b58a3bb86036315e2e63bd6f7447b42d33b1d84b3b4a860a6561e42a36353b2558cbecb0302ff3d45fa602dbcc5833492cb2d301b84bc0592f6 WHIRLPOOL 170ecb18190a8c8fd46af2428f51ab42374cc44240e5fe31726954ecdaf50e0867b7e004190cbc93813c48fbf1379ac4e2e21c2fb1cadbd4297a820d73ca2adf
 EBUILD systemd-220.ebuild 15705 SHA256 581c93b27aa1df46bd99e158d8966c2db2372471957bd271b6e7789ef67f354a SHA512 4bc215424e374663f69485f0ea540a093f2e83d2e71d0ca5c6e6f78f1d31ba42bf505c226fb46a7aed152384ddf6d79cc8019741484a964fd857910dda61c4fa WHIRLPOOL e2a2cc77f79f995704ff6de78ff0b5bda190a485023e9554df804346f1ee3047c91b36128905062eb193792c01d81eb0f1ea032369334e5aca6b894f765ed01b
-EBUILD systemd-9999.ebuild 15822 SHA256 b43219f89f534a6fb5400796339035c708aa8c22b66182cb18fe8721f91db708 SHA512 616788a056b99d0399eb3fad62e74df1cbf7a3ab1a02ae09238687dee43bd35567b45910ced93d0af852e0d4ffeb0a2d6673825c2410232da67b4e188f9cb016 WHIRLPOOL ab84746e41314be4d45a3faa8a478ce60634f886045acf964c6760d97b1810b3a883170444874e0a8d7f1d05a3897ea7b3ee2423f45f4497a3ee3874e4f52e29
-MISC ChangeLog 65270 SHA256 0e8a8c782c95646b9e9ad4f75207ef815b78c24aa1e097a1483d5f89e58b95ec SHA512 f67d04f286e4934d2908cb0d7182f7d115e5169d9aae62c880186a975efb8fe5f2ff7926e22d436970d511970c72595ebe9efa1d8181f9efdb46033ab36cb43e WHIRLPOOL a5ff3bef8019b501706734135d243688300606a5f37c7dc413dcb1e5fc7a6d2c88b41f4081ea3d9d68a39ba0184f17450fdbafabeea4f29a1b9b335302f50fdf
+EBUILD systemd-9999.ebuild 15908 SHA256 8676405eda5aa4138b4f42bee3d3676b4a34ec058b02f00768432a791eea8fd6 SHA512 b41c6980b7ca436477065a458d291b312251072f735e09e3f6030bb73451531700a6dfcbbab435827e26c24cff21b4c81b6c226c05a959738294954f5119e595 WHIRLPOOL bd7666271ad58281a8e6fb8e3b9c938601195e1c7c7de1d16b466c43d367e566cbc28b486934bb622f0652f1a1dba59da085571c7a81226f0710d11b3742f624
+MISC ChangeLog 65386 SHA256 e74fcef73907cb038a18d70c5fa2f3de39e9f7f903e629539850b6d9cc4c199a SHA512 74852a2207b5c2c313a1874cd75676166afda841796495f20b291c8c83485354716a7cdd3d4f2fbedc798edca8163b26ba585c6ae444b63cb62f5021cf915a69 WHIRLPOOL b9932a8e8397f96d42df3610f044c46167f1e5c627cbd895778f316960138b2e006584b33abb074eb1dc8136dea049ea8a292d299d9464dcf5e115e6165e47c1
 MISC metadata.xml 2141 SHA256 d21a56048e94d30ebd8ee2a218ec3f19eee184ddb63fd240168348e0e82fde0a SHA512 2140c71ee89ff12de395799cc6f1968a92d9437b2cb7ea0d4aaf553fc073f038cc3c27c522922eb8a7706f40ca8e146de53efa8f57927e6aaf9bca732f9f14fe WHIRLPOOL c2ccc32563da1514c9d58ac358546e719967acd705a4dec862471b0900d3ff55e7d5b718a04e0ca05a70fc5d80ab4309d8fb9b7d86eea0de78531cf77eb0c661
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlVnqnIACgkQC77qH+pIQ6SfXwD+OieICwXDgoghpFJteqOn64IC
-EmGuJuIrqhv39TZ2BdcA/iUbiA6HpAMN4Cgotnvcvu9fDE0PzVlhwgezxpLYahfx
-=xhcw
+iF4EAREIAAYFAlVnrL4ACgkQC77qH+pIQ6Ti9gD/dMCpnKH47cnYn7/BfJEHWpHy
+BotsKmJCzABEWXgZha8BAImeUvg531ryUwS8kdSZNAJqH3OHoVZMEC/3ftnBJxbh
+=R8FR
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index ef6f33a037f2..08bdce3473a5 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,30 +1,31 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.166 2015/05/28 03:35:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.167 2015/05/29 00:03:09 floppym Exp $
 
 EAPI=5
 
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
-EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN}
-	http://cgit.freedesktop.org/${PN}/${PN}/"
-
-inherit git-r3
-#endif
-
 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+if [[ ${PV} == 9999 ]]; then
+	AUTOTOOLS_AUTORECONF=yes
+	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd
+		http://cgit.freedesktop.org/systemd/systemd"
+	inherit git-r3
+else
+	SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+fi
+
 inherit autotools-utils bash-completion-r1 linux-info multilib \
 	multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
 	user
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86"
 IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gnuefi gudev http
 	idn importd introspection kdbus +kmod +lz4 lzma nat pam policykit python
 	qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb"
@@ -103,18 +104,15 @@ DEPEND="${COMMON_DEPEND}
 	terminal? ( media-fonts/unifont[utils(+)] )
 	test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
 
-#if LIVE
-DEPEND="${DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	dev-libs/gobject-introspection-common
-	>=dev-libs/libgcrypt-1.4.5:0"
-
-SRC_URI=
-KEYWORDS=
-#endif
+if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
+	DEPEND="${DEPEND}
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt:0
+		dev-libs/gobject-introspection-common
+		>=dev-libs/libgcrypt-1.4.5:0"
+fi
 
 pkg_pretend() {
 	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
@@ -159,14 +157,14 @@ pkg_setup() {
 }
 
 src_prepare() {
-#if LIVE
-	if use doc; then
-		gtkdocize --docdir docs/ || die
-	else
-		echo 'EXTRA_DIST =' > docs/gtk-doc.make
+	if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
+		if use doc; then
+			gtkdocize --docdir docs/ || die
+		else
+			echo 'EXTRA_DIST =' > docs/gtk-doc.make
+		fi
 	fi
 
-#endif
 	# Bug 463376
 	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die