Respect LDFLAGS wrt bug 325309

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

4 files changed, 60 insertions, 5 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 76e09825af56..744c51ab562f 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.95 2010/07/04 09:14:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.96 2010/08/08 18:58:15 xarthisius Exp $
+
+  08 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  afterstep-2.2.9.ebuild, +files/afterstep-2.2.9-ldflags.patch:
+  Respect LDFLAGS wrt bug 325309
 
   04 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   afterstep-2.2.9.ebuild:
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 9c87ff4cf6ca..51dcedfba658 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,8 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX afterstep 29 RMD160 a1fafb8971d47c7cebfe972bb74bbef19de4ac52 SHA1 7ce7a198aef7adb7484981fed4b84798311f5409 SHA256 c6e31f7e4912188f1ce7c41298cb66178944960628e1451efd42331236cbc3c5
 AUX afterstep-2.2.9-alpha.patch 475 RMD160 8945b4685e011e49a0c81c835cbe37bf275046c7 SHA1 d80c3791133c101fa4a914cd442d7b1afe9815e2 SHA256 3208d1126ba14fc8c39c537cea701b2c89bcf9f778645add0e3465ce74139cd6
+AUX afterstep-2.2.9-ldflags.patch 1374 RMD160 e0a947fe48de238eb0a8ebdbfa365254dc550c21 SHA1 d037e2736cc18849a6a52e72f2e399bcdb403aed SHA256 80d9ff3b0106ff9315eb2f4406d29c6f95a10818f7821866e39a405c1cc3b562
 AUX afterstep-2.2.9-make_session_data_file.patch 422 RMD160 b4e694ac6514d34dfbee5f6fe15ffa109e5bfbad SHA1 932abcf0c2fb469e45e95035244d97df40c8dfe1 SHA256 3fa0e494903d374db0da66de432e407889356cd50d1072aa4078516f5d31b5a3
 AUX no-alternatives-2.2.9.patch 1214 RMD160 c6a02643da9c82c5228800a399ffd6ce89c0b542 SHA1 140e5d5d011df340ece7f36a88c7f49540786a89 SHA256 f7a87859d043b210dd309128c9338e938f695cf248d2987ae2b8535243405e4f
 DIST AfterStep-2.2.9.tar.bz2 6094706 RMD160 b332078efa50abde522438c825fca91f31c4d554 SHA1 dfd7dd912866316e93c3be7a8460d34b95cd54a2 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148
-EBUILD afterstep-2.2.9.ebuild 3658 RMD160 3da5388ab3ff39cddabed287fa4869d829917bda SHA1 50de99c66c83b29747033c95e3f2747d55d27dac SHA256 35f9d2ef0b94e4883a19b1208106198a3301f303efdb56c664fa72bd2d92bb0b
-MISC ChangeLog 13663 RMD160 a35ca65e7806d0f87c26c200fafffb8bd3c7184a SHA1 22ed0ff8e3721934b1f20fb995938c412e2cd503 SHA256 62da4de0c95e7a8589556fad5bf19701effd5afb428e54cd41d75f46f306046a
+EBUILD afterstep-2.2.9.ebuild 3696 RMD160 d678dbdc0783f65a387ce6ee8352941f1c65b25c SHA1 bf0dad32ba089d4170efa38d3ea0dc02dd109236 SHA256 b2be095e758f3be72c402b33d1cbe0029b2e3ae10cb36c0433f4bf2adcde0de4
+MISC ChangeLog 13816 RMD160 be9635021934f1ae061a50345b4e00e63e2c9eff SHA1 22230906f663b15cbf9dccba000d283e5e26eeb1 SHA256 6ef46d8e748289931422c196f07cd7c40becb536a37aad314c25a77062d55868
 MISC metadata.xml 350 RMD160 8a78f43601183735a3e88e99953e83fa319a2c9c SHA1 a0887e36150abf9d32d108bd1339880ca2a21449 SHA256 ffc449f67b60b79df064e7843b19ce9c16ab0ccc495de3b9cd9b1a38bf6b0c26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkxe/lIACgkQIiMqcbOVdxTfBQP/ZkUIXvjlNPFisqEnQ7qz5+qX
+gRPG90iMOl9zikkvnDRqyEc76Bfb5XeXoMnaUgcBJVzEf8Zemcpw0qm4MFg0ct5K
+MjRHQuPFyPiysJjPc84vT0aY/LLquVgIL9U3e+AsQiid1rj04jJ/ayJqMrleNcQI
+b5xX0Ewce1c1dJ7Vqgs=
+=VNhW
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild
index 5afeee8ec86d..19db9554e220 100644
--- a/x11-wm/afterstep/afterstep-2.2.9.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.9.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-wm/afterstep/afterstep-2.2.9.ebuild,v 1.14 2010/07/04 09:14:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.15 2010/08/08 18:58:15 xarthisius Exp $
 
 EAPI=2
 inherit autotools flag-o-matic eutils
@@ -45,7 +45,8 @@ S=${WORKDIR}/AfterStep-${PV}
 src_prepare() {
 	epatch "${FILESDIR}"/no-alternatives-${PV}.patch \
 		"${FILESDIR}"/${P}-make_session_data_file.patch \
-		"${FILESDIR}"/${P}-alpha.patch
+		"${FILESDIR}"/${P}-alpha.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
 
 	sed -i \
 		-e '/CFLAGS="-O3"/d' \
diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch b/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch
new file mode 100644
index 000000000000..5d27d7d8293f
--- /dev/null
+++ b/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch
@@ -0,0 +1,37 @@
+Respect LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=325309
+
+--- autoconf/Makefile.common.lib.in
++++ autoconf/Makefile.common.lib.in
+@@ -245,7 +245,7 @@
+ 	$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
+ 
+ $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
+-	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
++	$(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
+ 	 $(LIB_OBJS)
+ 
+ install:	install.lib install.bin
+--- libAfterImage/Makefile.in
++++ libAfterImage/Makefile.in
+@@ -395,7 +395,7 @@
+ 	$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
+ 
+ $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h
+-	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
++	$(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
+ 	 $(LIB_OBJS)
+ 
+ install.man:
+--- libAfterBase/Makefile.in
++++ libAfterBase/Makefile.in
+@@ -325,7 +325,7 @@
+ 	$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
+ 
+ $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
+-	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
++	$(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
+ 	 $(USER_LD_FLAGS) $(LIBS_X) $(LIB_OBJS)
+ 
+ install:	install.lib