Fix missing includes and defines. Respect CC (bug #243522), LDFLAGS.

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

4 files changed, 103 insertions, 13 deletions

diff --git a/app-benchmarks/piozone/ChangeLog b/app-benchmarks/piozone/ChangeLog
index 256a746b8acc..07f7ae67f61b 100644
--- a/app-benchmarks/piozone/ChangeLog
+++ b/app-benchmarks/piozone/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/piozone
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/piozone/ChangeLog,v 1.12 2009/10/12 19:04:55 halcy0n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/piozone/ChangeLog,v 1.13 2010/10/12 19:18:51 jer Exp $
+
+*piozone-1.0-r3 (12 Oct 2010)
+
+  12 Oct 2010; Jeroen Roovers <jer@gentoo.org> +piozone-1.0-r3.ebuild,
+  +files/piozone-1.0-r3-gentoo.diff:
+  Fix missing includes and defines. Respect CC (bug #243522), LDFLAGS.
 
   12 Oct 2009; Mark Loeser <halcy0n@gentoo.org> piozone-1.0-r2.ebuild:
   QA fixes; unquoted variables
diff --git a/app-benchmarks/piozone/Manifest b/app-benchmarks/piozone/Manifest
index df9a33285692..76f6f88c3e8e 100644
--- a/app-benchmarks/piozone/Manifest
+++ b/app-benchmarks/piozone/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX piozone-1.0-gentoo.diff 1495 RMD160 0411b553080b6631599c78f4f43674fc90f1db06 SHA1 541e5ea097134741af2907582da8545b315cae0a SHA256 b0751c20515f0b218d186f114ae879f276c79465cb33405020e808078f399d3a
+AUX piozone-1.0-r3-gentoo.diff 1650 RMD160 6fbd4b56f5745ba1ea99422ddad685727c4284e5 SHA1 c536e6cd2bfdef6fe0370e2f1d93062b6f3113fb SHA256 6032e3dc434a37ce37fa0b323c9d8c396206509aa7d4f3868bcd68a542ffcba5
 DIST piozone-1.0.tar.gz 2228 RMD160 7a21c0f41401bfb9631c3ca8ab1106309752da37 SHA1 4062db33de05593e7796a9e77d0605ebebcd355d SHA256 0b7f880b72b10664a24b712c22c90b4caab4f0cb1a8c99cba0d1a106fd63d15d
 EBUILD piozone-1.0-r2.ebuild 637 RMD160 aa50a38cbe4b0cbc3e081dca61e24b152ae929f2 SHA1 8e5713fbb7e1667d5a8d1d17009cfd11be545151 SHA256 2dcdc0d1c5d70ca5781ebc69d04d7aad6c2158dff646edd13ed3af8e6c31a9ef
-MISC ChangeLog 1387 RMD160 a230c214a1b7c88626d3b15e09b7492dc4a3e127 SHA1 049111e4b8ac7b70cbe446578cd84218a8d62f56 SHA256 5005810713f090d42dd0b1f533fd6ab4b339502f8823d7349f445a806205c85a
+EBUILD piozone-1.0-r3.ebuild 679 RMD160 27e86dc31a6209d48b6c111a7f4598ebd1c16013 SHA1 1d8aa632fd8d05e4d926a488444e24331b01c2f3 SHA256 c89ed1df21ed8a855c3d01f45f50cc3dddbda848a7816e8004667c0456a68ed2
+MISC ChangeLog 1594 RMD160 0b524e387987769cb9b6b6aff67520e9bab9a0ec SHA1 6b6cdd3963df609ec83de772a9a97aaa328010fb SHA256 52a78a0f1b5a8f6210ea2403b44fe1436c73cf5acf85ee4222b6d66e8f50c57b
 MISC metadata.xml 164 RMD160 80582ab33b0b579ef4d41eb9899dbc2a5904566c SHA1 ad15e5d3d68ce39107636b39a2bcc6a847ab45dd SHA256 d1c053798bce14287e6955dac28fa5fc6c7415449545b2922f4d30fe4d84894c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrTfdwACgkQCRZPokWLroSZOgCcDDyAvfh/k3o8Pgkyz1vcg3t8
-pU4An3igODcQKvl+eHi19Kr0y3W89QKc
-=C0ij
------END PGP SIGNATURE-----
diff --git a/app-benchmarks/piozone/files/piozone-1.0-r3-gentoo.diff b/app-benchmarks/piozone/files/piozone-1.0-r3-gentoo.diff
new file mode 100644
index 000000000000..b902814fec79
--- /dev/null
+++ b/app-benchmarks/piozone/files/piozone-1.0-r3-gentoo.diff
@@ -0,0 +1,63 @@
+--- a/Makefile	2002-01-28 09:15:59.000000000 +0100
++++ b/Makefile	2010-10-12 21:07:53.000000000 +0200
+@@ -4,12 +4,12 @@
+ GZIP=gzip
+ 
+ #CC=cc -xarch=v9 -O
+-CC=cc -O
++#CC=cc -O
+ 
+ all: piozone
+ 
+ piozone: piozone.o version.o
+-	$(CC) -o piozone piozone.o version.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -o piozone piozone.o version.o
+ 
+ clean distclean:
+ 	-rm -f core *.o piozone *~ \#*
+@@ -19,3 +19,6 @@
+ 
+ dist:	version distclean
+ 	(PACKNAME=`basename \`pwd\`` ; cd .. ; $(TAR) cf - $$PACKNAME | $(GZIP) -9 >$$PACKNAME.tar.gz)
++
++install:
++	install -D piozone /usr/bin/piozone
+--- a/piozone.c	2002-01-28 09:14:54.000000000 +0100
++++ b/piozone.c	2010-10-12 21:08:45.000000000 +0200
+@@ -20,7 +20,9 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <stdlib.h> /* exit(), rand(), atoi() */
+ 
++#define uint64_t u_int64_t
+ #define KiB ((uint64_t) 1024)
+ #define MiB ((uint64_t) 1024*KiB)
+ #define GiB ((uint64_t) 1024*MiB)
+@@ -73,7 +75,7 @@
+     int count = 0;
+     int nr = 0;
+     
+-    llseek(fd, off, SEEK_SET);
++    lseek64(fd, off, SEEK_SET);
+     signal(SIGALRM, sigalrm_handler);
+     stopf = 0;
+     printf("Testing... ");
+@@ -121,7 +123,7 @@
+     printf("Testing... ");
+     alarm(ts);
+     while (!stopf &&
+-	   llseek(fd, off+((rand()&area)*MiB), SEEK_SET) != -1 &&
++	   lseek64(fd, off+((rand()&area)*MiB), SEEK_SET) != -1 &&
+ 	   (nr = read(fd, iobuf, len)) == len)
+     {
+ 	print_dial();
+@@ -159,7 +161,7 @@
+     off = 0;
+     del = 64*GiB;
+ 
+-    while (del > 8*KiB && llseek(fd, off+del, SEEK_SET) != -1)
++    while (del > 8*KiB && lseek64(fd, off+del, SEEK_SET) != -1)
+     {
+ 	if (read(fd, buf, 8*KiB) < 0)
+ 	    del >>= 1;
diff --git a/app-benchmarks/piozone/piozone-1.0-r3.ebuild b/app-benchmarks/piozone/piozone-1.0-r3.ebuild
new file mode 100644
index 000000000000..74db3e86a60e
--- /dev/null
+++ b/app-benchmarks/piozone/piozone-1.0-r3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/piozone/piozone-1.0-r3.ebuild,v 1.1 2010/10/12 19:18:51 jer Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A hard-disk benchmarking tool."
+HOMEPAGE="http://www.lysator.liu.se/~pen/piozone/"
+SRC_URI="ftp://ftp.lysator.liu.se/pub/unix/piozone/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PF}-gentoo.diff
+}
+
+src_compile() {
+	append-flags -D_LARGEFILE64_SOURCE
+	emake CC=$(tc-getCC) || die
+}
+
+src_install() {
+	dosbin piozone
+}