diff options
author | Patrick Lauer <patrick@gentoo.org> | 2011-08-27 10:00:55 +0000 |
---|---|---|
committer | Patrick Lauer <patrick@gentoo.org> | 2011-08-27 10:00:55 +0000 |
commit | a64fb990fee370767df7edba75d13154db709972 (patch) | |
tree | 5a718c4c259cb6388a47f76f3b4d3debaa9201ec /app-benchmarks/phoronix-test-suite | |
parent | Stable on amd64 wrt bug #380773 (diff) | |
download | historical-a64fb990fee370767df7edba75d13154db709972.tar.gz historical-a64fb990fee370767df7edba75d13154db709972.tar.bz2 historical-a64fb990fee370767df7edba75d13154db709972.zip |
Hackfixing the fperms madness of #354981
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
Diffstat (limited to 'app-benchmarks/phoronix-test-suite')
5 files changed, 17 insertions, 146 deletions
diff --git a/app-benchmarks/phoronix-test-suite/ChangeLog b/app-benchmarks/phoronix-test-suite/ChangeLog index f968d18ce338..7d14aa8610a7 100644 --- a/app-benchmarks/phoronix-test-suite/ChangeLog +++ b/app-benchmarks/phoronix-test-suite/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-benchmarks/phoronix-test-suite # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/ChangeLog,v 1.13 2011/06/28 17:06:07 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/ChangeLog,v 1.14 2011/08/27 10:00:55 patrick Exp $ + + 27 Aug 2011; Patrick Lauer <patrick@gentoo.org> + -phoronix-test-suite-2.6.1.ebuild, -phoronix-test-suite-2.8.1.ebuild, + phoronix-test-suite-2.8.1-r1.ebuild: + Hackfixing the fperms madness of #354981 28 Jun 2011; Ole Markus With <olemarkus@gentoo.org> -phoronix-test-suite-1.8.0.ebuild, -phoronix-test-suite-2.0.0.ebuild, diff --git a/app-benchmarks/phoronix-test-suite/Manifest b/app-benchmarks/phoronix-test-suite/Manifest index 1388add2058e..eac17c195ac9 100644 --- a/app-benchmarks/phoronix-test-suite/Manifest +++ b/app-benchmarks/phoronix-test-suite/Manifest @@ -1,8 +1,5 @@ AUX font.patch 325 RMD160 c1a2b6c0448ac053ba1fa5c2699fdda02465bfa7 SHA1 4ec39b684aa0ab28c2fe8c721b87f3ca60778852 SHA256 f968d2e7a603e1b8543a05176fa9563298341ff4940d5408986ab4d6606ce9b7 -DIST phoronix-test-suite-2.6.1.tar.gz 486855 RMD160 f03ad47d634683844d88021c88de01fbe45b5cd3 SHA1 09d63c84bdadf57b70db8c672cef6c2d74518f6d SHA256 13fbfbfbddeacb53bc5a8207c3d298d99035970d13cf74d0dfb9375673b92b11 DIST phoronix-test-suite-2.8.1.tar.gz 465548 RMD160 f014ae92ff19bd36a8ac38c6a427dd0e89a6135f SHA1 06a28f4ed2d56aca8b3566208a4462878e22db68 SHA256 395a21147c735b8e8b44294d9d541cf04ddeacaccb711b863f6410c8705e2ab9 -EBUILD phoronix-test-suite-2.6.1.ebuild 1797 RMD160 fba9da43debb874e5c80e50dcee3566791e9fa9c SHA1 24e7ef7ffb58040407019ee6ac10ca9a0eb39e07 SHA256 efd0fc97affb3fa5ed686a6b62316f81964d5b6ce6c864c64a7079c27bbc6ff7 -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 2488 RMD160 5939c7a54954619644ea3cca6b93a195028b50c6 SHA1 a1a408fe0425e43741b0f5da98b488a407e139a0 SHA256 839c04fb30397efb18ffc4f23685b2eed932a9bdfdff99f7787290ece6cab865 +EBUILD phoronix-test-suite-2.8.1-r1.ebuild 1818 RMD160 cff2f74726f052533150b5fade14ecdb227b8620 SHA1 2366879c0c5896e46fbb8bcb61e9756f60b4f14f SHA256 ace1075fe6e7ce9d994498110d4a85054fb72d27fc2301f5b730541a1930e8f7 +MISC ChangeLog 2691 RMD160 b87240e634cd496e0fee36654ea94c3ca0f4be0b SHA1 b9b419d2e99543438e5e153810e959f90dd89b60 SHA256 d2c3f68f10488663ba1ee282f1520dc37b8c7c1c5cebe4fab88c6fa838e17f36 MISC metadata.xml 259 RMD160 97feab51d4ff786053750f171e5d5ad5d99abea7 SHA1 a5af5bb909a2eb37b476ee0e6a9691b55dd5a0b8 SHA256 33ff114274f223a0385a54254536f9d2078f12a84a6779a6739341c024cec67a diff --git a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.6.1.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.6.1.ebuild deleted file mode 100644 index 851c13040dea..000000000000 --- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.6.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# 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.6.1.ebuild,v 1.2 2010/11/10 19:38:01 patrick Exp $ - -EAPI=2 - -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="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] ) - 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-r1.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.8.1-r1.ebuild index f84b5c3a1b6f..eb50692348e1 100644 --- 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 @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.8.1-r1.ebuild,v 1.2 2011/08/27 10:00:55 patrick Exp $ EAPI=4 @@ -13,15 +13,14 @@ SRC_URI="http://www.phoronix-test-suite.com/download.php?file=${P} -> ${P}.tar.g LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gtk" +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-php5/pecl-ps - gtk? ( dev-php5/php-gtk )" + dev-php5/pecl-ps" S="${WORKDIR}/${PN}" @@ -51,15 +50,15 @@ src_install() { 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 + # 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-2.8.1.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.8.1.ebuild deleted file mode 100644 index f75305d4c62c..000000000000 --- a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-2.8.1.ebuild +++ /dev/null @@ -1,65 +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.ebuild,v 1.2 2011/02/01 21:50:49 cardoe Exp $ - -EAPI=2 - -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="gd gtk" - -DEPEND="" - -# php 5.3 doesn't have pcre useflag anymore -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 )" - -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" - -} |