removed old version. x86 stable for 3.221-r1. Version bump to 3.222. Fixed bug #68977

9 files changed, 47 insertions, 92 deletions

diff --git a/app-benchmarks/iozone/ChangeLog b/app-benchmarks/iozone/ChangeLog
index a3b0b8a8568a..c6bfd9a888f6 100644
--- a/app-benchmarks/iozone/ChangeLog
+++ b/app-benchmarks/iozone/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-benchmarks/iozone
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/ChangeLog,v 1.11 2004/10/05 11:08:30 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/ChangeLog,v 1.12 2004/10/28 10:14:02 dragonheart Exp $
+
+*iozone-3.222 (28 Oct 2004)
+
+  28 Oct 2004; Daniel Black <dragonheart@gentoo.org> -iozone-3.217.ebuild,
+  -iozone-3.218.ebuild, iozone-3.221-r1.ebuild, iozone-3.221.ebuild,
+  +iozone-3.222.ebuild:
+  removed old version. x86 stable for 3.221-r1. Version bump to 3.222. Fixed bug
+  #68977 thanks to SpanKY
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   iozone-3.217.ebuild, iozone-3.218.ebuild, iozone-3.221.ebuild:
diff --git a/app-benchmarks/iozone/Manifest b/app-benchmarks/iozone/Manifest
index 6f0cdcb5bc61..4a79471e88c5 100644
--- a/app-benchmarks/iozone/Manifest
+++ b/app-benchmarks/iozone/Manifest
@@ -1,11 +1,9 @@
-MD5 0082c4746395f69c67aeda3068f1884e ChangeLog 1968
-MD5 9f40bba14f2c62ead980b012a8b7b0ef iozone-3.217.ebuild 977
-MD5 4720863b2e157c09ead8eef524878b05 iozone-3.218.ebuild 1874
-MD5 372dd27ec0be136068210b6a617abca4 iozone-3.221-r1.ebuild 2045
-MD5 71093f0854364ab11eceaac619735f7c iozone-3.221.ebuild 1929
+MD5 dfdcc22597fe9c846e372b1f81868833 iozone-3.222.ebuild 2073
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
-MD5 19fa5141eb3eec9357704d234cdc2d31 files/3.221-gcc.patch 469
-MD5 e656883c1b06fd737e3f145ee18fb5b5 files/digest-iozone-3.217 61
-MD5 d8d6924bd76a53cd2df1c261ae63b02f files/digest-iozone-3.218 61
+MD5 0082c4746395f69c67aeda3068f1884e ChangeLog 1968
+MD5 41f132b2b0fd0b4a046de783e4f4d16a iozone-3.221.ebuild 1957
+MD5 29dd53198df47c7823d6fd51d633f3e1 iozone-3.221-r1.ebuild 2072
+MD5 09f6cc5f40249824fd731b80d960f709 files/digest-iozone-3.222 61
 MD5 2f97f7c83ee517e3716bfe9273022e21 files/digest-iozone-3.221 61
 MD5 2f97f7c83ee517e3716bfe9273022e21 files/digest-iozone-3.221-r1 61
