Use newbin instead of mv. Remove empty (R)DEPEND. Respect CC (bug #243512), LDFLAGS (use emake instead of make).

Package-Manager: portage-2.2_rc92/cvs/Linux i686

4 files changed, 60 insertions, 13 deletions

diff --git a/app-benchmarks/bonnie/ChangeLog b/app-benchmarks/bonnie/ChangeLog
index 003409280a2f..127672a759da 100644
--- a/app-benchmarks/bonnie/ChangeLog
+++ b/app-benchmarks/bonnie/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-benchmarks/bonnie
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie/ChangeLog,v 1.16 2009/10/12 18:59:17 halcy0n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie/ChangeLog,v 1.17 2010/10/12 18:22:07 jer Exp $
+
+*bonnie-2.0.6-r1 (12 Oct 2010)
+
+  12 Oct 2010; Jeroen Roovers <jer@gentoo.org> +bonnie-2.0.6-r1.ebuild,
+  +files/bonnie-2.0.6-includes.patch:
+  Use newbin instead of mv. Remove empty (R)DEPEND. Respect CC (bug
+  #243512), LDFLAGS (use emake instead of make).
 
   12 Oct 2009; Mark Loeser <halcy0n@gentoo.org> bonnie-2.0.6.ebuild:
   QA fixes; unquoted variables
diff --git a/app-benchmarks/bonnie/Manifest b/app-benchmarks/bonnie/Manifest
index 1a3c963d2902..4b1642a52799 100644
--- a/app-benchmarks/bonnie/Manifest
+++ b/app-benchmarks/bonnie/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Makefile.patch 248 RMD160 2b2330ab7c93fe4e565f1554150695d7fbe6fabb SHA1 b0495ba16f027424b9d678023f3ef744991d7302 SHA256 d4583bcac36b5fdb61267f45dec3a16e12e585fb9dd2c9344972084c335432a1
+AUX bonnie-2.0.6-includes.patch 336 RMD160 c6bb7a0943da9240ff75105bbfef7367cfd58100 SHA1 944dd798c2d3931efb33380bf8a06a2f837aa147 SHA256 e1c0c75832d97e5e7a6d168856fc146f1302340dd6efb27195e531e22d8734ee
 AUX bonnie_man.patch 350 RMD160 aadee29119fa914fe71db06979289e03f29935ac SHA1 25c6c45663b64f8282550be16d87ec6f4eaae3c8 SHA256 232344a457258ec408a94461350dcd7223b53993f47724a4d45882f2a60f402f
 DIST bonnie.tar.gz 7140 RMD160 677446fde3f53e2afc2b5f1d76af2555a4779d88 SHA1 f435ae56903883c8e3e011eb989783c8410f5ee3 SHA256 e420ca9275ddd9aa5fdb27d86851a57eea5ff94e8ccf6ba71352d35546842937
+EBUILD bonnie-2.0.6-r1.ebuild 838 RMD160 ea7adca4ca896739c6a3ea746225bcfd564d2c78 SHA1 6f6b15195c16fdf59e1af42d390c05dc524e1687 SHA256 9d694023cc760441cd9557b11e7af04caf10d86ba21706686bd21dc6f6fc63c7
 EBUILD bonnie-2.0.6.ebuild 802 RMD160 65c90ef4b8b08eaa65844d2aea5bb29ad7b7081b SHA1 230deff12a636ff43e5bd23be8fe993765c5a34f SHA256 f5a63054e20c52f474248d34b8b3c575bd8b7f6441d1051f10e6ce2c2c3c8c5b
-MISC ChangeLog 1592 RMD160 d6fbee352159a830fe60eb4b612cc6a13ff129f1 SHA1 ac01031ea6b2b913b9908b6c7fa0e803358c4a2c SHA256 6af4295416d1cf2b6dfb4a18f473e6fcc1e69ce447ac7ed188989e54f55d9218
+MISC ChangeLog 1848 RMD160 fe587eb7929fd2fc75ec6d46ad907f2289739720 SHA1 83ff962c7c6998eaa8d663456f7eca53d10cec87 SHA256 501d934a22531ca75ea0c02d09aa38000580cc2abfaef4681f50a9f53066ecfd
 MISC metadata.xml 164 RMD160 80582ab33b0b579ef4d41eb9899dbc2a5904566c SHA1 ad15e5d3d68ce39107636b39a2bcc6a847ab45dd SHA256 d1c053798bce14287e6955dac28fa5fc6c7415449545b2922f4d30fe4d84894c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrTfIoACgkQCRZPokWLroRSogCdEzr04JkAssj173jQIKurev0z
-sIwAoIyJFCktYvP9CySrm8mC/vq/F4NM
-=BocH
------END PGP SIGNATURE-----
diff --git a/app-benchmarks/bonnie/bonnie-2.0.6-r1.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6-r1.ebuild
new file mode 100644
index 000000000000..179aebe291fa
--- /dev/null
+++ b/app-benchmarks/bonnie/bonnie-2.0.6-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie/bonnie-2.0.6-r1.ebuild,v 1.1 2010/10/12 18:22:07 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Performance Test of Filesystem I/O using standard C library calls."
+HOMEPAGE="http://www.textuality.com/bonnie/"
+SRC_URI="http://www.textuality.com/bonnie/bonnie.tar.gz"
+
+LICENSE="bonnie"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/bonnie_man.patch \
+		"${FILESDIR}"/Makefile.patch \
+		"${FILESDIR}"/${P}-includes.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) SYSFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	newbin Bonnie bonnie
+	doman bonnie.1
+	dodoc Instructions
+}
diff --git a/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch b/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch
new file mode 100644
index 000000000000..cfefe953c6f1
--- /dev/null
+++ b/app-benchmarks/bonnie/files/bonnie-2.0.6-includes.patch
@@ -0,0 +1,13 @@
+--- a/Bonnie.c	1996-08-28 18:23:49.000000000 +0200
++++ b/Bonnie.c	2010-10-12 20:15:26.000000000 +0200
+@@ -29,6 +29,10 @@
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
++#include <time.h>
++#include <string.h>
++#include <stdlib.h>
++#include <sys/wait.h>
+ #if defined(SysV)
+ #include <limits.h>
+ #include <sys/times.h>