Bump

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 12 insertions, 178 deletions

diff --git a/app-benchmarks/phoronix-test-suite/ChangeLog b/app-benchmarks/phoronix-test-suite/ChangeLog
index cc8e17e54566..6872026b3fc2 100644
--- a/app-benchmarks/phoronix-test-suite/ChangeLog
+++ b/app-benchmarks/phoronix-test-suite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-benchmarks/phoronix-test-suite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/ChangeLog,v 1.21 2013/04/04 18:37:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/ChangeLog,v 1.22 2013/04/10 08:56:01 patrick Exp $
+
+*phoronix-test-suite-4.4.1 (10 Apr 2013)
+
+  10 Apr 2013; Patrick Lauer <patrick@gentoo.org>
+  +phoronix-test-suite-4.4.1.ebuild, -phoronix-test-suite-2.8.1-r1.ebuild,
+  -phoronix-test-suite-3.2.1.ebuild, -phoronix-test-suite-3.8.0.ebuild:
+  Bump
 
 *phoronix-test-suite-4.4.0 (04 Apr 2013)
 
diff --git a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.8.1-r1.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.8.1-r1.ebuild
deleted file mode 100644
index 5463d2530ba3..000000000000
--- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 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-2.8.1-r1.ebuild,v 1.4 2011/12/14 22:55:55 mabi Exp $
-
-EAPI=4
-
-inherit eutils
-
-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 useflag anymore
-RDEPEND=">=dev-lang/php-5.2[cli,curl,gd,posix,pcntl,pcre(+),truetype]
-		app-arch/unzip
-		dev-php/pecl-ps"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/font.patch
-	sed -i -e "s,export PTS_DIR=\`pwd\`,export PTS_DIR=\"/usr/share/${PN}\"," \
-		phoronix-test-suite
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins -r {pts,pts-core}
-
-	doman documentation/man-pages/phoronix-test-suite.1
-	dodoc AUTHORS CHANGE-LOG
-	dohtml README.html
-
-	exeinto /usr/bin
-	doexe phoronix-test-suite
-
-	# this is horribly ugly because fperms uses absolute relative paths, so we have one ${D} wrongly added in
-	# ... so we use parameter expansion to remove it, and add a trailing slash because argh noooes
-	for i in  ${D}usr/share/${PN}/pts/test-resources/*/*.sh ${D}/usr/share/${PN}/pts/base-test-resources/*/*.sh ${D}/usr/share/${PN}/pts-core/test-libraries/*.sh; do
-		fperms a+x /${i#${D}}
-	done
-
-	# Need to fix the cli-php config for downloading to work. Very naughty!
-	dodir /etc/php/cli-php5
-	cp /etc/php/cli-php5/php.ini "${D}/etc/php/cli-php5/php.ini"
-	sed -e 's|^allow_url_fopen .*|allow_url_fopen = On|g' -i "${D}/etc/php/cli-php5/php.ini"
-}
diff --git a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-3.8.0.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-3.8.0.ebuild
deleted file mode 100644
index b9278b5a092c..000000000000
--- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-3.8.0.ebuild
+++ /dev/null
@@ -1,110 +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/phoronix-test-suite/phoronix-test-suite-3.8.0.ebuild,v 1.1 2012/03/22 06:31:23 patrick Exp $
-
-EAPI=4
-
-inherit eutils bash-completion
-
-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:5.3[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() {
-	dodir /usr/share/${PN}
-	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
-	exeinto /usr/bin
-	doexe 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-3.2.1.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.4.1.ebuild
index b6d7c39c8655..9825ac2650d4 100644
--- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-3.2.1.ebuild
+++ b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.4.1.ebuild
@@ -1,10 +1,10 @@
-# 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/phoronix-test-suite/phoronix-test-suite-3.2.1.ebuild,v 1.3 2012/03/22 06:17:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.4.1.ebuild,v 1.1 2013/04/10 08:56:01 patrick Exp $
 
 EAPI=4
 
-inherit eutils bash-completion
+inherit eutils bash-completion-r1
 
 DESCRIPTION="Phoronix's comprehensive, cross-platform testing and benchmark suite"
 HOMEPAGE="http://www.phoronix-test-suite.com"
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND=""
 
 # php 5.3 doesn't have pcre and reflection useflags anymore
-RDEPEND="dev-lang/php:5.3[cli,curl,gd,json,posix,pcntl,truetype,zip]
+RDEPEND="dev-lang/php[cli,curl,gd,json,posix,pcntl,truetype,zip]
 	dev-php/pecl-ps"
 
 S="${WORKDIR}/${PN}"