x86 stable. Revision bump adds patch to (hopefully) fix bug #59793

6 files changed, 141 insertions, 5 deletions

diff --git a/app-benchmarks/iozone/ChangeLog b/app-benchmarks/iozone/ChangeLog
index 065a64830c17..2dd8ecb03163 100644
--- a/app-benchmarks/iozone/ChangeLog
+++ b/app-benchmarks/iozone/ChangeLog
@@ -1,6 +1,13 @@
 # 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.9 2004/09/07 16:15:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/ChangeLog,v 1.10 2004/09/11 15:26:22 dragonheart Exp $
+
+*iozone-3.221-r1 (12 Sep 2004)
+
+  12 Sep 2004; Daniel Black <dragonheart@gentoo.org> +files/3.221-gcc.patch,
+  +iozone-3.221-r1.ebuild, iozone-3.221.ebuild:
+  x86 stable. Revision bump adds patch to (hopefully) fix bug #59793. Thanks to
+  Alex Rostovtsev <tetromino@gmail.com> for characterizing the problem
 
   07 Sep 2004; <blubb@gentoo.org> iozone-3.221.ebuild:
   added ~amd64 keyword
diff --git a/app-benchmarks/iozone/Manifest b/app-benchmarks/iozone/Manifest
index 362f135da1b2..169f4590dfae 100644
--- a/app-benchmarks/iozone/Manifest
+++ b/app-benchmarks/iozone/Manifest
@@ -1,8 +1,21 @@
-MD5 0e73942c536e3cacc7cf46108b72aa9a ChangeLog 1211
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 6be0ef3c25fcbb0692a4ee8e6a31a8f1 iozone-3.217.ebuild 978
 MD5 2b2c3a01ee8352824750d4123c0388f9 iozone-3.218.ebuild 1878
-MD5 ce481050a6c814b1b27b65cdbe54bd1a iozone-3.221.ebuild 1928
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
+MD5 2fd89a7d9a6420753ce56d45ec7a7c74 ChangeLog 1527
+MD5 a869d2a9f8b8a27b64303eec09fa0a4b iozone-3.221.ebuild 1933
+MD5 8407a4c3bf67ae7f0b01d6c6b18cd0c5 iozone-3.221-r1.ebuild 2080
 MD5 e656883c1b06fd737e3f145ee18fb5b5 files/digest-iozone-3.217 61
 MD5 d8d6924bd76a53cd2df1c261ae63b02f files/digest-iozone-3.218 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBQxnFmdTrptrqvGERAjxeAJ9nPPed+Qq37WfnMBPmYMwqh3sikACfWVL4
+Pl8lVoRFpV1xq52vkHpfl6g=
+=766K
+-----END PGP SIGNATURE-----
diff --git a/app-benchmarks/iozone/files/3.221-gcc.patch b/app-benchmarks/iozone/files/3.221-gcc.patch
new file mode 100644
index 000000000000..401e1550f34d
--- /dev/null
+++ b/app-benchmarks/iozone/files/3.221-gcc.patch
@@ -0,0 +1,19 @@
+--- ./src/current/iozone.c.orig	2004-09-12 00:43:07.365625880 +0930
++++ ./src/current/iozone.c	2004-09-12 00:43:59.785168920 +0930
+@@ -16297,7 +16297,7 @@
+ {
+ 	double starttime,tmptime;
+ 	if(comp_delay == (float)0)
+-		return(0);
++		return(0.0);
+ 	starttime=time_so_far();
+ 	while(1)
+ 	{	
+@@ -16305,6 +16305,7 @@
+ 		if(tmptime >= (double)comp_delay)
+ 			return(tmptime);
+ 	}
++	return 0.0;
+ }
+ 
+ /************************************************************************/
diff --git a/app-benchmarks/iozone/files/digest-iozone-3.221-r1 b/app-benchmarks/iozone/files/digest-iozone-3.221-r1
new file mode 100644
index 000000000000..00e427f30d71
--- /dev/null
+++ b/app-benchmarks/iozone/files/digest-iozone-3.221-r1
@@ -0,0 +1 @@
+MD5 dddcae599f0cfa825a634706a110b4c7 iozone3_221.tar 1423360
diff --git a/app-benchmarks/iozone/iozone-3.221-r1.ebuild b/app-benchmarks/iozone/iozone-3.221-r1.ebuild
new file mode 100644
index 000000000000..7ea78e156427
--- /dev/null
+++ b/app-benchmarks/iozone/iozone-3.221-r1.ebuild
@@ -0,0 +1,96 @@
+# 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.1 2004/09/11 15:26:22 dragonheart Exp $
+
+# TODO
+#        ->   linux-arm            (32bit)   <-
+#        ->   linux-AMD64          (64bit)   <-
+#        ->   linux-ia64           (64bit)   <-
+#        ->   linux-powerpc        (32bit)   <-
+#        ->   linux-S390           (32bit)   <-
+#        ->   linux-S390X          (64bit)   <-
+#
+#        ->   freebsd              (32bit)   <-
+#        ->   macosx               (32bit)   <-
+#        ->   netbsd               (32bit)   <-
+#        ->   openbsd              (32bit)   <-
+#        ->   openbsd-threads      (32bit)   <-
+#
+# ~arm ~amd64 ~ia64 ~s390 alpha(?)
+
+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 ~sparc ~amd64"
+IUSE=""
+
+DEPEND="sys-devel/gcc
+	>=sys-apps/sed-4
+	virtual/libc"
+RDEPEND="virtual/libc"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-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
+
+	case ${ARCH} in
+		x86|alpha)
+			PLATFORM="linux"
+			;;
+		arm)
+			PLATFORM="linux-arm"
+			;;
+		ppc)
+			PLATFORM="linux-powerpc"
+			;;
+		amd64)
+			PLATFORM="linux-AMD64"
+			;;
+		ia64)
+			PLATFORM="linux-IA64"
+			;;
+		s390)
+			PLATFORM="linux-S390"
+			;;
+		*)
+			PLATFORM="linux-${ARCH}"
+			;;
+	esac
+
+	emake ${PLATFORM} || die "Compile failed"
+}
+
+src_install() {
+	dosbin src/current/iozone
+	dodoc docs/I*
+	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
+}
+
+src_test() {
+	cd ${T}
+	${S}/src/current/iozone testfile || die "self test failed"
+}
diff --git a/app-benchmarks/iozone/iozone-3.221.ebuild b/app-benchmarks/iozone/iozone-3.221.ebuild
index 38be6c98cc86..5cd9608a3225 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.2 2004/09/07 16:15:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/iozone/iozone-3.221.ebuild,v 1.3 2004/09/11 15:26:22 dragonheart Exp $
 
 # TODO
 #        ->   linux-arm            (32bit)   <-
@@ -26,7 +26,7 @@ SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 IUSE=""
 
 DEPEND="sys-devel/gcc