Respect LDFLAGS wrt bug 335243, drop old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x28DB029C

5 files changed, 43 insertions, 72 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/Manifest b/app-benchmarks/dbench/Manifest
index 6c0f24485285..96df1ddeb85a 100644
--- a/app-benchmarks/dbench/Manifest
+++ b/app-benchmarks/dbench/Manifest
@@ -1,8 +1,26 @@
-DIST dbench-2.0.tar.gz 699860 SHA256 5d151b810f9d06af1875caceb4b762193d87c7c5e9e717c327c24aefab52ebf8 SHA512 cdd03723fe67491eb9021c251d568fd3ded1b8220fd4f2e7bc759f5181db5b682f3209ac323279776f7de3b985bbea576ff2291ce48e269220b30088dd801a9b WHIRLPOOL 8a2f0625257fe8735a342600a87d4e0eeb15130ebebaa747d6bbafe1185cc26fae1362aed4a2de6ad8c1bac4cb4ce78c303b33159545acfbe9e4bfcf11bbbd5a
-DIST dbench-3.04.tar.gz 2078197 SHA256 055e411081ae25fd358dd0f4c1547ee1bd7429bea0f1fad9156a50a09ddd668b SHA512 b76acd3361a5976b88065162eb0bb775af577461b436481b5fd090be6bd0a235b2bf721b80758948152997f1510300069bc89c201a8fa6ee97e089be0d05c055 WHIRLPOOL 9645b9f4073d22d75ff48ab0a527c6b963a28c34b698674510852a42ab9c358b5c7ea9c22e0f2512799d72481c317b76d7420bf1f6b634b1ea4454919a4e1694
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST dbench-4.0.tar.gz 2055359 SHA256 6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a SHA512 70c65c5b079edf745c267be753919c780153c9064dbda95c270b3c2c1d8c16e84fab4e743eb777436813678ecff13ec2b55d011e8acc4bd83e58f0dda7438e7f WHIRLPOOL f39d17ec5ec6e8618045337c408f7c7dc722a8c54c68872ca5a03c8affd35de1f6e6d5e842e90dcb889816fc7891f31b9217d2591ec2e90c056d92fdca90da89
-EBUILD dbench-2.0.ebuild 845 SHA256 e2e5c5816ec5b89fd251ea27ed398269959194daec9470381d4d1ce5b97d869a SHA512 d8507af8f366340be827c5cb2bd0a711206b8007c747b57e4a23dd565aea2108ac8a5455e4397f8cf74bda44d32e74c906d045dcac961f39098f1d1191fbef5a WHIRLPOOL 9d9a0fefbd134f36c1a6e32bd06386f1bde2f345637b6ec39c29b3fc2e82e6029b6fd642ab360663534cfe15e5d3f6cdcd88505050ae87becb34fd3b53dcdd28
-EBUILD dbench-3.04.ebuild 674 SHA256 67a5025ecd1f836a86f6dad759fb0636710e2b56ab87ce57a936ca3d63f53db0 SHA512 18e0d271d3f7659e2b69cebcd41816e7a808094b0f0c1e8c7d3e24c10517cdb737cf2d3dfa9599c7ee1c9757a5d9ee84a4ba116d5effdd14eaca8e6665449a06 WHIRLPOOL 36504ddd0540e518587cc81ed948d416a5ad36b26bcc8ce9404a6d7d189f710ccdf87e4ffe167b44c35dc690e1a9e9aa6186fb44507bd13e6f49b948b7f53afb
-EBUILD dbench-4.0.ebuild 818 SHA256 ab336401d7da72bd07a437f7f96cfe67e5e73153159af1ddee76fb7c15efb2df SHA512 e4396935274d6125f2d926a44f710f563c35ddf34c0f1cd384df3e48f30cfd92e3fd5e923611193dfd9c8ac78fff208c40e75ea02dde9860ace9987e127ff972 WHIRLPOOL 226f10ddc54e76e2b9e2148b54ee43ae7cd3882d08ef1febe39e7dac8c3b289011beaebd495c52317ded79cb9d668369982cb1f392c33ce2daf4464606fe4be2
-MISC ChangeLog 3957 SHA256 ece8469002fab16c65cb850d2d42d6a8fd63170b6a36ebf401f913f7f5f3dadc SHA512 b779470b30f7fd6d368155b95eb63bf6177c8d8b25c60b6573d48a036631878529060ef1fdfae65d261866e9a8b4531fa2e600cfa51675a14447925ba01312bc WHIRLPOOL 51f89cf7aa8f465d0136a02cd318b1b94f2fb38bd71f566528f1d474820d851a06ea2a6dd1a042e75e9488b85e6a627ec80ac3702869f27c796fffd8011eea4c
+EBUILD dbench-4.0.ebuild 945 SHA256 93855972e6340d58b09529dd9736558515ff8f821e69f6ba20e514d59bb90373 SHA512 00a50908ec79a677e0dbb8dbf3810b59e5430c6088a3ec8a764a0d107403ce95442538ce13f15f233f8b79318ea2223ba7e6cfdb12d1e7d0d51e17690bca26d0 WHIRLPOOL fbb4561825ac5b2b15b6ed8f8075956b3875235185f0290b0de70b95b021f1feb484cf9da2ed36497960c9983f7fad2d1188254e9ebae9f2c631047744471dd5
+MISC ChangeLog 4116 SHA256 9b209b3c7633ad2100c477fd5ec541dbd0115e08c4f5df08ead2bb926cc7be8f SHA512 4b5340ba57de8689b63e202d1849e4d8e0619263c0e41a7aa68347078d2e35610f17f4ea9edd0604ce7997914d219d5c544ab866911c538f8725fda1e33f5240 WHIRLPOOL 38158ecf6413eae2bce30909889979820230e1c1afaa529bcab0e4121140eca21a9f1bbafa4de705b52524d31954580d7a9f7b13ea8f3e5beee9aa4131ccdc3d
 MISC metadata.xml 258 SHA256 6b80bacd73563c7530978566cf2c81ca5fdb9eef54058a4f75ee0e272043283c SHA512 de6865f5cc5897046336611a5b746003865f531a17178239392bc730edf7bc03eb4d3b88f69a2a10e6cf7d1902b80a2cbfb60e4956e54b1348e148d811fe3e1d WHIRLPOOL 1b925f9c7234b04d61c53aad5b887600dd9ed4c59bb82da0cd6ff006e360a0af4502b613c103fda81cc9cd8b4afbe7d84124bd54654085c22cb9008e93fa34d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJTovBCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzgwNDhGMjg4MzhERTE1NTY2NjA4MkZE
