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

[Michał Górny]

commit:     38232c48f1e7d01007eda57154b976901329bfd2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May  2 07:55:23 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May  2 07:55:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=38232c48

sys-apps/systemd: systemd-analyze works only with py2.7, wrt bug #413755.

(Portage version: 2.2.0_alpha101_p3/git/Linux x86_64, unsigned Manifest commit)

---
 sys-apps/systemd/systemd-9999.ebuild |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 442448e..56e0f28 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -65,6 +65,13 @@ pkg_setup() {
 	enewgroup tty 5 # used by mount-setup for /dev/pts
 }
 
+src_prepare() {
+	# systemd-analyze is for python2.7 only nowadays.
+	sed -i -e '1s/python/&2.7/' src/analyze/systemd-analyze
+
+	autotools-utils_src_prepare
+}
+
 src_configure() {
 	local myeconfargs=(
 		--with-distro=gentoo
@@ -134,7 +141,17 @@ pkg_preinst() {
 }
 
 optfeature() {
-	elog "	[\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1} (${2})"
+	local i desc=${1} text
+	shift
+
+	text="  [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
+	shift
+
+	for i; do
+		elog "${text}"
+		text="& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
+	done
+	elog "${text} (${desc})"
 }
 
 pkg_postinst() {
@@ -155,9 +172,12 @@ pkg_postinst() {
 
 	elog "To get additional features, a number of optional runtime dependencies may"
 	elog "be installed:"
-	optfeature 'dev-python/dbus-python' 'for systemd-analyze'
-	optfeature 'dev-python/pycairo[svg]' 'for systemd-analyze plotting ability'
-	optfeature 'sys-apps/systemd-ui' 'for GTK+ systemadm UI and gnome-ask-password-agent'
+	optfeature 'for systemd-analyze' \
+		'dev-lang/python:2.7' 'dev-python/dbus-python'
+	optfeature 'for systemd-analyze plotting ability' \
+		'dev-python/pycairo[svg]'
+	optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \
+		'sys-apps/systemd-ui'
 	elog
 
 	ewarn "Please note this is a work-in-progress and many packages in Gentoo"