add init script for termination

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

4 files changed, 60 insertions, 17 deletions

diff --git a/app-benchmarks/bootchart2/ChangeLog b/app-benchmarks/bootchart2/ChangeLog
index e60090c6985e..e7971b771f1d 100644
--- a/app-benchmarks/bootchart2/ChangeLog
+++ b/app-benchmarks/bootchart2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.1 2012/04/02 07:19:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/ChangeLog,v 1.2 2012/04/02 13:06:32 jlec Exp $
+
+*bootchart2-0.14.2-r1 (02 Apr 2012)
+
+  02 Apr 2012; Justin Lecher <jlec@gentoo.org> +files/bootchart2.init,
+  -bootchart2-0.14.2.ebuild, +bootchart2-0.14.2-r1.ebuild:
+  add init script for termination
 
 *bootchart2-0.14.2 (02 Apr 2012)
 
diff --git a/app-benchmarks/bootchart2/Manifest b/app-benchmarks/bootchart2/Manifest
index 4ca20cf82120..0687341b232f 100644
--- a/app-benchmarks/bootchart2/Manifest
+++ b/app-benchmarks/bootchart2/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX bootchart2.init 802 RMD160 0a3913d6a39ea89a9a5a39664d69b30ea372854b SHA1 2d50b040f469a69e37153d0589b252968017f1cc SHA256 3faf1ef20f9539cabd8e9716c23471d5e72cd9fd1ceba347e7747e4c7e794072
 DIST bootchart2-0.14.2.tar.bz2 775770 RMD160 cdfc030c12060737768cd6f6b55be508a8c517bc SHA1 75b3db97c239e8eee4c3143e35f77505480ec415 SHA256 0a9c9cd4065a1ad4d9e27e36888cf6258bb8c830a719e1a4afbf3b1092e728a4
-EBUILD bootchart2-0.14.2.ebuild 1586 RMD160 68fa31d97564055aaf966f0dbee5a2cda124b2b7 SHA1 5df6c55d3e0f4bc82b955ba357583f5e150d443c SHA256 6a1b185aabdca92c3018093d63aa526377d04a69cbde6fb7f7c30083ae4ccdde
-MISC ChangeLog 459 RMD160 f4373db6250b1f4185d1c7ce34b61ed45252b9fb SHA1 7022864d6fc401c5d1b9a7b0d2327eae4ce22718 SHA256 1f02517d2ba6db42a2c30d298cda3697bee273f4cbcfeef322529015537ec9ca
+EBUILD bootchart2-0.14.2-r1.ebuild 1820 RMD160 5b23dbe35ce09f14baf7bdbfab0e2b8b10a45d3c SHA1 8755d0ffa93f9fa025f0e09565d83eab97007d52 SHA256 dd4122fb5d1b4e078673b10f1bb8c25d7b1e145666ef27b712b62de714771bb5
+MISC ChangeLog 661 RMD160 006e7dfbd9b38adba181d194377ccc10704f56dd SHA1 e0d51ded62c7fab82c6de89aa0cf178e24c62a97 SHA256 ada930b5e7580c4a6f7abb8425ddc01847957e9273734ae0ba8bd4a33b722ba1
 MISC metadata.xml 201 RMD160 a6c5202673c0843bd9d1453b78b3f6bddc62a1f7 SHA1 6c7c52b9cddff4c6507fe6e49be0bbd53611d236 SHA256 180014e727f4e39b95bfeadf7661f97f2a0c8fe30658a82cd676fac065c7b3c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk95UvkACgkQgAnW8HDreRZleACfVgCyRDJ8AmxWQ2kagI81rZ7F
-JSQAoJpwnbKspSWOOXm6J09S+5mcfyAJ
-=XLmq
+iEYEAREKAAYFAk95pF4ACgkQgAnW8HDreRac5ACfboFx0N/tSw4JtU9pqg3afFGE
+OCkAn3779rbaJ8bMYxOHOr8UytA51QHx
+=EAWv
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.2.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.2-r1.ebuild
index 41779baeb71b..9f203099d298 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.2.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.2-r1.ebuild
@@ -1,12 +1,11 @@
 # 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.ebuild,v 1.1 2012/04/02 07:19:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.2-r1.ebuild,v 1.1 2012/04/02 13:06:32 jlec Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABI="2.7-pypy-*"
 
 inherit linux-info python systemd toolchain-funcs
 
@@ -21,9 +20,9 @@ IUSE="svg"
 
 RDEPEND="
 	!app-benchmarks/bootchart
-	dev-python/pycairo[svg=]"
-DEPEND="${RDEPEND}
-"
+	dev-python/pycairo[svg=]
+	dev-python/pygtk"
+DEPEND="${RDEPEND}"
 
 CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
 
@@ -36,6 +35,13 @@ src_prepare() {
 		-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}
@@ -52,16 +58,20 @@ src_install() {
 			py-install-compile
 	}
 	python_execute_function installation
-}
 
-src_test() {
-	testing() {
-		emake test
-	}
-	python_execute_function testing
+	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
 }
diff --git a/app-benchmarks/bootchart2/files/bootchart2.init b/app-benchmarks/bootchart2/files/bootchart2.init
new file mode 100644
index 000000000000..4670fe12d096
--- /dev/null
+++ b/app-benchmarks/bootchart2/files/bootchart2.init
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/files/bootchart2.init,v 1.1 2012/04/02 13:06:33 jlec Exp $
+
+depend() {
+	use localmount
+}
+
+start() {
+	if /bin/grep -q "rdinitrd=/sbin/bootchartd" /proc/cmdline; then
+		if /bin/pidof bootchart-collector> /dev/null 2>&1; then
+			ebegin "Scheduling termination of Bootchart"
+			/sbin/bootchartd start
+			/sbin/bootchartd wait &
+		eend $?
+	else
+		elog "No bootchart process found!"
+		eindent
+		elog "This script does not start bootchart, but only schedules its termination."
+		elog "Bootchart should be started from the kernel command line."
+		elog "Please check the README on how to do that."
+		eoutdent
+		eend 0
+	fi	
+}