+MUJBQjZCNTI4REIwMjlDAAoJENG6trUo2wKcvkMP/16KmqQ9B3rJ8qanQGsKqknH
+svzMqS3XA/5k8K1HlhIsz5fQgrqLwURecx7q9eTd1OeThJ+j02wsJLfAXT/gwVT3
+ExE6EptY1bNmapv4G8gNzDYOF+X2jYgYsTVZ/HHGMm/moLa661RuSd5XhePtn2af
+XhmtHCLRIVD1hSsHsOZQokcwe0npu4mz7Rs26WexMxUMziiHs2gidQzQ5t+6G0Sp
+LopKPd6J6k0zL2kkR0GXbNum7/CWYrQmq5c1/oNYU46UMHuiKDZWHgIsJv9Tt28n
+W6WMlPwHEpaLx4/9Rtxf7MYpkKP/ZjdiTMJA4R8gmoLjqaxxAgmDyxOR09BHSGsx
+8y70HA5i7mAHtfF+AsdKZ3PWTPyaxnnOvdYWtkq635qxnPKFFh2I5e/URuX9cd/+
+RUGu3fO6kALRw2hD9O+HzgomNvLH4h0iRPqLZC4PVlI3VDS6dYIKWYaerbufLMBA
+mrN7oNMnIQQZrByisp1zLDt+7+8IVkoQScUPShe/iGkijM49yNpKdlIcupyYMevn
+r33lLDyeg0KxMy2vAdqBoN9yq8WHHN3byQmc5XMR9ljaOc9fEyHH9c8OWklLC3fh
+Li/iXD5Im6SBg3sTL9g2m7RuuPE40COMiGQQKAQa2ZsngBGpEABYt7PJCz11hXdM
+oCR4vYBRNsPUe85PK2kb
+=OES6
+-----END PGP SIGNATURE-----
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