Fixed column description to be displayed for every table. Thanks to Christian <evilninja@gmx.net> in bug #85362.

(Portage version: 2.0.51.19)

5 files changed, 76 insertions, 2 deletions

diff --git a/app-benchmarks/tiobench/ChangeLog b/app-benchmarks/tiobench/ChangeLog
index d41ed41d3b0e..a0066777f513 100644
--- a/app-benchmarks/tiobench/ChangeLog
+++ b/app-benchmarks/tiobench/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-benchmarks/tiobench
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/tiobench/ChangeLog,v 1.10 2005/01/01 12:06:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/tiobench/ChangeLog,v 1.11 2005/03/22 12:51:46 swegener Exp $
+
+*tiobench-0.3.3-r2 (22 Mar 2005)
+
+  22 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  +files/0.3.3-column-description-fix.patch, +tiobench-0.3.3-r2.ebuild:
+  Fixed column description to be displayed for every table. Thanks to
+  Christian <evilninja@gmx.net> in bug #85362.
 
   18 Dec 2004; Simon Stelling <blubb@gentoo.org> tiobench-0.3.3-r1.ebuild:
   was testing for a long time, marking stable on amd64
diff --git a/app-benchmarks/tiobench/Manifest b/app-benchmarks/tiobench/Manifest
index c2df182a3396..598baf57dd1d 100644
--- a/app-benchmarks/tiobench/Manifest
+++ b/app-benchmarks/tiobench/Manifest
@@ -1,3 +1,6 @@
-MD5 8804b4308915c7d20a112235df55b72d ChangeLog 991
 MD5 c5c0c8171235722e0969e8c83d997706 tiobench-0.3.3-r1.ebuild 940
+MD5 441623d83debd775b2a09753264496ff tiobench-0.3.3-r2.ebuild 997
+MD5 8804b4308915c7d20a112235df55b72d ChangeLog 991
 MD5 b0e08c271d30b5da41b55be795a8773e files/digest-tiobench-0.3.3-r1 65
+MD5 b0e08c271d30b5da41b55be795a8773e files/digest-tiobench-0.3.3-r2 65
+MD5 648c1a6986bda338884f8f77ee48a4a5 files/0.3.3-column-description-fix.patch 1063
diff --git a/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch b/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch
new file mode 100644
index 000000000000..52b6cf8f7358
--- /dev/null
+++ b/app-benchmarks/tiobench/files/0.3.3-column-description-fix.patch
@@ -0,0 +1,21 @@
+--- /usr/sbin/tiobench.pl	2005-02-23 00:21:33.000000000 +0100
++++ /home/evil/trash/tiobench_debian	2005-03-15 18:11:19.000000000 +0100
+@@ -168,6 +168,8 @@
+                   $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'stime'} ) / 
+                   $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'time'};
+                $stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpueff'} =
++                  ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpu'} == 0) ?
++                  '0' :
+                   ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'rate'} /
+                   ($stat_data{$identifier}{$thread}{$size}{$block}{$field}{'cpu'}/100));
+             }
+@@ -196,6 +198,9 @@
+ $report{'SEQ_WRITES'}   = "Sequential Writes";
+ $report{'RAND_WRITES'}  = "Random Writes";
+ 
++# The top is the same for all 4 reports
++$^ = 'SEQ_READS_TOP';
++
+ foreach my $title ('SEQ_READS', 'RAND_READS', 'SEQ_WRITES', 'RAND_WRITES') {
+    $-=0; $~="$title"; $^L=''; # reporting variables
+    print "\n$report{$title}\n";
diff --git a/app-benchmarks/tiobench/files/digest-tiobench-0.3.3-r2 b/app-benchmarks/tiobench/files/digest-tiobench-0.3.3-r2
new file mode 100644
index 000000000000..20ba79163de5
--- /dev/null
+++ b/app-benchmarks/tiobench/files/digest-tiobench-0.3.3-r2
@@ -0,0 +1 @@
+MD5 bf485bf820e693c79e6bd2a38702a128 tiobench-0.3.3.tar.gz 28282
diff --git a/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild b/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild
new file mode 100644
index 000000000000..965efad05ca8
--- /dev/null
+++ b/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/tiobench/tiobench-0.3.3-r2.ebuild,v 1.1 2005/03/22 12:51:46 swegener Exp $
+
+inherit eutils
+
+DESCRIPTION="Portable, robust, fully-threaded I/O benchmark program"
+HOMEPAGE="http://tiobench.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
+IUSE=""
+
+RDEPEND="virtual/libc
+	dev-lang/perl"
+DEPEND=">=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/0.3.3-column-description-fix.patch
+
+	sed -i \
+		-e 's:/usr/local/bin:/usr/sbin:' tiobench.pl \
+		|| die "sed tiobench.pl failed"
+	sed -i \
+		-e '/DLARGEFILES/ s/^#//' \
+		-e "/^CFLAGS/ s:=.*:= ${CFLAGS}:" Makefile \
+		|| die "sed Makefile failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dosbin tiotest tiobench.pl tiosum.pl || die "dosbin failed"
+	dodoc BUGS ChangeLog README TODO || die "dodoc failed"
+}