Drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

7 files changed, 44 insertions, 367 deletions

diff --git a/app-benchmarks/phoronix-test-suite/ChangeLog b/app-benchmarks/phoronix-test-suite/ChangeLog
index 162d9c95d3dc..e38f15f74e48 100644
--- a/app-benchmarks/phoronix-test-suite/ChangeLog
+++ b/app-benchmarks/phoronix-test-suite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/phoronix-test-suite
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/ChangeLog,v 1.31 2015/03/21 08:13:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/ChangeLog,v 1.32 2015/03/21 08:24:55 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  -phoronix-test-suite-4.6.0.ebuild, -phoronix-test-suite-4.6.1.ebuild,
+  -phoronix-test-suite-4.8.3.ebuild, metadata.xml,
+  phoronix-test-suite-4.8.4.ebuild:
+  Drop old
 
   21 Mar 2015; Justin Lecher <jlec@gentoo.org> phoronix-test-suite-4.6.0.ebuild,
   phoronix-test-suite-4.6.1.ebuild, phoronix-test-suite-4.8.3.ebuild,
diff --git a/app-benchmarks/phoronix-test-suite/Manifest b/app-benchmarks/phoronix-test-suite/Manifest
index 2c168ab557fc..a6d20f95e3cf 100644
--- a/app-benchmarks/phoronix-test-suite/Manifest
+++ b/app-benchmarks/phoronix-test-suite/Manifest
@@ -1,32 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST phoronix-test-suite-4.6.0.tar.gz 510303 SHA256 5f960f34612c09ec473db27e8fcd89773646739c070f9009cf353388a022f2d6 SHA512 2b1fbbdb40c62edb9d3f5caf5b2ac0cc78df747ffe3ddd5dfa75417688eeb8c845f2921890051a9a442d658fe663dc0d9c53fa2f1c9132163ff82c181af0f450 WHIRLPOOL fb50b3e305bdc6a0e9471eb96a7a2af488ffd810e3cc7554abcfa93fdd76c4098a21bd195ec28192837b4f219189aba41bcb57f9fcab2c36e430ba517b6d4f27
-DIST phoronix-test-suite-4.6.1.tar.gz 510999 SHA256 882193e590f54490a15e981bea23c529987ca3a660240747fb5e86029d76facd SHA512 e7d4461b432a22b98a3f9ec5432ce94b4a79c09def0c69a8681cf4a4035162a12b6d46838055d278d735e6604ef19078ecb802299ad4d79c89d722b1d3b9bf6b WHIRLPOOL 2f2dc2bbbe29da669f1fc73c8e63d853320d6dee19ee0e9bdb6e1f2ad0baa3c4a84419cb29bd34838c83382b9a6655ee0a74dfca395907d44ba7b0420e519d30
-DIST phoronix-test-suite-4.8.3.tar.gz 521992 SHA256 75d5c13f0c4bde749d6bcf47ab4e8a34ba6d754c2f6034327b6c46e49dc94e57 SHA512 902ff3f9ca6738524796f30d790e6f32a41b3508fea10235df66cd3431a01692ab25ee062ba981caa9aa5a5325874096757cc03484ea41046ac3270588f0c4dd WHIRLPOOL f050c6f51f5daa40b0e5a75db66f2ae0739cbc57b1fd625ec14bfff3d19b4c616c6c7404c1f4fc6c9c5dca2c47cf8927a0a9b230da037b3ab2f21ac361f7f2ec
 DIST phoronix-test-suite-4.8.4.tar.gz 523952 SHA256 113e6c725672c1f379885575e7cd51a3d0a387dc1c842606840e27fcd4695e43 SHA512 e7c201467a52fbbb9b0a87a47bd1eb772e24e43bedc2baf02845a9e9f355d6c22f46901be390d501a0e721ccfa05d28da4b8362817518ba5c801d6f4422c3b6f WHIRLPOOL 0760916473d8544652c0fc9c53f57a41015aacb99b42f53186d8b5008cbe5b2b396b024ce51ba3a3e31c35b319bac63db17db2b29295a8414c031c16d73813f6
