Honour Gentoo LDFLAGS, see bug #337927.

Wiped out older revision.
Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 17 insertions, 57 deletions

diff --git a/x11-plugins/wmmemfree/ChangeLog b/x11-plugins/wmmemfree/ChangeLog
index cdb7ac52bb92..223503388543 100644
--- a/x11-plugins/wmmemfree/ChangeLog
+++ b/x11-plugins/wmmemfree/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wmmemfree
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/ChangeLog,v 1.18 2008/11/26 00:04:00 tcunha Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/ChangeLog,v 1.19 2010/09/20 09:01:56 s4t4n Exp $
+
+  20 Sep 2010; Michele Noberasco <s4t4n@gentoo.org> wmmemfree-0.7-r2.ebuild:
+  Honour Gentoo LDFLAGS, see bug #337927.
+  -wmmemfree-0.7-r1.ebuild:
+  Wiped out older revision.
 
   26 Nov 2008; Tiago Cunha <tcunha@gentoo.org> wmmemfree-0.7-r2.ebuild:
   stable sparc, bug 215651
diff --git a/x11-plugins/wmmemfree/Manifest b/x11-plugins/wmmemfree/Manifest
index d49c20d9fcb0..f81518455553 100644
--- a/x11-plugins/wmmemfree/Manifest
+++ b/x11-plugins/wmmemfree/Manifest
@@ -1,17 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX wmmemfree-0.7-add-kernel-26-support.patch 2480 RMD160 a54a5bd55b3dcf8d52e6ca91008fb8958153b515 SHA1 519f057a5aa28b89206444e5a61c46019916acff SHA256 7de60b8415623c33731723b2b5a2c5d41252aef1eb4d54bfcd1d717d9a2f2ce1
 AUX wmmemfree-0.7-fix-crash-when-there-is-no-swap.patch 755 RMD160 bfaf853650ba9a292ad3a37326bd39202134e205 SHA1 e7348a10f4b61d83565dc949b001c521a222c295 SHA256 4943a269fa9f4dc12466cb25d80c09edb83885b8fa9fdd7480f98d541a9cedfb
 DIST wmmemfree-0.7.tar.bz2 14287 RMD160 d38314fe989474e3e19647e7bbc91304216a7f5a SHA1 be5ef86589917a1c41b5428161d06abd8419c943 SHA256 52cff4e2850de4528e55459ab3eab6b14c7ad29d15e793eb1eb6e69b94aace34
-EBUILD wmmemfree-0.7-r1.ebuild 879 RMD160 30e1fe18197a768c0657dbd853679311f903c722 SHA1 d07230351441def99aa4228f90fad4d3e4503e74 SHA256 ee3eae343ae34cad52ab35c8a1011f26d5a4c8d09806e444485b52cfc919470b
-EBUILD wmmemfree-0.7-r2.ebuild 945 RMD160 0a2f071627b6a972827763a2a8ad585524b06f47 SHA1 4b4f00bad52f0fc8b6bbc45f51667a968d34c7a1 SHA256 456cb1da9e7d594be666bc7dfcb7cec090d60d2ce8c813b1fbe7baa2a36a9a63
-MISC ChangeLog 2564 RMD160 ee195895ec0a4dca0d8e331dfff2368bbd24f442 SHA1 2bbd7dc35cbdeca116a6592b56cdee981955d948 SHA256 8caa1317dfb8b696dec7fbe2716f557d88ff7495cb0c45fe19f31288cf4358f0
+EBUILD wmmemfree-0.7-r2.ebuild 1033 RMD160 8513902eea763cb894573447fdb83acaf7ee1283 SHA1 3ff381b71e8861f31bbc6f719ca53023e69dcccb SHA256 83214582ba4682a52fb6b0840f253179ba9b4ab8178339210641a74a139005bc
+MISC ChangeLog 2739 RMD160 e7f3367ab13ee868406e9d501a572235f9f8e175 SHA1 0b4f761354b14eb9650d518169f8a78de4c8a813 SHA256 8a73eac8dc75548b54e4503be6c023082379893a0f4334621a4edbced4e5233d
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkskoUACgkQ/Kkm35zQzl6wRQCeLiRuFTbHS8RbgGYRpD5bNhVV
-ihoAmwSOIi8z3qV23ZgFjhi1JXvciYXU
-=rWZd
------END PGP SIGNATURE-----
diff --git a/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild b/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild
deleted file mode 100644
index c9a6922902d6..000000000000
--- a/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild,v 1.9 2008/01/15 08:11:47 drac Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a blue memory monitoring dockapp."
-HOMEPAGE="http://misuceldestept.go.ro/wmmemfree"
-SRC_URI="http://ibiblio.org/pub/linux/X11/xutils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-add-kernel-26-support.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" FLAGS="${CFLAGS}" \
-		STRIP="true" || die "emake failed."
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc ChangeLog README THANKS TODO WMS
-}
diff --git a/x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild b/x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild
index 85b4dbbba4c0..b185a36a9c3b 100644
--- a/x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild
+++ b/x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild,v 1.5 2008/11/26 00:04:00 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild,v 1.6 2010/09/20 09:01:56 s4t4n Exp $
+
+EAPI=3
 
 inherit eutils toolchain-funcs
 
@@ -19,11 +21,12 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xextproto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-add-kernel-26-support.patch
 	epatch "${FILESDIR}"/${P}-fix-crash-when-there-is-no-swap.patch
+
+	#Honour Gentoo LDFLAGS, see bug #337927.
+	sed -e "s/-o \$(PROG)/\$(LDFLAGS) -o \$(PROG)/" -i Makefile
 }
 
 src_compile() {