summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Noberasco <s4t4n@gentoo.org>2010-09-06 08:36:07 +0000
committerMichele Noberasco <s4t4n@gentoo.org>2010-09-06 08:36:07 +0000
commit3fdceab1109f8796de7b70a55d6a08f6693de8b0 (patch)
tree18eb55071e493cdd88c5e7c5af9a07c9ccb55b79 /x11-plugins/wmpop3lb
parentVersion bump (diff)
downloadgentoo-2-3fdceab1109f8796de7b70a55d6a08f6693de8b0.tar.gz
gentoo-2-3fdceab1109f8796de7b70a55d6a08f6693de8b0.tar.bz2
gentoo-2-3fdceab1109f8796de7b70a55d6a08f6693de8b0.zip
Some ebuild QA, honour Gentoo LDFLAGS. Closes bug #335986.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'x11-plugins/wmpop3lb')
-rw-r--r--x11-plugins/wmpop3lb/ChangeLog7
-rw-r--r--x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild21
2 files changed, 17 insertions, 11 deletions
diff --git a/x11-plugins/wmpop3lb/ChangeLog b/x11-plugins/wmpop3lb/ChangeLog
index d201d8325bcc..bfb2654036fc 100644
--- a/x11-plugins/wmpop3lb/ChangeLog
+++ b/x11-plugins/wmpop3lb/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-plugins/wmpop3lb
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/ChangeLog,v 1.14 2008/01/21 14:32:45 drac Exp $
+# Copyright 2002-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/ChangeLog,v 1.15 2010/09/06 08:36:07 s4t4n Exp $
+
+ 06 Jan 2010; Michele Noberasco <s4t4n@gentoo.org> wmpop3lb-2.4.2-r2.ebuild:
+ Some ebuild QA, honour Gentoo LDFLAGS. Closes bug #335986.
21 Jan 2008; Samuli Suominen <drac@gentoo.org> -wmpop3lb-2.4.2.ebuild,
wmpop3lb-2.4.2-r2.ebuild:
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
index 83b3458c5912..27af2f05ca94 100644
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
@@ -1,7 +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/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild,v 1.4 2008/01/21 14:32:45 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild,v 1.5 2010/09/06 08:36:07 s4t4n Exp $
+EAPI=2
inherit eutils
IUSE=""
@@ -23,16 +24,18 @@ DEPEND="${RDEPEND}
x11-proto/xextproto
>=sys-apps/sed-4"
-src_unpack() {
- unpack ${A} ; cd "${S}"/wmpop3
-
- sed -i -e "s:-g2 -D_DEBUG:${CFLAGS}:" Makefile
-
- #Fix bug #110683 - it is already included in the following patch
- #epatch ${FILESDIR}/${P}-socket-close.patch
+src_prepare() {
+ #Honour Gentoo CFLAGS
+ sed -i -e "s:-g2 -D_DEBUG:${CFLAGS}:" "wmpop3/Makefile"
#Fix bug #161530
epatch "${FILESDIR}"/${P}-fix-RECV-and-try-STAT-if-LAST-wont-work.patch
+
+ #De-hardcode compiler
+ sed -i -e "s:cc:\$(CC):g" "wmpop3/Makefile"
+
+ #Honour Gentoo LDFLAGS - bug #335986
+ sed -i -e "s:\$(FLAGS) -o wmpop3lb:\$(LDFLAGS) -o wmpop3lb:" "wmpop3/Makefile"
}
src_compile() {