summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Noberasco <s4t4n@gentoo.org>2010-09-20 09:01:56 +0000
committerMichele Noberasco <s4t4n@gentoo.org>2010-09-20 09:01:56 +0000
commita113c8cc959b51aa7cbc6e685baf6a96243b1179 (patch)
treee34baef25e5ca67c2e975a8ea85753a693130058 /x11-plugins/wmmemfree
parentFixing elog messages (diff)
downloadgentoo-2-a113c8cc959b51aa7cbc6e685baf6a96243b1179.tar.gz
gentoo-2-a113c8cc959b51aa7cbc6e685baf6a96243b1179.tar.bz2
gentoo-2-a113c8cc959b51aa7cbc6e685baf6a96243b1179.zip
Honour Gentoo LDFLAGS, see bug #337927.
Wiped out older revision. (Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'x11-plugins/wmmemfree')
-rw-r--r--x11-plugins/wmmemfree/ChangeLog9
-rw-r--r--x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild37
-rw-r--r--x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild13
3 files changed, 15 insertions, 44 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/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() {