Drop old

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

6 files changed, 27 insertions, 344 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/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}