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

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

commit:     07350474dc5f19b4b71ec0805d637dfe81c78832
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 07:16:53 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 07:16:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=07350474

sys-apps/systemd: Sync with gx86 -- fix bash-completion install.

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

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

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 5e0f783..bfebdd2 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 3495 RMD160 db12dea0957abec906ff6f74b406bc3a342aa504 SHA1 f87586313bd0c8dd0ea64bf5c44b6effe28a4208 SHA256 dfcc8ed54bc6b41b99e9cbb0f4608652a38a6858e77e9b22926fcd30e64cc313
+EBUILD systemd-9999.ebuild 3832 RMD160 4be049dc0708ef2c1cd58d9195c0d0c4b8065dd3 SHA1 ec77ac4de7eb397747da0b957bfb02b931782a0e SHA256 065021e1d65fe8e9e6595094046697370966df319dcde7956e96b18da6d584a9
 MISC metadata.xml 524 RMD160 d51fb3f45aefd84a637f2f67cead553e12d389ab SHA1 4f86cab283737af9e58633d466e2588d80bec18c SHA256 0ee1c96fc4604189104897c95e2ded166e55be2e04af40523b2afb5564dbbe33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk34tMcACgkQfXuS5UK5QB2dWwQAqrSftZT9UORt5bAwHV1qIPKV
-qA//Dy5VPbcFX7brBowxCzPN+4bxPqwbIguHvhmIPPZCr7RBkgY4r8i7Bdz9QK35
-8LZhcDjJGnDHtMrxXa+msiHPflK5tcWzPQvqZxoDF+SMo1R3qqYwThD66MMFMd7W
-GC/3YoaURfxrly56Qfk=
-=67c6
+iJwEAQEIAAYFAk4EOeUACgkQfXuS5UK5QB1/xgQAsx5uTZ3M1X9b8q+ZduBEFRH7
+CGZY96UvO+3vENyp/n6+RWnR4mxh0vFJLhKEG3AysivVsvdRByNhFuTXOwY6BLwT
+2Io+rs/roR2G/r0/1C/wushdqExnJ8JF2eFSipOxS2FoRSg8jVeOqmCojKQoVi8M
+ChabSEc8hqgcn7de540=
+=T4e7
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 53643fa..c242610 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}
 	http://cgit.freedesktop.org/${PN}/"
-inherit autotools autotools-utils git-2 linux-info pam
+inherit autotools autotools-utils bash-completion git-2 linux-info pam
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
@@ -76,6 +76,7 @@ src_configure() {
 		--with-distro=gentoo
 		--with-rootdir=
 		--localstatedir=/var
+		--docdir=/tmp/docs
 		$(use_enable audit)
 		$(use_enable cryptsetup libcryptsetup)
 		$(use_enable gtk)
@@ -96,10 +97,13 @@ src_configure() {
 }
 
 src_install() {
-	autotools-utils_src_install
+	autotools-utils_src_install \
+		bashcompletiondir=/tmp
 
-	dodoc "${D}"/usr/share/doc/systemd/*
-	rm -rf "${D}"/usr/share/doc/systemd || die
+	# move files as necessary
+	dobashcompletion "${D}"/tmp/systemctl-bash-completion.sh
+	dodoc "${D}"/tmp/docs/*
+	rm -rf "${D}"/tmp || die
 
 	cd "${D}"/usr/share/man/man8/
 	for i in halt poweroff reboot runlevel shutdown telinit; do
@@ -128,5 +132,9 @@ pkg_postinst() {
 	elog "	$ man tmpfiles.d"
 	elog
 
-	ewarn "This a work-in-progress ebuild. You may brick your system. Have fun!"
+	ewarn "Please note this is a work-in-progress and many packages in Gentoo"
+	ewarn "do not supply systemd unit files yet. You are testing it on your own"
+	ewarn "responsibility. Please remember than you can pass:"
+	ewarn "	init=/sbin/init"
+	ewarn "to your kernel to boot using sysvinit / OpenRC."
 }