4 files changed, 20 insertions, 180 deletions
diff --git a/app-benchmarks/bootchart2/ChangeLog b/app-benchmarks/bootchart2/ChangeLog
index 47373b31346f..d9d56ac162cb 100644
--- a/app-benchmarks/bootchart2/ChangeLog
+++ b/app-benchmarks/bootchart2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-benchmarks/bootchart2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/ChangeLog,v 1.23 2015/06/05 12:02:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/ChangeLog,v 1.24 2015/06/05 12:03:16 jlec Exp $
+
+  05 Jun 2015; Justin Lecher <jlec@gentoo.org> -bootchart2-0.14.5-r1.ebuild,
+  -bootchart2-0.14.5.ebuild:
+  Drop old
 
   05 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/app-benchmarks/bootchart2/Manifest b/app-benchmarks/bootchart2/Manifest
index b5f212373f70..71546a3cce60 100644
--- a/app-benchmarks/bootchart2/Manifest
+++ b/app-benchmarks/bootchart2/Manifest
@@ -2,29 +2,26 @@
 Hash: SHA512
 
 AUX bootchart2.init 812 SHA256 f5fbe61228b7eeedaf73468e7e46ad60836ea488a7236980940a58e069008e84 SHA512 cfa3376a8d73a4ff096190a7b463c9be1bcd0ca5ddec6c1a7989da8d344e50a82469b06aff0ba52d888e72a621efbb5655857e38393aa61cb447ccd3679f4508 WHIRLPOOL 797bddf0f3366cdd29c9b951984ac0f5a4fa5f15c802101adc505bed5898938b74a6a754e343089d0126a7cc343aa2ca7b897647bed03ae25f9eb9533dbc0e51
-DIST bootchart2-0.14.5.tar.bz2 776490 SHA256 8a36596dcb67cd24b02feb20805588277680933478597557e96e7e3c744bf68f SHA512 4a0dbc9a5d516be71a5c6af316894584e77a277f6450940f76a422e7b1987ea62e90edba4524ba68f5080f120faaec9a49dc16b78ac0f8e6be5aa48a4b106f6e WHIRLPOOL e4e9a2d28382d1310dd378b7577e20853e807327570e216ee9d5f0c03ae8ca02484366e2d11310830d6a4a4abcc94459704c9bf1bc9579322727d56ac69eb717
 DIST bootchart2-0.14.7.tar.gz 1175145 SHA256 abce617f0392b05619ee18f6a118f3445892bcedba6b762cdf467bafab2276a9 SHA512 82074a6ca6725a1b9ffe2a5d7f7bc6fd7918ab837573c23f75e7ebf209f30284ac7e59d2e84768ed313e4cee80da8e67dde167881d907fe71eff376ae9d16541 WHIRLPOOL 32b6cff0db49ccb3db0bf21b6b9fc05301a7fa0cd741149a118a41e2c12e82f5345f1a9e4c83aed53d48cf9809193554a583b3ccf37862b8af9277a458f42d58