+MD5 19fa5141eb3eec9357704d234cdc2d31 files/3.221-gcc.patch 469
diff --git a/app-benchmarks/iozone/files/digest-iozone-3.217 b/app-benchmarks/iozone/files/digest-iozone-3.217
deleted file mode 100644
index c8c2856bb849..000000000000
--- a/app-benchmarks/iozone/files/digest-iozone-3.217
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b9eb860857f3a92873edc9e681a964b iozone3_217.tar 1413120
diff --git a/app-benchmarks/iozone/files/digest-iozone-3.218 b/app-benchmarks/iozone/files/digest-iozone-3.218
deleted file mode 100644
index bdac2c99732e..000000000000
--- a/app-benchmarks/iozone/files/digest-iozone-3.218
+++ /dev/null
@@ -1 +0,0 @@
-MD5 605b0754ff7584e4d2cec30a62062807 iozone3_218.tar 1423360
diff --git a/app-benchmarks/iozone/files/digest-iozone-3.222 b/app-benchmarks/iozone/files/digest-iozone-3.222
new file mode 100644
index 000000000000..443a55411062
--- /dev/null
+++ b/app-benchmarks/iozone/files/digest-iozone-3.222
@@ -0,0 +1 @@
+MD5 ec75b9a0b15348fc24f2e263c97c2ed1 iozone3_222.tar 1423360
diff --git a/app-benchmarks/iozone/iozone-3.217.ebuild b/app-benchmarks/iozone/iozone-3.217.ebuild
deleted file mode 100644
index 0b9c4b7deeff..000000000000
--- a/app-benchmarks/iozone/iozone-3.217.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.217.ebuild,v 1.5 2004/10/05 11:08:30 pvdabeel Exp $
-
-inherit eutils
-
-DESCRIPTION="Filesystem benchmarking program."
-HOMEPAGE="http://www.iozone.org/"
-SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND="sys-devel/gcc"
-
-S=${WORKDIR}
-
-src_compile() {
-
-	case ${ARCH} in
-		x86|alpha)
-			PLATFORM="linux"
-			;;
-		ppc)
-			PLATFORM="linux-powerpc"
-			;;
-		*)
-			PLATFORM="linux-${ARCH}"
-			;;
-	esac
-
-	cd src/current
-	emake ${PLATFORM} || die "Compile failed"
-}
-
-src_install() {
-	dosbin src/current/iozone
-	dodoc docs/IO*
-	dodoc docs/Run_rules.doc
-	dodoc src/current/Changes.txt
-	doman docs/iozone.1
-
-	dodir /usr/share/${PF}
-	insinto /usr/share/${PF}
-	cd src/current
-	doins Generate_Graphs Gnuplot.txt gengnuplot.sh gnu3d.dem
-
-	prepall
-}
diff --git a/app-benchmarks/iozone/iozone-3.221-r1.ebuild b/app-benchmarks/iozone/iozone-3.221-r1.ebuild
index abdd00ed0982..8b9d6f174e44 100644
--- a/app-benchmarks/iozone/iozone-3.221-r1.ebuild
+++ b/app-benchmarks/iozone/iozone-3.221-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.221-r1.ebuild,v 1.2 2004/09/23 12:21:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.221-r1.ebuild,v 1.3 2004/10/28 10:14:02 dragonheart Exp $
 
 # TODO
 #        ->   linux-arm            (32bit)   <-
@@ -18,7 +18,7 @@
 #
 # ~arm ~amd64 ~ia64 ~s390 alpha(?)
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Filesystem benchmarking program"
 HOMEPAGE="http://www.iozone.org/"
@@ -26,7 +26,7 @@ SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="sys-devel/gcc
@@ -45,8 +45,8 @@ src_compile() {
 	cd src/current
 
 	# Options FIX
-	sed -i -e "s:[/a-z]*cc.*-c.*-Dunix:${CC} ${CFLAGS} -Dunix -c:g" \
-		-e "s:[/a-z]*cc.*-Dunix:${CC} ${CFLAGS} -Dunix:g" makefile
+	sed -i -e "s:[/a-z]*cc.*-c.*-Dunix:$(tc-getCC) ${CFLAGS} -Dunix -c:g" \
+		-e "s:[/a-z]*cc.*-Dunix:$(tc-getCC) ${CFLAGS} -Dunix:g" makefile
 
 	case ${ARCH} in
 		x86|alpha)	PLATFORM="linux";;
diff --git a/app-benchmarks/iozone/iozone-3.221.ebuild b/app-benchmarks/iozone/iozone-3.221.ebuild
index 9bb1f2ad13d0..4a025d8ad919 100644
--- a/app-benchmarks/iozone/iozone-3.221.ebuild
+++ b/app-benchmarks/iozone/iozone-3.221.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.221.ebuild,v 1.4 2004/10/05 11:08:30 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.221.ebuild,v 1.5 2004/10/28 10:14:02 dragonheart Exp $
 
 # TODO
 #        ->   linux-arm            (32bit)   <-
