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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 58 insertions, 7 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/Manifest b/x11-misc/suxpanel/Manifest
index f79e941d68aa..c0050644fca7 100644
--- a/x11-misc/suxpanel/Manifest
+++ b/x11-misc/suxpanel/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX suxpanel-0.4b-Makefile.in.patch 735 RMD160 4cda3e330909291744555e26dfc90d4bb992068f SHA1 6ae2700fdfe3aed179f2b674f1c5cfc756b08d2a SHA256 6f3da3995637e89d757fb85e6a09120687c899b6029907f6e1e44532eb90f865
+AUX suxpanel-0.4b-makefile.patch 937 RMD160 a28bb77d0d9b2ba9f615ba6564a6ea79f12c1bf3 SHA1 e6da8c35fd60608793113b5f17a1d9701b3421c6 SHA256 337c45dd3c76f8a63b6cf2dbdc9ad1fcf9b44ddaaf374ecb3ced1f37b679408e
 AUX suxpanel-0.4b-stdlib.patch 354 RMD160 6e1297d644df892076e55d969656647ca9078a6b SHA1 283334edc6b79c1db19c08e2a69fcc944edabce2 SHA256 851d15bb2839fe8eaf755ff78b0f1e1032ddc3d6d445130a1158444af13de406
 DIST suxpanel-0.4b.tar.bz2 86140 RMD160 fa709bafe7c4e92f3b83b0c867910d74efc698c8 SHA1 cb7e7d1e461667db95b777271f66956a77454584 SHA256 e2b3a2af3897595beff61cf563bc5506c5fd4c4ba3e3503b3124505031431060
 EBUILD suxpanel-0.4b-r1.ebuild 949 RMD160 77802fe0a6e2c5654b10ebdec5c1fc3bfda8dc13 SHA1 6e8608147bb64add215af4ac5e3fef23e2e080e3 SHA256 3433131f7da3855754cd1a70c6e843a06ecc76f90d6eb405f458d0d55205a25f
-EBUILD suxpanel-0.4b-r2.ebuild 1004 RMD160 ca627a81b59a051fbf26a6656105c70c5ee0c852 SHA1 ebb467caba88448d962a9a3036f33023f7ec7b5b SHA256 8ec857801b2fb7df6b10ba474c2d7a5effbbe0283b7687cdc51ce81aa40d09e4
-MISC ChangeLog 1846 RMD160 fc1fc76d5ec94070fec6f545c51f62c22cf118c7 SHA1 bfc54bbd147ea1c4b7018e8946d0f29b90df8716 SHA256 aca8cf831c58859f13780d379934304369b0a9936f23b373eb7e86ab56f3f3ca
+EBUILD suxpanel-0.4b-r3.ebuild 1009 RMD160 ec75d39d9f43ab1b2d2ead5b63311e658af717fb SHA1 b844dec3247fa2845761c7122cd2e40623a00922 SHA256 196bbba25e453ddc271a84cb5d57258994b74bddb610f9ae4fc3f4c85e10331a
+MISC ChangeLog 2094 RMD160 b715c6e333649378804032ec2f788790849f008c SHA1 6df0fae99e73e36b11078b8df92e1e2c69b913e3 SHA256 3bb84a71ceed87604e3ea2468150d6c52fc3fc1caf505190d769fb58885139c5
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iJwEAQECAAYFAkx33mkACgkQIiMqcbOVdxQePwP7B7NdTkRVBjs5+nT0tt1aElRl
++dx/Ai6SwncMIjF5O8mVHJumA9NwpAyhJ6pTtKb8kHpbdC0YvQD21U91NhZrry+p
+IncLDzDJELL4AFESxXBS0f6/sTTKLZA1RboUF5CjiGNRuiwgXw7/wHFpKWn+73Kc
+GRxFyr9PLtL86r0896E=
+=nnn9
+-----END PGP SIGNATURE-----
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
 }