-EBUILD bootchart2-0.14.5-r1.ebuild 2006 SHA256 4eea6e3828be89ee3293dc136a5a813e09bc73f8b496cb28403ecaf43943702b SHA512 907f4e68ec43388b74c3b7358a6087f921fb1abd1055722b9d5f956938e968c3eba147a22395bfefc8c290f40222186f8a4ab7afdcc76694b90de0ce466e76e2 WHIRLPOOL 63150a88950775eeb3abc318b4097286d332b9bd53ddffe4d7022e580e81e14eddd9087f468d9d9a5be40b5732974da0b5051f373bfdb2e53cb1a10c44922bfe
-EBUILD bootchart2-0.14.5.ebuild 2048 SHA256 b01d0004b2db281c018052bd04f8ec3470cf938ddd213093b340764898ead192 SHA512 84e9313ac309427b21b5bfb231a48f75b97b975fff1cde93ab46f36285dce1a295559bea002a07c9da79a73f8b5e3503b9f141a3d507d0f815ce287be28e19b8 WHIRLPOOL d271d0b9f336f2056436993946d53b36480d423e4744ce784d4280676191f11ecedec94252d9ddd8d5ccb44fb9509241170d5474628d8eaec9045bc53d1760df
 EBUILD bootchart2-0.14.7-r1.ebuild 1973 SHA256 74906097d5e2182f796ac6ef52e6ebd67c7c46bae1c6468c0bfdc19dc95a5772 SHA512 58dfc463c57ae996b868e59ca5c894f36faaa28533b0e615fbb18f39071a8f6f5e202db98da06f0c693418347b76e1e327d40127ed33d4043211d506b9903199 WHIRLPOOL e7bcbbb1dc6aabec5edb52450cbd16e0535f4caa6a782b043861da024050be3eb24557ab07d7c9c8d1c3a464d090dc2a89bd9ce2f8fcd08946110b7c935901f9
-MISC ChangeLog 3702 SHA256 649accfcb07c1f27bf01b327e9cd110bbd09a0b4c4f9265222fc93fc8af20436 SHA512 7fe9d9f9f96f442bdc8b06254c6e7b5d2b380b2e6fb2108e9574a0e7d634e3a8fc88adaae7423b391dcca720ce0397ac755a927181776e07e921c9baa8fa432d WHIRLPOOL 23b95cf01a0dedf00a1a743b82a383b282da637a6b16396ed7ed566c2684782df066def89d5f1cf49a7248ee79063df6282ae984c000c8234ac3e89394dd0ec9
+MISC ChangeLog 3820 SHA256 33f156d5cd6f5aec030250504d86c996a651ca73cca396e75500a3ed802e18c9 SHA512 549f19a351965cf885f5f8e101b74d60f9d3e9f8ef81e5464c5f73134d0dae4883e7d75522f020386ba760a45f0563ee0bd0148090ae46dcb19096f5631235e0 WHIRLPOOL e746c282e67f749f47d9c7441a253bda0fdedefd323c484b16d5189a6d328699daf3297bb38ca192cc331ec6b7be23524d678e77af695c3e3eeab8963bed6dd1
 MISC metadata.xml 290 SHA256 c3b3c8eda907c576d505fac6620791727b8c8bf848b1ff6de0989f467e842172 SHA512 f677910951e70141aa0e2124eda8ac36a28be0b433028fceb2a1bd0f00e0b404a6fded4d7d44f7b87aa3f35729ef79fe3a8efbc7797b0bd4d029496f5b7cf0ad WHIRLPOOL a0879f020c2fd2ed31c53accc8945e4b0138737dd572b19441c5ed10cb0c4a5953b974d4eb7da4c2c2d85afe7d7034fad2b5438b21680ae2834f8eda562f93ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcY/QXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVcZAIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLNUP/jOAZyyFjwzvBrXkO7IvL++J
