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

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

5 files changed, 47 insertions, 123 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/Manifest b/app-benchmarks/bootchart2/Manifest
index dd572fc60518..943ad2989f8e 100644
--- a/app-benchmarks/bootchart2/Manifest
+++ b/app-benchmarks/bootchart2/Manifest
@@ -1,9 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX bootchart2.init 812 SHA256 f5fbe61228b7eeedaf73468e7e46ad60836ea488a7236980940a58e069008e84 SHA512 cfa3376a8d73a4ff096190a7b463c9be1bcd0ca5ddec6c1a7989da8d344e50a82469b06aff0ba52d888e72a621efbb5655857e38393aa61cb447ccd3679f4508 WHIRLPOOL 797bddf0f3366cdd29c9b951984ac0f5a4fa5f15c802101adc505bed5898938b74a6a754e343089d0126a7cc343aa2ca7b897647bed03ae25f9eb9533dbc0e51
-DIST bootchart2-0.14.2.tar.bz2 775770 SHA256 0a9c9cd4065a1ad4d9e27e36888cf6258bb8c830a719e1a4afbf3b1092e728a4 SHA512 9f15f449c714739344558f875485acc74d8c51d1325143c0fe46fb4d7b97e419ac25e240c5c735302d30066afde15289e3161fe73bb495b2b9d2fa8587ab6c60 WHIRLPOOL be99044746c6336492c3d071e3f8c2ad9bf43803581a4c778298b188416e0318ebf871d823b2b853087695c8146da01ba846074170872d721ad967d658d2c565
-DIST bootchart2-0.14.4.tar.bz2 775936 SHA256 9b2bd785569e0c49fe6082abfb488135f65bc82f7919e04857a4bd94471add7f SHA512 ee666801e59eae750c4b35f460d2092818b2269ce4b59e10b24cd2f79d684e3b363a3773764b1a095a39b903afd4ed0f72cb17947f91842ab3ee5f6acadf04fa WHIRLPOOL 5f06516ba15e909be0510e1dbef84a0d6802ad762a8e85ae151dca4edfa25b263e25f71c03850c0c1c5506701502e7b641ed3821b348a38ca80e0e3ae2ea7902
 DIST bootchart2-0.14.5.tar.bz2 776490 SHA256 8a36596dcb67cd24b02feb20805588277680933478597557e96e7e3c744bf68f SHA512 4a0dbc9a5d516be71a5c6af316894584e77a277f6450940f76a422e7b1987ea62e90edba4524ba68f5080f120faaec9a49dc16b78ac0f8e6be5aa48a4b106f6e WHIRLPOOL e4e9a2d28382d1310dd378b7577e20853e807327570e216ee9d5f0c03ae8ca02484366e2d11310830d6a4a4abcc94459704c9bf1bc9579322727d56ac69eb717
-EBUILD bootchart2-0.14.2-r3.ebuild 2016 SHA256 00ac2a5e2080975146d8846cfe8970f497fa16876205a3b2ae94db4a79715738 SHA512 0b360b11327d85b14b873dd1c4867404726da1cac73ebb74f1f177d975264dbfcea86af30497d0f33d227f53de4b32ce5c632d15d848adcf4263a145717b9b19 WHIRLPOOL 9b4f45cc77628fc21a6f8709958b00ba218886c71bcac1291dd95f4377aaea0a4b5a16aaddc6a23a58a704aba90c28458096ab251a00852e738b73d4444857d6
-EBUILD bootchart2-0.14.4.ebuild 2016 SHA256 0c2eb790e1d1739cca0d10cfcee1237bf1d97d276f97fc13a674eb77b206a590 SHA512 2edd3917e4a4cd14c5f87335d471273593d7e0ea340fc63b985e5f99b610551faf1d9b65748bd57cacc8390bd0774372b6d771cca23fda285942fb814daddd89 WHIRLPOOL 923c08580fd89482a90e749c718b1488709efc6e10f182405548547c28b349299a78e9a723713f2a3ee9dd717feee59b8d90914b7ab67bd3c2c44b0bfed56173
+EBUILD bootchart2-0.14.5-r1.ebuild 1971 SHA256 821f1373ff27197a78cdc9c2a3fe1a6a38543ce646927b82900583daf126a742 SHA512 a30ace7cfc8b72d39096468a38315a27415089872efda755f6cc56c1e8a6ef9371e59804febff7517048570551960e150c0170607691f575e69bb0946a5f7629 WHIRLPOOL 72f144047be2dd961c5b35a922abdaac39e177c06256e1455364a6a33d9517592800b7c9a3c748f9dce414ea826ee07a2acb7bf5fc8825e9d7d9e0892fe11f4a
 EBUILD bootchart2-0.14.5.ebuild 2043 SHA256 409f545adb1a368271c6c6fa3d8dab71e38d4d368c267617de2821ae236f3268 SHA512 cb824269c96f237b114d42790d73c15d46cd2c1e3dd0eb81dab97d00c00172392c992f7062a601df0a7ccb48c389a286d926e81deabdbafe165959c5c3d6f003 WHIRLPOOL 08950e5a476fef16d80f176301f776d59736b87dc68f3c41360f1520990991c13893fc7ea0eb78cdfa21d725dda443aaf204fe739786461421d159210feac002
-MISC ChangeLog 2503 SHA256 594c4bc0004919c0092e170ba11fb551697f335bc786043c9c67aefbd31a4d87 SHA512 eefc6f52863abc8b63f7ef4e556e5db17851f45bbaea354cf35bf18c30e77b9296394cdd65fb7bcd678632473545048517f5bade277234a34acd978bddedaa1f WHIRLPOOL 3da8eb3b73b83bff157c9fcece41a0ce7f4cc6474904f3a9c079933013a20b7952bf6d21baaac0d932b68eaa2ab777ad9fd28f758c5fd8938efd7613022f1dca
-MISC metadata.xml 201 SHA256 180014e727f4e39b95bfeadf7661f97f2a0c8fe30658a82cd676fac065c7b3c9 SHA512 c45946956d014075402c211931232b5a97bbd98b69acf7ce1ce999183890293f712166c6c8f65f3c79284a3184c18aab30506812a2ca819ae0cf77fde3c99602 WHIRLPOOL 540f634e659cae0c137b620aa023ac8909019a135ca9a6d8722fe46ffaed948dc124d483c4c6aa1bf4acc7ad52eb05d0cd5fbb1b3b6b39325fca48ff94b63d3b
+MISC ChangeLog 2783 SHA256 45f23cd812889247c5c0ddb01d70fa64822a33e34bf65aed04b8169ca6c37928 SHA512 2c56f7dd039d258bdbbfdf0d80950965cfb33108df46f7a1dc5acc8c0cb99f7d443adc2a4572fa61762e79efc65d2ca4689fc21b8e33fff57cde03fa91e7157e WHIRLPOOL 9e7eb276778818687f2cd537c2e4f589529d5b54b46f81ef97d19477fe858baf658e1555cbc477552ca5e80c082e1d467d634da7a9fb133208e62d27507a764e
+MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEJAx8ACgkQgAnW8HDreRbkKwCeNIJ10Z4xtliW/fCUQP9E5Yk1
+S6oAn22W//nDLYQXUa6uFKStFKHIM5pn
+=lzad
+-----END PGP SIGNATURE-----
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>