@@ -18,7 +18,7 @@
 #
 # ~arm ~amd64 ~ia64 ~s390 alpha(?)
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Filesystem benchmarking program"
 HOMEPAGE="http://www.iozone.org/"
@@ -40,8 +40,8 @@ src_compile() {
 	cd src/current
 
 	# Options FIX
-	sed -i -e "s:[/a-z]*cc.*-c.*-Dunix:${CC} ${CFLAGS} -Dunix -c:g" \
-		-e "s:[/a-z]*cc.*-Dunix:${CC} ${CFLAGS} -Dunix:g" makefile
+	sed -i -e "s:[/a-z]*cc.*-c.*-Dunix:$(tc-getCC) ${CFLAGS} -Dunix -c:g" \
+		-e "s:[/a-z]*cc.*-Dunix:$(tc-getCC) ${CFLAGS} -Dunix:g" makefile
 
 	case ${ARCH} in
 		x86|alpha)
diff --git a/app-benchmarks/iozone/iozone-3.218.ebuild b/app-benchmarks/iozone/iozone-3.222.ebuild
index cab284d9a048..d547f55b29bc 100644
--- a/app-benchmarks/iozone/iozone-3.218.ebuild
+++ b/app-benchmarks/iozone/iozone-3.222.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.218.ebuild,v 1.6 2004/10/05 11:08:30 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.222.ebuild,v 1.1 2004/10/28 10:14:02 dragonheart Exp $
 
 # TODO
 #        ->   linux-arm            (32bit)   <-
@@ -10,14 +10,15 @@
 #        ->   linux-S390           (32bit)   <-
 #        ->   linux-S390X          (64bit)   <-
 #
+#        ->   freebsd              (32bit)   <-
 #        ->   macosx               (32bit)   <-
 #        ->   netbsd               (32bit)   <-
 #        ->   openbsd              (32bit)   <-
 #        ->   openbsd-threads      (32bit)   <-
 #
-# ~arm ~amd64 ~ia64 ~s390 alpha(?)
+# ~ia64 ~s390 alpha(?) x86-fbsd
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Filesystem benchmarking program"
 HOMEPAGE="http://www.iozone.org/"
@@ -25,7 +26,7 @@ SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="sys-devel/gcc
@@ -35,36 +36,35 @@ RDEPEND="virtual/libc"
 
 S=${WORKDIR}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/3.221-gcc.patch
+}
+
 src_compile() {
 	cd src/current
 
 	# Options FIX
-	sed -i -e "s:[/a-z]*cc.*-c.*-Dunix:${CC} ${CFLAGS} -Dunix -c:g" \
-		-e "s:[/a-z]*cc.*-Dunix:${CC} ${CFLAGS} -Dunix:g" makefile
+	sed -i -e "s:CC	=.*:CC	=$(tc-getCC):g" \
+		-e "s:-O3 -Dunix:${CFLAGS} -Dunix:g" makefile
 
 	case ${ARCH} in
-		x86|alpha)
-			PLATFORM="linux"
-			;;
-		ppc)
-			PLATFORM="linux-powerpc"
-			;;
-		amd64)
-			PLATFORM="linux-AMD64"
-			;;
-		s390)
-			PLATFORM="linux-S390"
-			;;
-		*)
-			PLATFORM="linux-${ARCH}"
-			;;
+		x86|alpha)	PLATFORM="linux";;
+		arm)		PLATFORM="linux-arm";;
+		ppc)		PLATFORM="linux-powerpc";;
+		amd64)		PLATFORM="linux-AMD64";;
+		ia64)		PLATFORM="linux-IA64";;
+		s390)		PLATFORM="linux-S390";;
+		x86-fbsd)	PLATFORM="freebsd";;
+		*)			PLATFORM="linux-${ARCH}";;
 	esac
 
 	emake ${PLATFORM} || die "Compile failed"
 }
 
 src_install() {
-	dosbin src/current/iozone
+	dosbin src/current/iozone || die
 	dodoc docs/I*
 	dodoc docs/Run_rules.doc
 	dodoc src/current/Changes.txt