Respect LDFLAGS. Bug #336261

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

4 files changed, 33 insertions, 15 deletions

diff --git a/games-fps/tremulous/ChangeLog b/games-fps/tremulous/ChangeLog
index e8ce08f1e213..6e31af3e7a5c 100644
--- a/games-fps/tremulous/ChangeLog
+++ b/games-fps/tremulous/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/tremulous
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.17 2010/05/23 20:08:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/ChangeLog,v 1.18 2010/09/09 09:44:15 tupone Exp $
+
+  09 Sep 2010; Tupone Alfredo <tupone@gentoo.org> tremulous-1.1.0-r4.ebuild,
+  +files/tremulous-1.1.0-ldflags.patch:
+  Respect LDFLAGS. Bug #336261 by flameeyes@gentoo.org
 
   23 May 2010; Pacho Ramos <pacho@gentoo.org> tremulous-1.1.0-r4.ebuild:
   stable amd64, bug 313021
diff --git a/games-fps/tremulous/Manifest b/games-fps/tremulous/Manifest
index c5d29fa02b64..cba8b31e6c18 100644
--- a/games-fps/tremulous/Manifest
+++ b/games-fps/tremulous/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX tremulous-1.1.0-ldflags.patch 702 RMD160 a3d29de1348d9568a0bf6a828fff6aee7a1bdf90 SHA1 d11402b2096e352337528113003bd844b4ef32b6 SHA256 157f368a5bef6e4ea800ac5664d81a8c6e4b2846f6ba1a57649b7794dea7052a
 AUX tremulous-1.1.0-system_jpeg-2.patch 5161 RMD160 98948577b9fa5b44cdfe187bd00aca3a3ca344cc SHA1 fe22bb6ce24da27a71b343bb6ac37d3d806f7a12 SHA256 077f70aaf03c581991ff682be7dab9ab80cabc925df75582273e34f15fcbc6b1
 AUX tremulous-1.1.0-system_jpeg.patch 5913 RMD160 66e452a6a9f4c4b59d897739d21d6d76e15bfcdf SHA1 a9df8970098fe80d1400d6d8843a57c47069496a SHA256 57ffe4237e18aa97c16eb603f11b5907533a584985fb84a24116a5cbe2522515
 DIST tremulous-1.1.0.zip 105821907 RMD160 36d25fee8ee6b348b1045ab027ab6733aef77a1d SHA1 39d820cc50eda1eff58917158bb0ec68b62f633c SHA256 c7bb66f55abc88932edee16c253e5d37f90dded2ce29cf6cb15ad4f78e378987
 DIST tremulous-gentoopatches-1.1.0-r5.zip 372877 RMD160 08d07feaa9b8df910a880beb8574ff1aed5a97cc SHA1 ce2bfa1535f1774c92aa3fdf738d3054f7bb5b65 SHA256 c03f22b49b65d8f7acae18981f3c87eac0f17a44c3916282eaa10afe232ca12b
 DIST vms-1.1.t971.pk3 495308 RMD160 fc970c73cb4401ab1f9524cfc090af1ac0976560 SHA1 ea11d498a92abeaa5fc5bd5567771dca3a7ea55e SHA256 bb2f57e5c2dd725e095f0e92a9dfe5fb99f8ba84344618087828d0f5dced797e
 EBUILD tremulous-1.1.0-r3.ebuild 2881 RMD160 f104e538b65569099da9d9f8553bf438650e4f20 SHA1 853068f0e0faabd484df0aa57a5cbe2e91b0f1fc SHA256 55899fac30e8806c2c8e0ac487ce905f9a38d1a4edef375583d7034b066f1962