-zL0+vR19j3k4ISpF14kM29LqTmjcD361Hb5SE89ag3qqp1M7UXQ2iu/rkAsQyfXp
-ve6o24eDgi0A4VuYx5abJvfVgRaaxSeGpjpVL+0uXrWqDwRP8EHhRNJyRsra+vYJ
-fTKlRkHa1Mx804xA+JnKkA4YhS5BdFdebQBmAqshBsj2MUL0jH+FxMruvce03VMX
-G7Y5B7xPdWHgPQ3Ly4I3Yr4R3Vwn+XD7dBYfNq9jMs2mVNWM0bz3brWyKXFjCY18
-HTUAGFY3pFpMP/yKYnhDlHonni974zZJkIcf5uOWdG6xvPFwqnCg7WYqP0r+K65N
-tAESl0ZqEXew1tFRFFYN9bAYw1+D059eAcVFecs/oSjwm/MEtc3HxMUrONwe3kC3
-t7ciLJ9c984JtaLFD5sB7Q2iVOOCm/HUfCHwz2ur7I35gy9Gyc75qohXIjNY39ZR
-fgaVVzjWJc1erLYJZl0oAhRjs8aNmdA2YTCyi5R5aHy7ZjIVEY83dw32ejkAQI7T
-oVo3KuNoiws+vwMc6uxySKH0QewfP2roJzNxUJ0oIB6F05vs0N+B9WZv71ckEKMt
-cfpWgDR6Tj3KULHZdxub2sZcFoCVuttSzRU+PFStssaaxRlZW1rvv32JBOXw6CcE
-dPLQqMcBHIFaMnWdKlx7
-=G3vd
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiH84P/1wtHUp6+wlMBJFZePOq2gtM
+JjzeRcrLAUf0Wbf0jdezZAXY5epyOZdMiMqDdjIWzd3CHkEsqPq+LHX5TTBW8ZzV
+WqUjTvt5kjYhRFY1VV5KOdD1c8g2VGzQxw8gHZ6NpFrfPLE0lXieLCPCxEJGjbSL
+HJ49dFeda2wNO2vfPQKYuFuSnTFfd6FIIdPJnGf079XUBVBT+Nv+YT3NGhxx1VO7
+66mIM66OKwb5x++j51oSFReKIONX+zZb/GdTN2CTufWsHmEdjgvlqkW3LE6J9pws
+V9WKSJgFtS19+7rwP36C6XVkrls9qe81JLFI+VpixSxKt1Fde19AxIG8d7IGOaU9
+dWVwWN2sQhf+3C0d97x83haDT7v3nLDhS8h9au5sCV5cyVPs5i/TYnOb4egspbF/
+iUq59+pt2zgmMlPTE5I24AlhxSXsc5Xee3nz9vqOoG4N2LFQ6MQCsq1dplwlRYqU
+jc14dk1W2gP9jwjNLx9vHvCZso31MuEWp1i8UtL+jPc70WF9mu9MPFLHQbahJ+xB
+cr+lxqC8eCVb36OgO2FXV3ZzLiv5ucD/iul/btFnl8T8JQXXhuS1sWW0zen8bt4d
+n7MjdQaKuGS/AHL1oJ+wnORzkiHWdZ+ueFe4D69rW4WxsQwr4SrO/0vExvEf5GTY
+x06/obH+4oOnGIyTmRvz
+=cy3B
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.5-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.5-r1.ebuild
deleted file mode 100644
index 80d2ec7cd64d..000000000000
--- a/app-benchmarks/bootchart2/bootchart2-0.14.5-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.5-r1.ebuild,v 1.4 2015/04/08 07:30:37 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit linux-info python-r1 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="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="svg test X"
-
-REQUIRED_USE="
-	X? ( ${PYTHON_REQUIRED_USE} )
-	test? ( X )"
-
-RDEPEND="
-	!app-benchmarks/bootchart
-	X? (
-		dev-python/pycairo[svg?,${PYTHON_USEDEP}]
-		dev-python/pygtk
-		${PYTHON_DEPS}
-		)
-	sys-apps/lsb-release"
-DEPEND="${PYTHON_DEPS}"
-
-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() {
-	python_foreach_impl emake test
-}
-
-src_install() {
-	export NO_PYTHON_COMPILE=1
-	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() {
-		python_domodule pybootchartgui
-
-		python_optimize "${ED}"/$(python_get_sitedir)
-		cp pybootchartgui.py "${T}"/pybootchartgui || die
-		python_newscript pybootchartgui.py pybootchartgui
-	}
-	use X && python_foreach_impl installation
-
-	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
-}
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.5.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.5.ebuild
deleted file mode 100644
index f2b000c7d7d5..000000000000
--- a/app-benchmarks/bootchart2/bootchart2-0.14.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.5.ebuild,v 1.7 2013/02/02 22:20:52 ago Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~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
-}