-EBUILD phoronix-test-suite-4.6.0.ebuild 3341 SHA256 8236e8f1aafe8753c7943632029848141dab99db81605e2f565d45e4942a6ff4 SHA512 ebf752c11015ddeed2aae84e1278585a9c39b79c5d13fdde7400a53b6ada8c2e5280c6a1f9f2ec8c3c75ae95f23d283cdca33d0a2fbbc7006c1b388c4481b3e9 WHIRLPOOL 2093e3e200c625c5ab34de9678c0ff446bb19a7338a9eb17bff58a28de3961fc881763686a15973c6b9c5bdae6268180c13ec9af1806a8ab13352108ffa26a43
-EBUILD phoronix-test-suite-4.6.1.ebuild 3341 SHA256 d33570e727040d03017cb315888e4d396e2231b984da89a46431268f68c3ee64 SHA512 4530e96f0c13a795ac94956aa8e2bde5508f8022ddda3acc3c699077ad1f7092b209bbf65a134f0ac341eb83caa5a0b540ffb219b2b6954028ffb32e49784bc0 WHIRLPOOL 724ab9f8683da2b76bfd557fe682b7aa44328a73abf2198a2adb29741e908ec18a6ce8fc179669b604ec140925d16fb78df7e161a46b6d2cdf5ac4d120a4446d
-EBUILD phoronix-test-suite-4.8.3.ebuild 3341 SHA256 b68701c1c84d2ea38161df81de731bbf61212ee10e93959c77301d7b21efad41 SHA512 f6685372a1a4e7563fbef84c0d162b9ccc1b5d7d8fd1d82de6291fc9782d50f6532864dfb46eb50c130e08e838bc6def1e4f98680956506da8ff6cd45277924e WHIRLPOOL 1a35e8c3dfbae1f76a332c91b67d4eb7fca6d646612faab2a0c8fb58916a8d4969e8c12c379652967456f3dfd8184f229e18d94da5ec289cd98a0e999d3cc9d6
-EBUILD phoronix-test-suite-4.8.4.ebuild 3324 SHA256 8a7e9661e9710d8603499e026f494f0a2ee52adfaf79312f8d937d411472aee2 SHA512 fcf4225387a83798a22ee57eda14401ee16e2eaab8fc291e06a3d4004865347211463f24e92f6c9645048888c8cd1b0263181e366f9ae61cd7ca35c90072d211 WHIRLPOOL 9b1ae33ecea295b913c2003e712718e6a24a8ddc5c18c5238b642f29b510afe1e9e029296a272a3a4e470d5b0029c02da34e6455327627a5e0847d0014f42d2c
-MISC ChangeLog 5535 SHA256 492e693ba83f4e7335b36198121ec6be317df8444b9970cb5f23f69480ca395b SHA512 5da1dac721e72a17d1f0b5993b8380aeb1ee721f693204292b2f04bd9b4e5ec29fe528cfb33219a227f29a136c9624a0ba721ee5aa6353eaefdd5bb3d174b60d WHIRLPOOL 225dd68f3e121a61b26548f4e95e38db60767122f85ef5d0afddaeb73d0843241568210392014655e0e44979ed11d10aacaed73a7607236bff721f58e20ec953
-MISC metadata.xml 259 SHA256 33ff114274f223a0385a54254536f9d2078f12a84a6779a6739341c024cec67a SHA512 10db7e564acee3578a4a18ed026fd9d54d9dd505cdb7d89e3e0e9b3fbbab8b97a9a8899e0b9958ea2f871f423f92e2850539b7ad5cf863f6215017323433074f WHIRLPOOL f0ddafd2b30dc55c2459b8a94eb7309f66cb8f79d2a887c38774491d1012a04c38d34fb97371585c33fc8a10a44d18746298df795467774d8d5a8758364b4dd2
+EBUILD phoronix-test-suite-4.8.4.ebuild 3330 SHA256 ec8c3cffd6a4de6c690b7a697bcfd55f1a67cde18d12b75e971b20d4f503dab9 SHA512 5794512a3714351dc191157469297d7e9e7cad73c5fd5932c78c6b4626f474680d3c88fae906ef9abb003f8e64e96b08c012377a9b3aa9048882d13a99f58f19 WHIRLPOOL 01833b235a1c0afe9d3f2bcd39cc5268bdf5adaa2a6aff5bf5249bec133c93c8227f2989cac94f985898771c88c99d0e3a86a238fcdd7c57fdf5b6c6eb0010e9
+MISC ChangeLog 5753 SHA256 d3560c1c6a69a445d57adbb9937f86c305afa65f3577457d384a4668495df681 SHA512 4f81ca38f5db94ef361631e163a918d4f7a15d7d0f8b6ca5c932bc10ae07eb822324cd961b11c41940589bd9584dd653fee6b60edfe784175cf3bf9085f0f60a WHIRLPOOL 58bdc0c04cefe9822f1d43eeee5d12e15a38e0bbf658751a4cd944007310bb097e2cd6590b797d9f723b25f03f068d0ec0ef35fddc9289bbb2903ee2de4241c9
+MISC metadata.xml 265 SHA256 68be96a4261c581276f6675578dac7a763b6f3fddd9cec3915280f9292218f39 SHA512 adc89fd87e9b26291dbd33a4f4566bc270fd71f9bfafa8f1d781f50c111a9275ce630fffa9f7b7a946a4c01374baf03a0200fb6ec010d625885b047a8c5c33a5 WHIRLPOOL 81c770e498a31811fd1844877cc4e59329374279bb317619b1a4088651d9c027f1706e9cab47580da2a5b3bc739463d8ea8c179d2ec79ac2cf1bde41781d4a5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVDShCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVDSrYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVircXQP/3K484vvumYwiNd8ZzLBFIvb
-spTO2iWydek3OfwRrfE1KExcwnEVNMkE5R1YUKBLHYRcw5i+lROUCjbizN+stWsA
-5dktSG/+DLD5H7Z9z6O8ULl+HaVtawCY4B0GjAMCQc/X1ovhESh+ksq5d9tunWK/
-zAsB+Vj6f33tVyR874HcTyLmIN62wmqoswuclA5zhE/HrcYLliEQr3TzWMT2Wm2F
-9YWeNQyAinBTDwO56xogcTvCVQaHRlBJGjBSs29+n1YDOzOYmnYALsIoVkl/PDVb
-Vleb2K1YY5h/QnW/rJ4PYvVoiV7ikcSHPkiPfhQ7ElIbEUzdIUcNNQYclW+LKotL
-aiKUEW6QxG5b/1HhJXQklzawDE2fXFs31yiLX3HDvJPaw1zWUPQVvSMxj9//oDqs
-OWIS4d6nyDs+i4KucLreHg+mRirvCxPkNdTLfzUFTVyWDbJClMcWAK/FLx1TDCz1
-v7F3jydK02mrbrFYmLaQd8U2aiMeJ8iSVbL1G+8BtT6JGxeEPsS5oi8FApKdrKW7
-9rc0fPJus5NsdutZAqz1ppl6Iy00VyFibvCjgQV1YpOYEOQMVIPDM2w+vuLMAEFl
-BwN5gmsiwROHKMMBycYTri1SLFmlxDi9aO9SX3OaijyPB4Ed4SbiVUxxP25NsXqP
-T2hRybRv86CWJmt9UP8N
-=lvQ3
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir4qkP/AjAhlcUwbP2DcMUwNv+r8ze
+/UCLZx0g8Dn6apqh6ofWaz1QjaTFFf286eqZyXxJjslB+d5U4RTV2MdMlJwuFlV0
+7WAzOI2kUgzxW9RqJBm9VpubTVWVn3pAhp0OEYkXIVes6MuOrYSzHlw5vN3gpEyN
+K5HGkS9bANZnKDk3UOTTXpUhOuvvg0f6j8t9AHo9aM/D27xhpN3B2wa9W4xD7Uqq
+0Db0s0PlCgMuS1H5zok/H1lFm59GxkqyPS7EgvuMB62fnN0XDWwslDVTW1/4u3Ot
+vzIgKZLK1/6TY0J+6xPaZ2156e6WflgHw29x0BfTZcTOHuFqT/mt2le9LC5VRoWs
+wfoqw3izz5rD5GiuHwBa3sAvpaFCtrchszhhHWNlcbLTbjv/20zml7LIQemeM80+
+feOsrpLLIADCtvAwYWUo10s4qy8QSbjwltBATfZ1XEX0Wtl2Qo/dI5wJwC9ykQZV
+kZrkasLW8PnqwctigyDIdqjJFCUCd/4P0iYsBil2ZWqg1ipsF36PmoIaSou7kXiB
+Unpt5WQYbf4TRbwWc9XZZrmjR1muvjj0gEPFG2zbsbJYXOLlkox6A4v2EMaAvmYW
+lMljRWtUbwJk5kKVy94e8ucWXaUzNKBV5NB7B/UsM5eltuxiWeSk8hJe80SPBUkG
+o09LgDr/AnlAeGi+6jaq
+=nSST
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/phoronix-test-suite/metadata.xml b/app-benchmarks/phoronix-test-suite/metadata.xml
index 4ae12df4e63c..d850fdc52f8c 100644
--- a/app-benchmarks/phoronix-test-suite/metadata.xml
+++ b/app-benchmarks/phoronix-test-suite/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>benchmarks</herd>
-	<maintainer>
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
+  <herd>benchmarks</herd>
+  <maintainer>
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
 </pkgmetadata>
