app-benchmarks/bootchart2: drop old; add USE=X for track-only installations, #454340; move to new python eclasses

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

4 files changed, 34 insertions, 117 deletions

diff --git a/app-benchmarks/bootchart2/ChangeLog b/app-benchmarks/bootchart2/ChangeLog
index da4bb690f1a7..5b33bcc464da 100644
--- a/app-benchmarks/bootchart2/ChangeLog
+++ b/app-benchmarks/bootchart2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-benchmarks/bootchart2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/ChangeLog,v 1.15 2013/01/06 09:12:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/ChangeLog,v 1.16 2013/01/30 11:25:18 jlec Exp $
+
+*bootchart2-0.14.5-r1 (30 Jan 2013)
+
+  30 Jan 2013; Justin Lecher <jlec@gentoo.org> -bootchart2-0.14.2-r3.ebuild,
+  -bootchart2-0.14.4.ebuild, +bootchart2-0.14.5-r1.ebuild, metadata.xml:
+  drop old; add USE=X for track-only installations, #454340; move to new python
+  eclasses
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> bootchart2-0.14.5.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.4.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.4.ebuild
deleted file mode 100644
index 09290bb505c1..000000000000
--- a/app-benchmarks/bootchart2/bootchart2-0.14.4.ebuild
+++ /dev/null
@@ -1,83 +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.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
-
-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 "/^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() {
-	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 "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
-}
-
-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.5-r1.ebuild
index 9506e3cc76f1..169702add172 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.2-r3.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.5-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.2 2012/06/14 06:31:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.5-r1.ebuild,v 1.1 2013/01/30 11:25:18 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
 
-inherit linux-info python systemd toolchain-funcs
+inherit linux-info python-r1 systemd toolchain-funcs
 
 DESCRIPTION="Performance analysis and visualization of the system boot process"
 HOMEPAGE="https://github.com/mmeeks/bootchart/"
@@ -15,15 +14,20 @@ SRC_URI="mirror://github/mmeeks/bootchart/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="svg"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="svg test X"
+
+REQUIRED_USE="test? ( X )"
 
 RDEPEND="
 	!app-benchmarks/bootchart
-	dev-python/pycairo[svg?]
-	dev-python/pygtk
+	X? (
+		dev-python/pycairo[svg?,${PYTHON_USEDEP}]
+		dev-python/pygtk
+		${PYTHON_DEPS}
+		)
 	sys-apps/lsb-release"
-DEPEND="${RDEPEND}"
+DEPEND="${PYTHON_DEPS}"
 
 CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
 
@@ -31,7 +35,6 @@ 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 \
@@ -40,14 +43,11 @@ src_prepare() {
 }
 
 src_test() {
-	testing() {
-		emake test
-	}
-	python_execute_function testing
+	python_foreach_impl emake test
 }
 
 src_install() {
-	export NO_PYTHON_COMPILE=0
+	export NO_PYTHON_COMPILE=1
 	export DOCDIR=/usr/share/doc/${PF}
 	default
 
@@ -56,15 +56,13 @@ src_install() {
 	keepdir /lib/bootchart/tmpfs
 
 	installation() {
-		emake \
-			DESTDIR="${D}" \
-			PY_SITEDIR=$(python_get_sitedir) \
-			py-install-compile
-	}
-	python_execute_function installation
+		python_domodule pybootchartgui
 
-	# does not like python3 as active interpreter
-	python_convert_shebangs 2 "${ED}"/usr/bin/pybootchartgui
+		python_optimize "${ED}"/$(python_get_sitedir)
+		cp pybootchartgui.py "${T}"/pybootchartgui || die
+		python_doscript "${T}"/pybootchartgui
+	}
+	use X && python_foreach_impl installation
 
 	newinitd "${FILESDIR}"/${PN}.init ${PN}
 }
@@ -75,9 +73,4 @@ 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/metadata.xml b/app-benchmarks/bootchart2/metadata.xml
index c845479d513e..4a00a64b40ae 100644
--- a/app-benchmarks/bootchart2/metadata.xml
+++ b/app-benchmarks/bootchart2/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>