Hackfixing the fperms madness of #354981

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

4 files changed, 15 insertions, 141 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/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"
-
-}