Respect LDFLAGS. Bug #336000

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

4 files changed, 77 insertions, 5 deletions

diff --git a/games-fps/duke3d/ChangeLog b/games-fps/duke3d/ChangeLog
index 9e838732deab..e7e98bd2dc30 100644
--- a/games-fps/duke3d/ChangeLog
+++ b/games-fps/duke3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/duke3d
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.35 2010/01/25 23:38:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.36 2010/10/08 12:55:49 tupone Exp $
+
+  08 Oct 2010; Tupone Alfredo <tupone@gentoo.org> duke3d-20040817-r2.ebuild,
+  +files/duke3d-20040817-ldflags.patch:
+  Respect LDFLAGS. Bug #336000 by flameeyes@gentoo.org
 
   25 Jan 2010; Jeroen Roovers <jer@gentoo.org> duke3d-20040817-r2.ebuild:
   Stable for HPPA (bug #286423).
diff --git a/games-fps/duke3d/Manifest b/games-fps/duke3d/Manifest
index 6a2c36a21f18..efa49adfa10d 100644
--- a/games-fps/duke3d/Manifest
+++ b/games-fps/duke3d/Manifest
@@ -5,11 +5,12 @@ AUX 20040817-gcc34.patch 1886 RMD160 971968bf75c8151269ee3ca6a326ca780e2470ad SH
 AUX 20040817-gcc4.patch 2169 RMD160 641c45992c2c26447543b9c2175673e9588b71ef SHA1 b892403cb36694e8d6de939194f629a33a8ff79a SHA256 aef2b2b12a04a69ed075df55aae1f8a40d9c4fb9c5abd62f66119da3357c540a
 AUX duke3d-20040817-as-needed.patch 2774 RMD160 b7fe077a233738274782757835bf9b00889ee443 SHA1 03066764748d63d8b791154e86d9d712af3cf1d4 SHA256 b9e9e5040c845974a633987d8248bde62d9c04579d0b3e8e6eab18b8027b6701
 AUX duke3d-20040817-gcc4.patch 10474 RMD160 a83132ef666d8a78da848ccbb40f16e1250750f6 SHA1 79f26bf9ff0718cca1f9428b93a8808027e214b3 SHA256 010ceb7ff130da74d0f6349a9d12ddc206940d8545499cccb319220ba7d9d585
+AUX duke3d-20040817-ldflags.patch 2132 RMD160 1a5ba1669c40889a701cd80c94426ada56246699 SHA1 a058f16c3df876be0428133729b23f34b94edacb SHA256 4044e2877f5b5c81c41cd8e868c5a9e3895f3e32ee2e03b55a2c2b1c3ca69555
 AUX duke3d-20040817-noinline.patch 545 RMD160 976f22ebca57d6392b140915244b01d29559a8cf SHA1 9720bdf7e070ca8baa3bb0d595221a9598f1229e SHA256 9d0783517eefc0a1d28189260e91af8318ab1d0395f336ab5f5c72e86504e0fa
 AUX duke3d.cfg 4314 RMD160 8ba6360d6bc24ae353a8c3ad0b973c47d379ea21 SHA1 a6ac127c82aa845ce2afa3657088bd0084335ed8 SHA256 0ad9477e6185f0d812d726943beacdc7f7581f66c86640f44ee8e5621fe40556
 AUX network.cfg 398 RMD160 4452e8b8a99f0e08b192f2418ff8324c4bce8a7e SHA1 e9e81a204fd5b470dbd48130cde8e7270ec64eed SHA256 fe5806712207d39812906034b76191effc96d7c6efa9c8bd9081e18fab76d7b5
 DIST 3dduke13.zip 5924374 RMD160 b2788f0ef7e8e88bcd1c4e56d22cd741109ea59a SHA1 72b832734d72c829cecaffd8d8ae0eb38995aeb3 SHA256 c67efd179022bc6d9bde54f404c707cbcbdc15423c20be72e277bc2bdddf3d0e
 DIST duke3d-20040817.tar.bz2 1509273 RMD160 d6d4896c6357e21543d68e322f18e8c0c00224d4 SHA1 795b4616c6840023d2f790de3aff2342ef40fa25 SHA256 c0dd72030f9c5b84aea3e4989831311c94ef21641d6a1fdb0f557d04076f641f
-EBUILD duke3d-20040817-r2.ebuild 3422 RMD160 3e3a1ae70425e3d282ddddd9504bed9922bbd29e SHA1 7bb62fbe521fa824aa7b3e1f96b573c7e3f4e773 SHA256 121ce2e44434024c2dd6b2a9ecab1009c8a95b5cc8bc611ca2d1ad25b962739e
-MISC ChangeLog 5400 RMD160 89b7d33bea3aef0ba0887acd267044f09bdeaa01 SHA1 2d7d0ead7b96b043f0cd8be253cec7de8a202981 SHA256 eefee78f77205c71eae5b085c55e3f6137633d713e65e384712a4627c8132cca
+EBUILD duke3d-20040817-r2.ebuild 3462 RMD160 6a33995e7086c5573a57d79ecbe7e2b7f6ce07d6 SHA1 1289b4d489c1f84f0a39eeae9312d795414ee4d4 SHA256 fb9ec6cc17a5c7d53406d3bf166c8a7fb95bcf4e6f3c3d407266091748e33a41
+MISC ChangeLog 5576 RMD160 7959191523aa08ade7aae0b7244b0c5801ddd0d3 SHA1 16aeef26f340ff57ceaab060daafedd616e8d6a1 SHA256 86a4fa0c859aa7aa8165df3790183bd43f6a3203153154aba1817e3a6666191f
 MISC metadata.xml 2752 RMD160 2df49f93014e1986a8c0875b964576c9e4d9d759 SHA1 8dcc3a18482b31a9ff7d811f5f57809129d2d640 SHA256 5a6d0e402c900b36b4f50a77425c0bb5b078ed3bf8dd1f140551def87dcf2f77
diff --git a/games-fps/duke3d/duke3d-20040817-r2.ebuild b/games-fps/duke3d/duke3d-20040817-r2.ebuild
index 922fe3207528..998b411dd2a7 100644
--- a/games-fps/duke3d/duke3d-20040817-r2.ebuild
+++ b/games-fps/duke3d/duke3d-20040817-r2.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/duke3d/duke3d-20040817-r2.ebuild,v 1.10 2010/01/25 23:38:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817-r2.ebuild,v 1.11 2010/10/08 12:55:49 tupone Exp $
 
 EAPI=2
 fromcvs=0
@@ -79,7 +79,8 @@ src_prepare() {
 		"${FILESDIR}/${PV}-gcc34.patch" \
 		"${FILESDIR}"/${P}-gcc4.patch \
 		"${FILESDIR}"/${P}-noinline.patch \
-		"${FILESDIR}"/${P}-as-needed.patch
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
 	sed -i \
 		-e "/^use_opengl := / s:=.*:= $(use_tf opengl):" \
 		-e "/^use_physfs := / s:=.*:= false:" \
diff --git a/games-fps/duke3d/files/duke3d-20040817-ldflags.patch b/games-fps/duke3d/files/duke3d-20040817-ldflags.patch
new file mode 100644
index 000000000000..79179e663805
--- /dev/null
+++ b/games-fps/duke3d/files/duke3d-20040817-ldflags.patch
@@ -0,0 +1,66 @@
+--- source/buildengine/Makefile.old	2010-10-08 14:32:05.000000000 +0200
++++ source/buildengine/Makefile	2010-10-08 14:35:10.000000000 +0200
+@@ -73,7 +73,7 @@
+ endif
+ 
+ ifeq ($(strip $(solaris)),true)
+-  LDFLAGS += -lsocket -lnsl
++  LIBS += -lsocket -lnsl
+   CFLAGS += -DPLATFORM_SOLARIS
+ endif
+ 
+@@ -129,7 +129,7 @@
+ 
+ ifeq ($(strip $(macosx)),true)
+   CFLAGS += -DPLATFORM_MACOSX=1 -faltivec -falign-loops=32 -falign-functions=32
+-  LDFLAGS += -framework AppKit -lSDL -lSDLmain
++  LIBS += -framework AppKit -lSDL -lSDLmain
+ endif
+ 
+ ifeq ($(strip $(useopengl)),true)
+@@ -146,7 +146,7 @@
+ 
+ ifeq ($(strip $(usephysfs)),true)
+   CFLAGS += -DUSE_PHYSICSFS
+-  LDFLAGS += -lphysfs
++  LIBS += -lphysfs
+ endif
+ 
+ ifeq ($(strip $(usedlls)),true)
+@@ -236,17 +236,17 @@
+ 
+ ifeq ($(strip $(usedlls)),true)
+ $(ENGINEDLL) : $(ENGINEOBJS)
+-	$(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS) $(LDLIBS)
++	$(LINKER) -shared -o $(ENGINEDLL) $(LIBS) $(ENGINEOBJS) $(LDLIBS)
+ 
+ $(NETDLL) : $(NETOBJS)
+-	$(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS) $(LDLIBS)
++	$(LINKER) -shared -o $(NETDLL) $(LIBS) $(NETOBJS) $(LDLIBS)
+ endif
+ 
+ $(GAMEEXE) : $(ENGINEDLL) $(NETDLL) $(GAMEOBJS) $(PERLOBJS)
+-	$(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(PERLOBJS) $(GAMEOBJS) $(LDPERL) $(LDLIBS) $(ENGINEDLL) $(NETDLL)
++	$(LINKER) $(LDFLAGS) -o $(GAMEEXE) $(LIBS) $(PERLOBJS) $(GAMEOBJS) $(LDPERL) $(LDLIBS) $(ENGINEDLL) $(NETDLL)
+ 
+ $(BUILDEXE) : $(ENGINEDLL) $(BUILDOBJS)
+-	$(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(LDLIBS) $(ENGINEDLL)
++	$(LINKER) $(LDFLAGS) -o $(BUILDEXE) $(LIBS) $(BUILDOBJS) $(LDLIBS) $(ENGINEDLL)
+ 
+ listclean:
+ 	@echo "A 'make clean' would remove" $(CLEANUP)
+--- source/Makefile.old	2010-10-08 14:35:54.000000000 +0200
++++ source/Makefile	2010-10-08 14:37:34.000000000 +0200
+@@ -152,10 +152,10 @@
+ 	sounds.o \
+ 	dukemusc.o \
+ 	audiolib/audiolib.a
+-	$(CC) $^ $(BUILDOBJS) $(LDLIBS) -o $@
++	$(CC) $(LDFLAGS) $^ $(BUILDOBJS) $(LDLIBS) -o $@
+ 
+ build: astub.o
+-	$(CC) $^ $(BUILDOBJS) buildengine/build.o $(LDLIBS) -o $@
++	$(CC) $(LDFLAGS) $^ $(BUILDOBJS) buildengine/build.o $(LDLIBS) -o $@
+ 
+ clean:
+ 	$(MAKE) -C audiolib clean