-EBUILD tremulous-1.1.0-r4.ebuild 2988 RMD160 25662044b7a4440e16ec4b6c0920066fce94faca SHA1 06bd2b0b168ebeb69d89665d3e8e7500343424b6 SHA256 abf42226fd961326937885c49677634d074a869122324a66663d6721960ba5fc
-MISC ChangeLog 2714 RMD160 82ad4b2115ba088315051e330a8f09656f0c7555 SHA1 ad3f19db758a62cc7da11a7eca67121a3670019c SHA256 8000a768a2665bc2f3249fd336bbd0a311e94b8327406a1439b2259ea9651705
+EBUILD tremulous-1.1.0-r4.ebuild 3026 RMD160 8b91a4ae93fc1116976d7fefcfb4f6c6ee88677a SHA1 6601098391ea7a0a9f2c51a137095fdd27d778e4 SHA256 b811bba0835c0fb166e29b4fca96ab0012031e9845d1aa0b737eff52d37e5ecb
+MISC ChangeLog 2888 RMD160 79c3653e8a447442e4e6c5569e4fc45df9d30e1b SHA1 8ec4a6cb34e20fa2cbf91e50b9f2d6c4e3e4791b SHA256 f3f5900bb2445a055535b173d656d20a94678e0b9af3134ddf055089400c5e2d
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkv5i1MACgkQCaWpQKGI+9TNbQCfe1Z2j+11d0SXtDViIrKGJs/v
-3GMAmgLkIToTkWtKc6wXPLKyzu0s5dgi
-=L+RT
------END PGP SIGNATURE-----
diff --git a/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch b/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch
new file mode 100644
index 000000000000..9d7e57e5db3d
--- /dev/null
+++ b/games-fps/tremulous/files/tremulous-1.1.0-ldflags.patch
@@ -0,0 +1,22 @@
+--- Makefile.old	2010-09-09 11:30:26.000000000 +0200
++++ Makefile	2010-09-09 11:33:41.000000000 +0200
+@@ -253,7 +253,7 @@
+   SHLIBLDFLAGS=-shared $(LDFLAGS)
+ 
+   THREAD_LDFLAGS=-lpthread
+-  LDFLAGS=-ldl -lm
++  LDLIBS=-ldl -lm
+ 
+   ifeq ($(USE_SDL),1)
+     CLIENT_LDFLAGS=$(shell sdl-config --libs)
+@@ -1074,8 +1074,8 @@
+ 
+ $(B)/tremulous-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
+ 	@echo "LD $@"
+-	@$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
+-		$(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
++	@$(CC) -o $@ ${LDFLAGS} $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
++		$(THREAD_LDFLAGS) $(LDLIBS) $(LIBSDLMAIN)
+ 
+ ifneq ($(strip $(LIBSDLMAIN)),)
+ ifneq ($(strip $(LIBSDLMAINSRC)),)
diff --git a/games-fps/tremulous/tremulous-1.1.0-r4.ebuild b/games-fps/tremulous/tremulous-1.1.0-r4.ebuild
index 04e0cc71402d..2201898d7d2f 100644
--- a/games-fps/tremulous/tremulous-1.1.0-r4.ebuild
+++ b/games-fps/tremulous/tremulous-1.1.0-r4.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/games-fps/tremulous/tremulous-1.1.0-r4.ebuild,v 1.3 2010/05/23 20:08:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tremulous/tremulous-1.1.0-r4.ebuild,v 1.4 2010/09/09 09:44:15 tupone Exp $
 
 EAPI=2
 
@@ -47,7 +47,8 @@ src_prepare() {
 	epatch "${WORKDIR}"/${PN}-svn755-upto-971.patch
 	epatch "${WORKDIR}"/${PN}-t971-client.patch
 	epatch "${FILESDIR}"/${P}-system_jpeg.patch \
-		"${FILESDIR}"/${P}-system_jpeg-2.patch
+		"${FILESDIR}"/${P}-system_jpeg-2.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
 	# fix the gcc-4.3.3 Werror issue
 	# This is probably issue for all icculus q3 based games
 	sed -i -e '16s/-Werror //' src/tools/asm/Makefile || die