Respect LDFLAGS wrt bug 335243, drop old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 28DB029C)

4 files changed, 19 insertions, 66 deletions

diff --git a/app-benchmarks/dbench/ChangeLog b/app-benchmarks/dbench/ChangeLog
index 300d92674015..a44cc1129d1f 100644
--- a/app-benchmarks/dbench/ChangeLog
+++ b/app-benchmarks/dbench/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-benchmarks/dbench
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/dbench/ChangeLog,v 1.39 2010/11/10 19:03:35 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/dbench/ChangeLog,v 1.40 2014/06/19 14:14:16 creffett Exp $
+
+  19 Jun 2014; Chris Reffett <creffett@gentoo.org> -dbench-2.0.ebuild,
+  -dbench-3.04.ebuild, dbench-4.0.ebuild:
+  Respect LDFLAGS wrt bug 335243, drop old.
 
   10 Nov 2010; Patrick Lauer <patrick@gentoo.org> dbench-2.0.ebuild:
   Make repoman happy
diff --git a/app-benchmarks/dbench/dbench-2.0.ebuild b/app-benchmarks/dbench/dbench-2.0.ebuild
deleted file mode 100644
index 61e9da4fe297..000000000000
--- a/app-benchmarks/dbench/dbench-2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/dbench/dbench-2.0.ebuild,v 1.22 2010/11/10 19:03:35 patrick Exp $
-
-DESCRIPTION="Popular filesystem benchmark"
-SRC_URI="ftp://samba.org/pub/tridge/dbench/${P}.tar.gz"
-HOMEPAGE="ftp://samba.org/pub/tridge/dbench/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:-O2 -Wall:${CFLAGS}:g" Makefile
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	dobin dbench tbench tbench_srv
-	dodoc README results.txt
-	insinto /usr/share/dbench
-	doins client_plain.txt client_oplocks.txt
-	doman dbench.1
-}
-
-pkg_postinst() {
-	elog "You can find the client_*.txt file in ${ROOT}usr/share/dbench."
-}
diff --git a/app-benchmarks/dbench/dbench-3.04.ebuild b/app-benchmarks/dbench/dbench-3.04.ebuild
deleted file mode 100644
index 833c5b4b6238..000000000000
--- a/app-benchmarks/dbench/dbench-3.04.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/dbench/dbench-3.04.ebuild,v 1.10 2009/09/13 22:20:15 patrick Exp $
-
-DESCRIPTION="Popular filesystem benchmark"
-SRC_URI="ftp://ftp.samba.org/pub/tridge/dbench/${P}.tar.gz"
-HOMEPAGE="http://samba.org/ftp/tridge/dbench/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ppc64 sparc ~x86"
-IUSE=""
-
-src_install() {
-	dobin dbench tbench tbench_srv
-	dodoc README INSTALL
-	doman dbench.1
-	insinto /usr/share/dbench
-	doins client.txt
-}
-
-pkg_postinst() {
-	elog "You can find the client.txt file in ${ROOT}usr/share/dbench."
-}
diff --git a/app-benchmarks/dbench/dbench-4.0.ebuild b/app-benchmarks/dbench/dbench-4.0.ebuild
index 04807eeae6f5..1c3c337c530c 100644
--- a/app-benchmarks/dbench/dbench-4.0.ebuild
+++ b/app-benchmarks/dbench/dbench-4.0.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/dbench/dbench-4.0.ebuild,v 1.9 2009/05/01 23:03:29 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/dbench/dbench-4.0.ebuild,v 1.10 2014/06/19 14:14:16 creffett Exp $
+EAPI=5
 
 inherit eutils autotools
 
@@ -15,12 +16,18 @@ IUSE=""
 DEPEND="dev-libs/popt"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/${P}"
+src_prepare() {
 	eautoheader
 	eautoconf
-	}
+	sed -i -e \
+		"s:\$(CC) -o:\$(CC) \$(LDFLAGS) -o:" \
+		Makefile.in || die
+	eautoreconf
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
 
 src_install() {
 	dobin dbench tbench tbench_srv