Add necessary curl USE flag depend on PHP. bug #352791. Add an EAPI=4 version to clean up depends.

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

5 files changed, 82 insertions, 12 deletions

diff --git a/app-benchmarks/phoronix-test-suite/ChangeLog b/app-benchmarks/phoronix-test-suite/ChangeLog
index b0a409e67b35..cc8b5f747381 100644
--- a/app-benchmarks/phoronix-test-suite/ChangeLog
+++ b/app-benchmarks/phoronix-test-suite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-benchmarks/phoronix-test-suite
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/ChangeLog,v 1.11 2010/11/10 20:18:09 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/ChangeLog,v 1.12 2011/02/01 21:50:49 cardoe Exp $
+
+*phoronix-test-suite-2.8.1-r1 (01 Feb 2011)
+
+  01 Feb 2011; Doug Goldstein <cardoe@gentoo.org>
+  phoronix-test-suite-2.8.1.ebuild, +phoronix-test-suite-2.8.1-r1.ebuild,
+  metadata.xml:
+  Add necessary curl USE flag depend on PHP. bug #352791. Add an EAPI=4 version
+  to clean up depends.
 
 *phoronix-test-suite-2.8.1 (10 Nov 2010)
 
diff --git a/app-benchmarks/phoronix-test-suite/Manifest b/app-benchmarks/phoronix-test-suite/Manifest
index 8dbe114ac107..79a140818a99 100644
--- a/app-benchmarks/phoronix-test-suite/Manifest
+++ b/app-benchmarks/phoronix-test-suite/Manifest
@@ -11,6 +11,7 @@ EBUILD phoronix-test-suite-2.2.0.ebuild 1231 RMD160 cdde2e8c95f56d4e2ba98a10a33d
 EBUILD phoronix-test-suite-2.4.1-r1.ebuild 1700 RMD160 901df595bffedbb87ca8473d5c895c697e5e7978 SHA1 b59bcdddf29e9676f935e82b03068ffbc5f840e5 SHA256 7b477ee950c084618f58ce3fc7694e29cfa85cfb84b21f4494cdff8b18757775
 EBUILD phoronix-test-suite-2.4.1.ebuild 1231 RMD160 2418baeddd540ca9f3988e959f2398f6867a0d3a SHA1 46625ca279422d5e1d2ba22f17c2b53f8962e2c7 SHA256 101d5c06cb613088861b74dca2e2fc6136ba032123d392edf0dd268e47702689
 EBUILD phoronix-test-suite-2.6.1.ebuild 1797 RMD160 fba9da43debb874e5c80e50dcee3566791e9fa9c SHA1 24e7ef7ffb58040407019ee6ac10ca9a0eb39e07 SHA256 efd0fc97affb3fa5ed686a6b62316f81964d5b6ce6c864c64a7079c27bbc6ff7
-EBUILD phoronix-test-suite-2.8.1.ebuild 1797 RMD160 9760d9b9b657354a844178af77f1c1abd1e23070 SHA1 7907463d165bac25268ef1977e341111934cae7d SHA256 4e8a776e4e11152093646de766add90dce2b02b9cc832fc5dc1b6bac9905fc73
-MISC ChangeLog 1871 RMD160 95dda06b9412fc55608534215880883e2253fcd5 SHA1 a542953cad78329f007b13332a7a60555bc97fb1 SHA256 891f51018ff850ee7b6fc8341804ceab4cc43c0fe7a3e24095263134d4b1650f
-MISC metadata.xml 353 RMD160 33b4761a7fc274f10337f07b3f3545e8a572eed6 SHA1 7d5f649d0e022572c942b785ef712752c6ac8a80 SHA256 09a6ee6a0e37cb090cb4dbd2b4d1652f7c41e300c899c05ce4666c8e2b04e266
+EBUILD phoronix-test-suite-2.8.1-r1.ebuild 1753 RMD160 2c6cf6f7e7835d081508c68904f9733dd56b9dda SHA1 6898ba7aded6edfe58d2a79d9e722ecc4697af72 SHA256 42c55e006ee1e966e075e6af452ff7887372ef1ddd82dfe74c7cbade128f84d8
+EBUILD phoronix-test-suite-2.8.1.ebuild 1806 RMD160 61215b78cec34cca627956f28c65e39037ded104 SHA1 d77af878136c5d4425639718854c9dfd7ac815ca SHA256 601e4e3f18bbd6fcf8bb5becd03e4664a9b0cfcbb7c83fb684d5a159c4c8e212
+MISC ChangeLog 2159 RMD160 85c01736ea98464683c149bf69b2e1e27abb1d5b SHA1 c65ce3a81c5f35a9c6cee9b092058cd778289c86 SHA256 1e3d92e02ca482a6d986aa1bbd8de6c99d2eaaea7330f1f8d49ef20bb793bbc1
+MISC metadata.xml 259 RMD160 97feab51d4ff786053750f171e5d5ad5d99abea7 SHA1 a5af5bb909a2eb37b476ee0e6a9691b55dd5a0b8 SHA256 33ff114274f223a0385a54254536f9d2078f12a84a6779a6739341c024cec67a
diff --git a/app-benchmarks/phoronix-test-suite/metadata.xml b/app-benchmarks/phoronix-test-suite/metadata.xml
index 98dd35ede900..4ae12df4e63c 100644
--- a/app-benchmarks/phoronix-test-suite/metadata.xml
+++ b/app-benchmarks/phoronix-test-suite/metadata.xml
@@ -3,10 +3,6 @@
 <pkgmetadata>
 	<herd>benchmarks</herd>
 	<maintainer>
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
-	<maintainer>
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
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
new file mode 100644
index 000000000000..f84b5c3a1b6f
--- /dev/null
+++ b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.8.1-r1.ebuild
@@ -0,0 +1,65 @@
+# 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.1 2011/02/01 21:50:49 cardoe 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="gtk"
+
+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-php5/pecl-ps
+		gtk? ( dev-php5/php-gtk )"
+
+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
+
+	fperms a+x /usr/share/${PN}/pts/test-resources/*/*.sh
+	fperms a+x /usr/share/${PN}/pts/base-test-resources/*/*.sh
+	#fperms a+x /usr/share/${PN}/pts-core/modules/*.sh
+	fperms a+x /usr/share/${PN}/pts-core/test-libraries/*.sh
+	#fperms a+x /usr/share/${PN}/pts/distro-scripts/install-gentoo-packages.sh
+
+	# 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-2.8.1.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.8.1.ebuild
index 3c58eca0e675..f75305d4c62c 100644
--- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.8.1.ebuild
+++ b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.ebuild,v 1.1 2010/11/10 20:18:09 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.8.1.ebuild,v 1.2 2011/02/01 21:50:49 cardoe Exp $
 
 EAPI=2
 
@@ -18,7 +18,7 @@ IUSE="gd gtk"
 DEPEND=""
 
 # php 5.3 doesn't have pcre useflag anymore
-RDEPEND="|| ( dev-lang/php:5.3[cli,gd,posix,pcntl,truetype] dev-lang/php:5.2[cli,gd,posix,pcntl,truetype,pcre] )
+RDEPEND="|| ( dev-lang/php:5.3[cli,curl,gd,posix,pcntl,truetype] dev-lang/php:5.2[cli,curl,gd,posix,pcntl,truetype,pcre] )
 		app-arch/unzip
 		dev-php5/pecl-ps
 		gtk? ( dev-php5/php-gtk )"