From 2eb3a8d3ec499cd3c4152856b57c6c7ad1437295 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Thu, 28 Dec 2017 13:45:46 +0100
Subject: app-benchmarks/bonnie: [QA] Minor touchups

Package-Manager: Portage-2.3.19, Repoman-2.3.6
---
 app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild | 14 ++++++++------
 app-benchmarks/bonnie/files/Makefile.patch   |  9 ++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'app-benchmarks/bonnie')

diff --git a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild b/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
index c9fdf5a2ddb6..65ce1c40e0e8 100644
--- a/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
+++ b/app-benchmarks/bonnie/bonnie-2.0.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Performance Test of Filesystem I/O using standard C library calls"
 HOMEPAGE="http://www.textuality.com/bonnie/"
@@ -16,12 +16,14 @@ IUSE=""
 
 S=${WORKDIR}
 
-PATCHES=( "${FILESDIR}/bonnie_man.patch"
-	  "${FILESDIR}/Makefile.patch"
-	  "${FILESDIR}/${P}-includes.patch" )
+PATCHES=(
+	"${FILESDIR}"/bonnie_man.patch
+	"${FILESDIR}"/Makefile.patch
+	"${FILESDIR}"/${P}-includes.patch
+)
 
-src_compile() {
-	emake CC=$(tc-getCC) SYSFLAGS="${CFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
diff --git a/app-benchmarks/bonnie/files/Makefile.patch b/app-benchmarks/bonnie/files/Makefile.patch
index c4367087b8b5..d803bd077ced 100644
--- a/app-benchmarks/bonnie/files/Makefile.patch
+++ b/app-benchmarks/bonnie/files/Makefile.patch
@@ -1,9 +1,8 @@
---- a/Makefile	1996-08-29 03:45:37.000000000 +0200
-+++ b/Makefile	2011-08-25 16:07:10.757629898 +0200
-@@ -1,11 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,11 +1,9 @@
 -CFLAGS = -O $(SYSFLAGS)
-+CFLAGS = $(SYSFLAGS)
- 
+-
  bsd:	
  	@echo 'Options are "make bsd" and "make SysV" - the default is "bsd".'
  	@echo 'If you get messages about missing functions, try "make SysV."'
-- 
cgit v1.2.3-18-g5258