Fixing deps etc., closes #299121, thanks to Francisco Javier

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 82 insertions, 2 deletions

diff --git a/app-benchmarks/phoronix-test-suite/ChangeLog b/app-benchmarks/phoronix-test-suite/ChangeLog
index fe3824405096..3e2e554c5f32 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/ChangeLog,v 1.5 2010/02/27 00:33:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/ChangeLog,v 1.6 2010/03/01 15:23:36 patrick Exp $
+
+*phoronix-test-suite-2.4.1-r1 (01 Mar 2010)
+
+  01 Mar 2010; Patrick Lauer <patrick@gentoo.org>
+  +phoronix-test-suite-2.4.1-r1.ebuild, +files/font.patch:
+  Fixing deps etc., closes #299121, thanks to Francisco Javier
 
 *phoronix-test-suite-2.4.1 (27 Feb 2010)
 
diff --git a/app-benchmarks/phoronix-test-suite/Manifest b/app-benchmarks/phoronix-test-suite/Manifest
index 6e2a20c46c0c..622dcc374ba2 100644
--- a/app-benchmarks/phoronix-test-suite/Manifest
+++ b/app-benchmarks/phoronix-test-suite/Manifest
@@ -1,3 +1,4 @@
+AUX font.patch 325 RMD160 c1a2b6c0448ac053ba1fa5c2699fdda02465bfa7 SHA1 4ec39b684aa0ab28c2fe8c721b87f3ca60778852 SHA256 f968d2e7a603e1b8543a05176fa9563298341ff4940d5408986ab4d6606ce9b7
 DIST phoronix-test-suite-1.8.0.tar.gz 416923 RMD160 378fec36d2b59ec0876806f3e20c17f2697cafec SHA1 debefaab05bc7ea9187a366798446082cb62a0c1 SHA256 02cf6f10395c9bd1fddae869617811faf2c662a5248a9aa35c884112bb541e27
 DIST phoronix-test-suite-2.0.0.tar.gz 356702 RMD160 d3488a0d871aaec99edde0a2783fe9046f30232a SHA1 5b9cf7d87bf55e8caa37ad995df1c7ecba4c5791 SHA256 b77a83909e700ab2d37ab661af75a4bd45da7805acab9104d3e0a4013fdc9c49
 DIST phoronix-test-suite-2.2.0.tar.gz 413891 RMD160 2268cae00430c1ed492a04d208abf53e167a6840 SHA1 39dfb309a9c6cc7444aeeb5d55c2dfeb930e8cc9 SHA256 b490d29344126aa53c0bd17ee1900caa21e1c4970ecf9bfe0402e879f4402ffd
@@ -5,6 +6,7 @@ DIST phoronix-test-suite-2.4.1.tar.gz 449072 RMD160 30449e961fb2820f6c7c6ec8d116
 EBUILD phoronix-test-suite-1.8.0.ebuild 1231 RMD160 5bd83ad74afe68e8bf69bcb11af33bfb005693cb SHA1 e8b222904ee6ea0bb9e6a7b0e41178749db69de0 SHA256 6135636b924eb92c0fc5deee6a529ffa5a0f1dd115cad0707083a749150aa4d8
 EBUILD phoronix-test-suite-2.0.0.ebuild 1231 RMD160 72dfeb307aa1b704a32387de1599a75d5152bd71 SHA1 8843a5070807f6c15cad7a565477d800b79c41cf SHA256 915b7531b23a32982b563f64c6faa354e26b8d97f715c5a048912d6266c5bc3f
 EBUILD phoronix-test-suite-2.2.0.ebuild 1231 RMD160 cdde2e8c95f56d4e2ba98a10a33debd24e1e69c1 SHA1 597fb26bb5afbf2a6b013aaea2fc713e9649a93a SHA256 3d6def2c8e420377d68456e1af0a4bd10eaa0ada2547b817bee7feb00c5b7c9a
+EBUILD phoronix-test-suite-2.4.1-r1.ebuild 1690 RMD160 6aec826503182dacee3a8ebe29d02d30f781d5aa SHA1 989c4f11bc21b750d7cb1708b9cfe0f303bdd9dd SHA256 65eb4c54f48965fe76cdf9fdae36ac2c0318fafbec0821cdfb31373978e2a8ca
 EBUILD phoronix-test-suite-2.4.1.ebuild 1231 RMD160 2418baeddd540ca9f3988e959f2398f6867a0d3a SHA1 46625ca279422d5e1d2ba22f17c2b53f8962e2c7 SHA256 101d5c06cb613088861b74dca2e2fc6136ba032123d392edf0dd268e47702689
-MISC ChangeLog 986 RMD160 2ecd83e955f6e2d065e068a459a3760211b9f0e1 SHA1 27b5fb74f2179697c6dbdb32f24fb1ba84c14a7f SHA256 84d17ab17168c0c64e252544469d722781024ace2ba0118eaf2603deaf9e4a19
+MISC ChangeLog 1204 RMD160 7e848dada3640879fe9139d94195e79f42be6cfb SHA1 f7741bde91b3b04d6a1fe5acc41d579e95d96c37 SHA256 b526f54f18a2f3dd84330b44ed2872cf533ffef346d10fe8c5252886d720d25a
 MISC metadata.xml 353 RMD160 33b4761a7fc274f10337f07b3f3545e8a572eed6 SHA1 7d5f649d0e022572c942b785ef712752c6ac8a80 SHA256 09a6ee6a0e37cb090cb4dbd2b4d1652f7c41e300c899c05ce4666c8e2b04e266
diff --git a/app-benchmarks/phoronix-test-suite/files/font.patch b/app-benchmarks/phoronix-test-suite/files/font.patch
new file mode 100644
index 000000000000..a87ff8d90390
--- /dev/null
+++ b/app-benchmarks/phoronix-test-suite/files/font.patch
@@ -0,0 +1,11 @@
+--- pts-core/objects/pts_Graph/pts_Graph.php.old	2009-11-11 17:39:37.000000000 +0100
++++ pts-core/objects/pts_Graph/pts_Graph.php	2009-12-30 12:46:27.816567436 +0100
+@@ -121,7 +121,7 @@
+ 			}
+ 		}
+ 
+-		$this->graph_font = $font_type;
++		$this->graph_font = $default_font;
+ 	}
+ 	public function requestRenderer($renderer)
+ 	{
diff --git a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.4.1-r1.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..a69a96e02dbb
--- /dev/null
+++ b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.4.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 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.4.1-r1.ebuild,v 1.1 2010/03/01 15:23:36 patrick Exp $
+
+EAPI=2
+
+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="gd gtk"
+
+DEPEND=""
+RDEPEND="dev-lang/php:5[cli,gd,posix,pcntl,truetype,pcre]
+		app-arch/unzip
+		ps? ( 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"
+
+}