4 files changed, 20 insertions, 81 deletions
diff --git a/app-benchmarks/bootchart2/ChangeLog b/app-benchmarks/bootchart2/ChangeLog
index 349dee9b0e59..57c238a713e3 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.8 2012/05/29 18:00:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/ChangeLog,v 1.9 2012/06/14 06:31:21 jlec Exp $
+
+*bootchart2-0.14.4 (14 Jun 2012)
+
+  14 Jun 2012; Justin Lecher <jlec@gentoo.org> -bootchart2-0.14.2-r1.ebuild,
+  -bootchart2-0.14.2-r2.ebuild, bootchart2-0.14.2-r3.ebuild,
+  +bootchart2-0.14.4.ebuild:
+  Version Bump, Cleaned old
 
 *bootchart2-0.14.2-r3 (29 May 2012)
 
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.2-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.2-r1.ebuild
deleted file mode 100644
index 8dcb9ca92991..000000000000
--- a/app-benchmarks/bootchart2/bootchart2-0.14.2-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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-r1.ebuild,v 1.3 2012/05/15 14:31:22 jlec 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
-	sys-apps/lsb-release"
-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
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-}
-
-pkg_postinst() {
-	elog "Please add the init script to your default runlevel"
-	elog "rc-update add bootchart2 default"
-	echo
-	python_mod_optimize pybootchartgui
-}
-
-pkg_postrm() {
-	python_mod_cleanup pybootchartgui
-}
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.2-r3.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.2-r3.ebuild
index 95dce29dd467..9506e3cc76f1 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.2-r3.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.2-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.1 2012/05/29 18:00:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.2-r3.ebuild,v 1.2 2012/06/14 06:31:21 jlec Exp $
 
 EAPI=4
 
@@ -70,7 +70,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Please add the init script to your default runlevel"
+	elog "If you are using an initrd during boot"
+	echo
+	elog "please add the init script to your default runlevel"
 	elog "rc-update add bootchart2 default"
 	echo
 	python_mod_optimize pybootchartgui
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.2-r2.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.4.ebuild
index 8dc8550c5a92..09290bb505c1 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.2-r2.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.4.ebuild
@@ -1,11 +1,12 @@
 # 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.3 2012/05/15 14:31:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.4.ebuild,v 1.1 2012/06/14 06:31:21 jlec Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
 
 inherit linux-info python systemd toolchain-funcs
 
@@ -31,9 +32,11 @@ 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
+	sed \
+		-e '/^EXIT_PROC/s:^.*$:EXIT_PROC="agetty mgetty mingetty":g' \
+		-i bootchartd.conf bootchartd.in || die
 }
 
 src_test() {
@@ -67,7 +70,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Please add the init script to your default runlevel"
+	elog "If you are using an initrd during boot"
+	echo
+	elog "please add the init script to your default runlevel"
 	elog "rc-update add bootchart2 default"
 	echo
 	python_mod_optimize pybootchartgui