From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SPUOu-0005RX-OG for garchives@archives.gentoo.org; Wed, 02 May 2012 07:55:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E81CE08AC; Wed, 2 May 2012 07:54:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 02CFCE08AC for ; Wed, 2 May 2012 07:54:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 670C01B4021 for ; Wed, 2 May 2012 07:54:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4AB4EE5403 for ; Wed, 2 May 2012 07:54:54 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1335945323.38232c48f1e7d01007eda57154b976901329bfd2.mgorny@gentoo> Subject: [gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/ X-VCS-Repository: dev/mgorny X-VCS-Files: sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 38232c48f1e7d01007eda57154b976901329bfd2 X-VCS-Branch: master Date: Wed, 2 May 2012 07:54:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 763b2f03-0ce7-4bb6-8e3a-3d63cb6c99c3 X-Archives-Hash: a1021446d3fc840bfea81ea1ebedd7dd commit: 38232c48f1e7d01007eda57154b976901329bfd2 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Wed May 2 07:55:23 2012 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Wed May 2 07:55:23 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/mgorny.git;a=3D= commit;h=3D38232c48 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 c= ommit) --- 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/syst= emd-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 } =20 +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=3D( --with-distro=3Dgentoo @@ -134,7 +141,17 @@ pkg_preinst() { } =20 optfeature() { - elog " [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1} (${2}= )" + local i desc=3D${1} text + shift + + text=3D" [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}" + shift + + for i; do + elog "${text}" + text=3D"& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}" + done + elog "${text} (${desc})" } =20 pkg_postinst() { @@ -155,9 +172,12 @@ pkg_postinst() { =20 elog "To get additional features, a number of optional runtime dependen= cies may" elog "be installed:" - optfeature 'dev-python/dbus-python' 'for systemd-analyze' - optfeature 'dev-python/pycairo[svg]' 'for systemd-analyze plotting abil= ity' - optfeature 'sys-apps/systemd-ui' 'for GTK+ systemadm UI and gnome-ask-p= assword-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 =20 ewarn "Please note this is a work-in-progress and many packages in Gent= oo"