Fix pybootchart shebang to work on active python3 setup. Allow pycairo[svg] for USE="-svg" case.

Package-Manager: portage-2.2.0_alpha96_p5/cvs/Linux x86_64

3 files changed, 95 insertions, 7 deletions

diff --git a/app-benchmarks/bootchart2/ChangeLog b/app-benchmarks/bootchart2/ChangeLog
index 97ee7eff35b0..97dc5e42485b 100644
--- a/app-benchmarks/bootchart2/ChangeLog
+++ b/app-benchmarks/bootchart2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-benchmarks/bootchart2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/ChangeLog,v 1.4 2012/04/04 06:11:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/ChangeLog,v 1.5 2012/04/16 07:18:38 slyfox Exp $
+
+*bootchart2-0.14.2-r2 (16 Apr 2012)
+
+  16 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +bootchart2-0.14.2-r2.ebuild:
+  Fix pybootchart shebang to work on active python3 setup. Allow pycairo[svg]
+  for USE="-svg" case.
 
   04 Apr 2012; Justin Lecher <jlec@gentoo.org> files/bootchart2.init:
   Initscripts only can use einfo not elog
diff --git a/app-benchmarks/bootchart2/Manifest b/app-benchmarks/bootchart2/Manifest
index 246d2f997ede..9f3aa91069a8 100644
--- a/app-benchmarks/bootchart2/Manifest
+++ b/app-benchmarks/bootchart2/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX bootchart2.init 812 RMD160 29b270b9aea19a6442181ea4de905cf8f883f93f SHA1 bf179305a08b36c69ee118c83e2b78647916ac7d SHA256 f5fbe61228b7eeedaf73468e7e46ad60836ea488a7236980940a58e069008e84
 DIST bootchart2-0.14.2.tar.bz2 775770 RMD160 cdfc030c12060737768cd6f6b55be508a8c517bc SHA1 75b3db97c239e8eee4c3143e35f77505480ec415 SHA256 0a9c9cd4065a1ad4d9e27e36888cf6258bb8c830a719e1a4afbf3b1092e728a4
 EBUILD bootchart2-0.14.2-r1.ebuild 1820 RMD160 5b23dbe35ce09f14baf7bdbfab0e2b8b10a45d3c SHA1 8755d0ffa93f9fa025f0e09565d83eab97007d52 SHA256 dd4122fb5d1b4e078673b10f1bb8c25d7b1e145666ef27b712b62de714771bb5
-MISC ChangeLog 880 RMD160 81bfc32a5a2236d2378a1554f99b6f9c60a1760b SHA1 e3aa23e4626e775bd0e4abdebb208e284bfcb943 SHA256 f6372c8099d1554224d604061510787327a784ccbd1c70cf3ed35f75bf7693b9
+EBUILD bootchart2-0.14.2-r2.ebuild 1928 RMD160 7c4c7c52d8a9c6c9ac65e15eb3bde7c5f624f637 SHA1 d83d674a640b287a4d940f6c0eb6134e03704d5c SHA256 c287703e369d11753dced4bb7c39fa771b2e42cd36d7e9ae488ffcad52e2d2d3
+MISC ChangeLog 1107 RMD160 f2d9bc9e441b08112ca7e1e2d604d97b746b78e4 SHA1 55403dde5dfc1ffa68cadc13c0c90da96fe4c00e SHA256 477226e27177d4b4e67b53a78f89cff6da7c384dbc3a15a4968d7da699525d8c
 MISC metadata.xml 201 RMD160 a6c5202673c0843bd9d1453b78b3f6bddc62a1f7 SHA1 6c7c52b9cddff4c6507fe6e49be0bbd53611d236 SHA256 180014e727f4e39b95bfeadf7661f97f2a0c8fe30658a82cd676fac065c7b3c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk975hoACgkQgAnW8HDreRYjlgCeIupriJB+R87Pk+sceZjWBp9r
-AB8AoKGrYjH+/TEXSXf/ZIfkEUaS8ev0
-=+OsA
+iEYEARECAAYFAk+Lx9cACgkQcaHudmEf86pI6ACfT4P7n9IbtM+zmCYTnihATUQb
+dHIAn0RE2UNuS1SizGFYXSInL8aajjxv
+=/Uhb
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.2-r2.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.2-r2.ebuild
new file mode 100644
index 000000000000..a7b83ad19db6
--- /dev/null
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.2-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.2-r2.ebuild,v 1.1 2012/04/16 07:18:38 slyfox Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit linux-info python systemd toolchain-funcs
+
+DESCRIPTION="Performance analysis and visualization of the system boot process"
+HOMEPAGE="https://github.com/mmeeks/bootchart/"
+SRC_URI="mirror://github/mmeeks/bootchart/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="svg"
+
+RDEPEND="
+	!app-benchmarks/bootchart
+	dev-python/pycairo[svg?]
+	dev-python/pygtk"
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
+
+src_prepare() {
+	tc-export CC
+	sed \
+		-e "/^install/s:py-install-compile::g" \
+		-e "/^VER/s:0.14.1:0.14.2:g" \
+		-e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_unitdir):g" \
+		-i Makefile || die
+}
+
+src_test() {
+	testing() {
+		emake test
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	export NO_PYTHON_COMPILE=0
+	export DOCDIR=/usr/share/doc/${PF}
+	default
+
+	# Note: LIBDIR is hardcoded as /lib in collector/common.h, so we shouldn't
+	# just change it. Since no libraries are installed, /lib is fine.
+	keepdir /lib/bootchart/tmpfs
+
+	installation() {
+		emake \
+			DESTDIR="${D}" \
+			PY_SITEDIR=$(python_get_sitedir) \
+			py-install-compile
+	}
+	python_execute_function installation
+
+	# does not like python3 as active interpreter
+	python_convert_shebangs 2 "${ED}"/usr/bin/pybootchartgui
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+}
+
+pkg_postinst() {
+	elog "Please add the init script to your default runlevel"
+	elog "rc-update add bootchart2 default"
+	echo ""
+	elog "Please review /usr/share/doc/${PF}/README"
+	elog "for further usage informations."
+	echo
+	python_mod_optimize pybootchartgui
+}
+
+pkg_postrm() {
+	python_mod_cleanup pybootchartgui
+}