Bump

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64

3 files changed, 120 insertions, 2 deletions

diff --git a/app-benchmarks/phoronix-test-suite/ChangeLog b/app-benchmarks/phoronix-test-suite/ChangeLog
index 4dbbe6f7dc21..ac3217f1aebe 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/ChangeLog,v 1.23 2013/06/03 05:30:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/ChangeLog,v 1.24 2013/06/13 03:25:58 patrick Exp $
+
+*phoronix-test-suite-4.6.1 (13 Jun 2013)
+
+  13 Jun 2013; Patrick Lauer <patrick@gentoo.org>
+  +phoronix-test-suite-4.6.1.ebuild:
+  Bump
 
 *phoronix-test-suite-4.6.0 (03 Jun 2013)
 
diff --git a/app-benchmarks/phoronix-test-suite/Manifest b/app-benchmarks/phoronix-test-suite/Manifest
index 0b76ff593a6b..c7d7f2ffa2c5 100644
--- a/app-benchmarks/phoronix-test-suite/Manifest
+++ b/app-benchmarks/phoronix-test-suite/Manifest
@@ -4,10 +4,12 @@ DIST phoronix-test-suite-4.2.0.tar.gz 499461 SHA256 48ee8ecf73702756c6787f686cf2
 DIST phoronix-test-suite-4.4.0.tar.gz 506243 SHA256 dd42025a785dd4597bdad3620a048af27d069a353e71eb6e057828bf2798108d SHA512 60aa8a7e2aa805cc5a18e420ab3b9971bf28b041b6c59c9212d4bf308d0c29d0bf1314eb7d5b28b2a6b0e0b0341607225d72e3b4ae62916132b9b975b5ae215b WHIRLPOOL c070410d28aaa65d70bafbced09a4ab945e483fed01a2f7289ba9fdebcd422515c6049ae2563f52c4243126dd7e3e5b2d374030636eaf6cd081d99fd1b49b86f
 DIST phoronix-test-suite-4.4.1.tar.gz 506975 SHA256 96b4c928241e4847e00109f40b26c1c186e6284264fda747c96db1dbe2f3b3a3 SHA512 e53f4bf6ad4c438775271ccc172220b6da94908bd343737b1355ccfba6cc51f796fea9d73afc2e34010c30e72c2fd6829e7e3eac0c94909648f956595ecd4f84 WHIRLPOOL 46655faf820833f25438741ec5fed0a500593f6ee0df32bea7bd8d9ef09daffac4c283cf98883aa3b66137eefd9f0ca27c0cdda542815d31ac0459734329807f
 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
 EBUILD phoronix-test-suite-4.0.1.ebuild 3383 SHA256 6f7b4657efac6ae9200b9c78f8ce0b533bd42316919ea45d0147787b76147ee1 SHA512 ee242ccd39540621e17d5521c9d7a12b379a1b3a791a43f99561d40d26317dcef31827cf874839eec5ab64b408f66fb4599e1019c20bf7841f9ff87aaadd106e WHIRLPOOL c3c2c95dc84394220c4bf6bddb680bca285a90d090fd8e01217ac117218cc4c3fdfbbf1030ff7680aab77d77264bda70323b09417dc72690e289410b2e50524c
 EBUILD phoronix-test-suite-4.2.0.ebuild 3383 SHA256 1a62c4053b70c00f7a51a73476e902a8054fe43e5da3aaf90cd65a2ce6420c30 SHA512 e5f1f71b2a1afd46f7adcf2cafe2cfaa640ab70f83f488bb6d637d444cc847d2c0617887b9e2b66d92cbda1b0a22bc353c1b8eacde956a59c85b8e9d5a07af82 WHIRLPOOL c7c2201050531f006b8af96cc3b045412105ff6c8f8d7c9d40f9b37cbf52188bce887886638fea58332ffe9b76095ab0c86e2965d95c81a26abe8cf0b9c16513
 EBUILD phoronix-test-suite-4.4.0.ebuild 3383 SHA256 2c5659949e012be52f1225dff6269169fa5ed5d8dcf16993c730b1f386a4ca78 SHA512 2a7b6e1d2fac6f9061cce17725b49f4f56277cab50d1cd346e286f49cb36491cafe6979260540b972211594b982c772a72e8d729f7772b757803253831d47e9e WHIRLPOOL dbe2e9a737303372d69383783c72fef55833f7c004ff1a7d6116ab9d3c992d150a0a93f3e833c155d79cf770a4549ea81b79fedcfe4b7b6e3cb3130731c78ce3
 EBUILD phoronix-test-suite-4.4.1.ebuild 3386 SHA256 8c2814d2a6fbb1247e3ae2489d2f66cf3c756b40c5f0997fc5486bb107eddbc7 SHA512 21802e5d3347ceead77cf1f0ef221528d1e0c383876f78123c537dfb2d4c123e712835fbc52ccde3e32752626e8fc7f0720c1aa4f9568b8c5bf36b3daf00323d WHIRLPOOL fa0750e258fc14549e1715876c0fa5b22dfaf8cd1f71f195f380d4d64a3ee9a98957e2ab841c9c9847740b9675ab02c8705b296b36b220df4dd39eabf92d11c2
 EBUILD phoronix-test-suite-4.6.0.ebuild 3386 SHA256 33492b629086144d07dda9f29eabeca6d6aff806996cc0a166ccdc3bc56192f0 SHA512 c8954efece7e280cab220a7115695977b8bbbdb621e62ed3b89bf8d7b1901ec14c82eb69a5a19e13d085ce68fcfac7eb576283dc0270526923b559153f4f8b9b WHIRLPOOL 9a8d0ff2eedba70f036a19e35b39800567952fb9a2c7d7c1d49daff245d1aaf5de5829557ce67e2a0ff4878d248f4f7ff322b1236530627c27a4f7120c679f8e