-
diff --git a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.6.0.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.6.0.ebuild
deleted file mode 100644
index a27d59860d16..000000000000
--- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.6.0.ebuild
+++ /dev/null
@@ -1,108 +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/phoronix-test-suite/phoronix-test-suite-4.6.0.ebuild,v 1.2 2015/03/21 08:13:53 jlec Exp $
-
-EAPI=4
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Phoronix's comprehensive, cross-platform testing and benchmark suite"
-HOMEPAGE="http://www.phoronix-test-suite.com"
-SRC_URI="http://www.phoronix-test-suite.com/download.php?file=${P} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-
-# php 5.3 doesn't have pcre and reflection useflags anymore
-RDEPEND="dev-lang/php[cli,curl,gd,json,posix,pcntl,truetype,zip]
-	dev-php/pecl-ps"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i -e "s,export PTS_DIR=\`pwd\`,export PTS_DIR=\"/usr/share/${PN}\"," \
-		phoronix-test-suite
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-
-	doman documentation/man-pages/phoronix-test-suite.1
-	dodoc AUTHORS CHANGE-LOG
-	dohtml -r documentation/
-	doicon pts-core/static/images/phoronix-test-suite.png
-	doicon pts-core/static/images/openbenchmarking.png
-	domenu pts-core/static/phoronix-test-suite.desktop
-	rm -f pts-core/static/phoronix-test-suite.desktop
-
-	doins -r pts-core
-	dobin phoronix-test-suite
-
-	fperms a+x /usr/share/${PN}/pts-core/static/scripts/root-access.sh
-	fperms a+x /usr/share/${PN}/pts-core/external-test-dependencies/scripts/install-gentoo-packages.sh
-
-	dobashcompletion pts-core/static/bash_completion ${PN}
-
-	# Need to fix the cli-php config for downloading to work. Very naughty!
-	local slots
-	local slot
-	if [[ "x${PHP_TARGETS}" == "x" ]] ; then
-		ewarn
-		ewarn "PHP_TARGETS seems empty, php.ini file can't be configure."
-		ewarn "Make sure that PHP_TARGETS in /etc/make.conf is set."
-		ewarn "phoronix-test-suite needs the 'allow_url_fopen' option set to \"On\""
-		ewarn "for downloading to work properly."
-		ewarn
-	else
-		for slot in ${PHP_TARGETS}; do
-			slots+=" ${slot/-/.}"
-		done
-	fi
-
-	for slot in ${slots}; do
-		local PHP_INI_FILE="/etc/php/cli-${slot}/php.ini"
-		if [[ -f ${PHP_INI_FILE} ]] ; then
-			dodir $(dirname ${PHP_INI_FILE})
-			cp ${PHP_INI_FILE} "${D}${PHP_INI_FILE}"
-			sed -e 's|^allow_url_fopen .*|allow_url_fopen = On|g' -i "${D}${PHP_INI_FILE}"
-		else
-			if [[ "x$(eselect php show cli)" == "x${slot}" ]] ; then
-				ewarn
-				ewarn "${slot} hasn't a php.ini file."
-				ewarn "phoronix-test-suite needs the 'allow_url_fopen' option set to \"On\""
-				ewarn "for downloading to work properly."
-				ewarn "Check that your PHP_INI_VERSION is set during ${slot} merge"
-				ewarn
-			else
-				elog
-				elog "${slot} hasn't a php.ini file."
-				elog "phoronix-test-suite may need the 'allow_url_fopen' option set to \"On\""
-				elog "for downloading to work properly if you switch to ${slot}"
-				elog "Check that your PHP_INI_VERSION is set during ${slot} merge"
-				elog
-			fi
-		fi
-	done
-
-	ewarn
-	ewarn "If you upgrade from phoronix-test-suite-2*, you should reinstall all"
-	ewarn "your tests because"
-	ewarn "   \$HOME/.phoronix-test-suite/installed-tests/\$TEST_NAME/"
-	ewarn "moves to"
-	ewarn "   \$HOME/.phoronix-test-suite/installed-tests/pts/\$TEST_NAME-\$TEST_VERSION/"
-	ewarn "in phoronix-test-suite-3* version. The \$TEST_VERSION can be find in"
-	ewarn "pts-install.xml file."
-	ewarn
-}
diff --git a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.6.1.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.6.1.ebuild
deleted file mode 100644
index 68e631a6e0f7..000000000000
--- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.6.1.ebuild
+++ /dev/null
@@ -1,108 +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/phoronix-test-suite/phoronix-test-suite-4.6.1.ebuild,v 1.2 2015/03/21 08:13:53 jlec Exp $
-
-EAPI=4
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Phoronix's comprehensive, cross-platform testing and benchmark suite"
-HOMEPAGE="http://www.phoronix-test-suite.com"
-SRC_URI="http://www.phoronix-test-suite.com/download.php?file=${P} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-
-# php 5.3 doesn't have pcre and reflection useflags anymore
-RDEPEND="dev-lang/php[cli,curl,gd,json,posix,pcntl,truetype,zip]
-	dev-php/pecl-ps"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i -e "s,export PTS_DIR=\`pwd\`,export PTS_DIR=\"/usr/share/${PN}\"," \
-		phoronix-test-suite
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-
-	doman documentation/man-pages/phoronix-test-suite.1
-	dodoc AUTHORS CHANGE-LOG
-	dohtml -r documentation/
-	doicon pts-core/static/images/phoronix-test-suite.png
-	doicon pts-core/static/images/openbenchmarking.png
-	domenu pts-core/static/phoronix-test-suite.desktop
-	rm -f pts-core/static/phoronix-test-suite.desktop
-
-	doins -r pts-core
-	dobin phoronix-test-suite
-
-	fperms a+x /usr/share/${PN}/pts-core/static/scripts/root-access.sh
-	fperms a+x /usr/share/${PN}/pts-core/external-test-dependencies/scripts/install-gentoo-packages.sh
-
-	dobashcompletion pts-core/static/bash_completion ${PN}
-
-	# Need to fix the cli-php config for downloading to work. Very naughty!
-	local slots
-	local slot
-	if [[ "x${PHP_TARGETS}" == "x" ]] ; then
-		ewarn
-		ewarn "PHP_TARGETS seems empty, php.ini file can't be configure."
-		ewarn "Make sure that PHP_TARGETS in /etc/make.conf is set."
-		ewarn "phoronix-test-suite needs the 'allow_url_fopen' option set to \"On\""
-		ewarn "for downloading to work properly."
-		ewarn
-	else
-		for slot in ${PHP_TARGETS}; do
-			slots+=" ${slot/-/.}"
-		done
-	fi
-
-	for slot in ${slots}; do
-		local PHP_INI_FILE="/etc/php/cli-${slot}/php.ini"
-		if [[ -f ${PHP_INI_FILE} ]] ; then
-			dodir $(dirname ${PHP_INI_FILE})
-			cp ${PHP_INI_FILE} "${D}${PHP_INI_FILE}"
-			sed -e 's|^allow_url_fopen .*|allow_url_fopen = On|g' -i "${D}${PHP_INI_FILE}"
-		else
-			if [[ "x$(eselect php show cli)" == "x${slot}" ]] ; then
-				ewarn
-				ewarn "${slot} hasn't a php.ini file."
-				ewarn "phoronix-test-suite needs the 'allow_url_fopen' option set to \"On\""
-				ewarn "for downloading to work properly."
-				ewarn "Check that your PHP_INI_VERSION is set during ${slot} merge"
-				ewarn
-			else
-				elog
-				elog "${slot} hasn't a php.ini file."
-				elog "phoronix-test-suite may need the 'allow_url_fopen' option set to \"On\""
-				elog "for downloading to work properly if you switch to ${slot}"
-				elog "Check that your PHP_INI_VERSION is set during ${slot} merge"
-				elog
-			fi
-		fi
-	done
-
-	ewarn
-	ewarn "If you upgrade from phoronix-test-suite-2*, you should reinstall all"
-	ewarn "your tests because"
-	ewarn "   \$HOME/.phoronix-test-suite/installed-tests/\$TEST_NAME/"
-	ewarn "moves to"
-	ewarn "   \$HOME/.phoronix-test-suite/installed-tests/pts/\$TEST_NAME-\$TEST_VERSION/"
-	ewarn "in phoronix-test-suite-3* version. The \$TEST_VERSION can be find in"
-	ewarn "pts-install.xml file."
-	ewarn
-}
diff --git a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.8.3.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.8.3.ebuild
deleted file mode 100644
index c66141c8baf8..000000000000
--- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.8.3.ebuild
+++ /dev/null
@@ -1,108 +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/phoronix-test-suite/phoronix-test-suite-4.8.3.ebuild,v 1.2 2015/03/21 08:13:53 jlec Exp $
-
-EAPI=4
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Phoronix's comprehensive, cross-platform testing and benchmark suite"
-HOMEPAGE="http://www.phoronix-test-suite.com"
-SRC_URI="http://www.phoronix-test-suite.com/download.php?file=${P} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-
-# php 5.3 doesn't have pcre and reflection useflags anymore
-RDEPEND="dev-lang/php[cli,curl,gd,json,posix,pcntl,truetype,zip]
-	dev-php/pecl-ps"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i -e "s,export PTS_DIR=\`pwd\`,export PTS_DIR=\"/usr/share/${PN}\"," \
-		phoronix-test-suite
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-
-	doman documentation/man-pages/phoronix-test-suite.1
-	dodoc AUTHORS CHANGE-LOG
-	dohtml -r documentation/
-	doicon pts-core/static/images/phoronix-test-suite.png
-	doicon pts-core/static/images/openbenchmarking.png
-	domenu pts-core/static/phoronix-test-suite.desktop
-	rm -f pts-core/static/phoronix-test-suite.desktop
-
-	doins -r pts-core
-	dobin phoronix-test-suite
-
-	fperms a+x /usr/share/${PN}/pts-core/static/scripts/root-access.sh
-	fperms a+x /usr/share/${PN}/pts-core/external-test-dependencies/scripts/install-gentoo-packages.sh
-
-	dobashcompletion pts-core/static/bash_completion ${PN}
-
-	# Need to fix the cli-php config for downloading to work. Very naughty!
-	local slots
-	local slot
-	if [[ "x${PHP_TARGETS}" == "x" ]] ; then
-		ewarn
-		ewarn "PHP_TARGETS seems empty, php.ini file can't be configure."
-		ewarn "Make sure that PHP_TARGETS in /etc/make.conf is set."
-		ewarn "phoronix-test-suite needs the 'allow_url_fopen' option set to \"On\""
-		ewarn "for downloading to work properly."
-		ewarn
-	else
-		for slot in ${PHP_TARGETS}; do
-			slots+=" ${slot/-/.}"
-		done
-	fi
-
-	for slot in ${slots}; do
-		local PHP_INI_FILE="/etc/php/cli-${slot}/php.ini"
-		if [[ -f ${PHP_INI_FILE} ]] ; then
-			dodir $(dirname ${PHP_INI_FILE})
-			cp ${PHP_INI_FILE} "${D}${PHP_INI_FILE}"
-			sed -e 's|^allow_url_fopen .*|allow_url_fopen = On|g' -i "${D}${PHP_INI_FILE}"
-		else
-			if [[ "x$(eselect php show cli)" == "x${slot}" ]] ; then
-				ewarn
-				ewarn "${slot} hasn't a php.ini file."
-				ewarn "phoronix-test-suite needs the 'allow_url_fopen' option set to \"On\""
-				ewarn "for downloading to work properly."
-				ewarn "Check that your PHP_INI_VERSION is set during ${slot} merge"
-				ewarn
-			else
-				elog
-				elog "${slot} hasn't a php.ini file."
-				elog "phoronix-test-suite may need the 'allow_url_fopen' option set to \"On\""
-				elog "for downloading to work properly if you switch to ${slot}"
-				elog "Check that your PHP_INI_VERSION is set during ${slot} merge"
-				elog
-			fi
-		fi
-	done
-
-	ewarn
-	ewarn "If you upgrade from phoronix-test-suite-2*, you should reinstall all"
-	ewarn "your tests because"
-	ewarn "   \$HOME/.phoronix-test-suite/installed-tests/\$TEST_NAME/"
-	ewarn "moves to"
-	ewarn "   \$HOME/.phoronix-test-suite/installed-tests/pts/\$TEST_NAME-\$TEST_VERSION/"
-	ewarn "in phoronix-test-suite-3* version. The \$TEST_VERSION can be find in"
-	ewarn "pts-install.xml file."
-	ewarn
-}
diff --git a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.8.4.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.8.4.ebuild
index 00e9c368dd20..bbd7dfef9df0 100644
--- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.8.4.ebuild
+++ b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.8.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.8.4.ebuild,v 1.2 2015/03/21 08:13:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.8.4.ebuild,v 1.3 2015/03/21 08:24:55 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-inherit eutils bash-completion-r1
+inherit bash-completion-r1 eutils
 
-DESCRIPTION="Phoronix's comprehensive, cross-platform testing and benchmark suite"
+DESCRIPTION="The comprehensive, cross-platform testing and benchmark suite"
 HOMEPAGE="http://www.phoronix-test-suite.com"
 SRC_URI="http://www.phoronix-test-suite.com/download.php?file=${P} -> ${P}.tar.gz"
 
@@ -23,8 +23,9 @@ RDEPEND="dev-lang/php[cli,curl,gd,json,posix,pcntl,truetype,zip]"
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	sed -i -e "s,export PTS_DIR=\`pwd\`,export PTS_DIR=\"/usr/share/${PN}\"," \
-		phoronix-test-suite
+	sed \
+		-e "s,export PTS_DIR=\`pwd\`,export PTS_DIR=\"/usr/share/${PN}\"," \
+		-i phoronix-test-suite || die
 }
 
 src_configure() {
@@ -36,21 +37,22 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/share/${PN}
-
 	doman documentation/man-pages/phoronix-test-suite.1
 	dodoc AUTHORS CHANGE-LOG
 	dohtml -r documentation/
-	doicon pts-core/static/images/phoronix-test-suite.png
-	doicon pts-core/static/images/openbenchmarking.png
+	doicon \
+		pts-core/static/images/phoronix-test-suite.png \
+		pts-core/static/images/openbenchmarking.png
 	domenu pts-core/static/phoronix-test-suite.desktop
-	rm -f pts-core/static/phoronix-test-suite.desktop
+	rm -f pts-core/static/phoronix-test-suite.desktop || die
 
+	insinto /usr/share/${PN}
 	doins -r pts-core
 	dobin phoronix-test-suite
 
-	fperms a+x /usr/share/${PN}/pts-core/static/scripts/root-access.sh
-	fperms a+x /usr/share/${PN}/pts-core/external-test-dependencies/scripts/install-gentoo-packages.sh
+	fperms a+x \
+		/usr/share/${PN}/pts-core/static/scripts/root-access.sh \
+		/usr/share/${PN}/pts-core/external-test-dependencies/scripts/install-gentoo-packages.sh
 
 	dobashcompletion pts-core/static/bash_completion ${PN}