Respect LDFLAGS wrt bug 333979. Thanks to Diego for the report.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 43 insertions, 5 deletions

diff --git a/x11-misc/suxpanel/ChangeLog b/x11-misc/suxpanel/ChangeLog
index b979cbc6e563..595fd1ca4186 100644
--- a/x11-misc/suxpanel/ChangeLog
+++ b/x11-misc/suxpanel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/suxpanel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/suxpanel/ChangeLog,v 1.10 2010/06/06 12:54:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/suxpanel/ChangeLog,v 1.11 2010/08/27 15:48:45 xarthisius Exp $
+
+*suxpanel-0.4b-r3 (27 Aug 2010)
+
+  27 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -suxpanel-0.4b-r2.ebuild, +suxpanel-0.4b-r3.ebuild,
+  +files/suxpanel-0.4b-makefile.patch:
+  Respect LDFLAGS wrt bug 333979. Thanks to Diego for the report.
 
 *suxpanel-0.4b-r2 (06 Jun 2010)
 
diff --git a/x11-misc/suxpanel/files/suxpanel-0.4b-makefile.patch b/x11-misc/suxpanel/files/suxpanel-0.4b-makefile.patch
new file mode 100644
index 000000000000..1f1f5750d347
--- /dev/null
+++ b/x11-misc/suxpanel/files/suxpanel-0.4b-makefile.patch
@@ -0,0 +1,31 @@
+--- Makefile.in
++++ Makefile.in
+@@ -1,7 +1,7 @@
+ # ----------------------------------------------------------------------------
+ 
+-CC = gcc
+-CFLAGS = -Wall $(GTK_CFLAGS) -O2 -g
++CC ?= gcc
++CFLAGS ?= -Wall $(GTK_CFLAGS) -O2 -g
+ 
+ # ----------------------------------------------------------------------------
+ 
+@@ -11,13 +11,16 @@
+ 	  mount.so mail.so showdesktop.so
+ 
+ all:	$(OBJECTS) $(MODULES)
+-	$(CC) $(CFLAGS) -o suxpanel -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) $(GTK_FLAGS)
++	$(CC) $(LDFLAGS) $(GTK_CFLAGS) $(CFLAGS) -o suxpanel -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS)
+ 
+ %.so: %.c 
+ 	@echo "compile module: $< ($@)"
+-	$(CC) $(CFLAGS) -o $@ -shared $< $(GTK_CFLAGS) $(GTK_LIBS) \
++	$(CC) $(LDFLAGS) $(GTK_CFLAGS) $(CFLAGS) -fPIC -o $@ -shared $< $(GTK_LIBS) \
+             $(WNCK_LIBS) $(WNCK_CFLAGS)
+ 
++%.o: %.c
++	$(CC) $(GTK_CFLAGS) $(WNCK_CFLAGS) $(CFLAGS) -c $< -o $@
++
+ clean:
+ 	rm -rf *~ *.o *.so suxpanel
+ 
diff --git a/x11-misc/suxpanel/suxpanel-0.4b-r2.ebuild b/x11-misc/suxpanel/suxpanel-0.4b-r3.ebuild
index 41166abef4b6..3c7136feabb3 100644
--- a/x11-misc/suxpanel/suxpanel-0.4b-r2.ebuild
+++ b/x11-misc/suxpanel/suxpanel-0.4b-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/suxpanel/suxpanel-0.4b-r2.ebuild,v 1.2 2010/06/06 17:18:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/suxpanel/suxpanel-0.4b-r3.ebuild,v 1.1 2010/08/27 15:48:45 xarthisius Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -20,8 +20,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.in.patch \
-		"${FILESDIR}"/${P}-stdlib.patch
+	epatch "${FILESDIR}"/${P}-stdlib.patch \
+		"${FILESDIR}"/${P}-makefile.patch
 
 	sed -i \
 		-e "s:share/${PN}/plugins:$(get_libdir)/${PN}/plugins:" \
@@ -37,5 +37,5 @@ src_configure() {
 src_install () {
 	emake DESTDIR="${D}" install || die
 	dobin suxpanel-install.sh || die
-	dodoc README
+	dodoc README || die
 }