-MISC ChangeLog 4120 SHA256 e04a438d1927889c934b50ce96863eb97633ed10b99339ee2c867a7b5af8e17b SHA512 cc910b940de3a609196b062288258c720b82f81121e09fa6f3201651ebb1c87007bfcc1e07c98019388fd64bdb57a468a2c78694cfc03ebc563459811714c746 WHIRLPOOL cf6ddeba6ad7588055f959c1f41373458be498b096f8e05b26c59a4714e43ebf37aec0b78363a23d4d4d7392070e2b837ea7fdcdd4fca6f67e605a0b9f2968d9
+EBUILD phoronix-test-suite-4.6.1.ebuild 3386 SHA256 7b5c60442abdc3b35b3b352feeecf39edbdf37f391cbbb22f7a157baba2b6beb SHA512 92010a125c29f2c8e26824245685ad4813e019d4ca3d30fd910b13ad82a1c4f959d245472f54ca665c14c5160cad8a5e83eca2935407e0d37fb5491fee22b104 WHIRLPOOL ac2a33e4278e6e8c3af0f39ac89b345f4b6b7a016ac402dfd44628c0d009077079103dd8a940fcf52f2012ed9d80ad932586d9736a7185d8712dea1e5fe36e47
+MISC ChangeLog 4257 SHA256 93d2f82a48f9c8a95b0950505439b20d27e9c6f6ae55e64c2dcc17fffa01168a SHA512 946aeaeaced93e1a2e0842cc842799170f1137afbd0863a8c1261fbd60a3cbf09510edabc63da70b54b0079d466b90dfbe798d0346d755ce0c10a6cc16a07774 WHIRLPOOL 2cbb2e982826cb1f141eeb43de27059f14a93cf86b1fe54a31c12b6ec7e7f93ac8e4f8c1dfa90e6e767e70ba4e32638884284c038b4f0d41bbc902631baddade
 MISC metadata.xml 259 SHA256 33ff114274f223a0385a54254536f9d2078f12a84a6779a6739341c024cec67a SHA512 10db7e564acee3578a4a18ed026fd9d54d9dd505cdb7d89e3e0e9b3fbbab8b97a9a8899e0b9958ea2f871f423f92e2850539b7ad5cf863f6215017323433074f WHIRLPOOL f0ddafd2b30dc55c2459b8a94eb7309f66cb8f79d2a887c38774491d1012a04c38d34fb97371585c33fc8a10a44d18746298df795467774d8d5a8758364b4dd2
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
new file mode 100644
index 000000000000..54f0f2ae70fa
--- /dev/null
+++ b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-4.6.1.ebuild
@@ -0,0 +1,110 @@
+# 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-4.6.1.ebuild,v 1.1 2013/06/13 03:25:58 patrick 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() {
+	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
+}