Respect LDFLAGS. Bug #335518

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

4 files changed, 35 insertions, 12 deletions

diff --git a/games-fps/industri/ChangeLog b/games-fps/industri/ChangeLog
index cf0b2a77c6ac..718478768f23 100644
--- a/games-fps/industri/ChangeLog
+++ b/games-fps/industri/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/industri
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/ChangeLog,v 1.11 2010/03/10 22:35:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/ChangeLog,v 1.12 2010/10/13 09:53:58 tupone Exp $
+
+  13 Oct 2010; Tupone Alfredo <tupone@gentoo.org> industri-1.01.ebuild,
+  +files/industri-1.01-ldflags.patch:
+  Respect LDFLAGS. Bug #335518 by flameeyes@gentoo.org
 
   10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> industri-1.01.ebuild:
   Fix building with libpng14 wrt #308891 by Locke Shinseiko.
diff --git a/games-fps/industri/Manifest b/games-fps/industri/Manifest
index 322cd6c42599..67a73ed7355f 100644
--- a/games-fps/industri/Manifest
+++ b/games-fps/industri/Manifest
@@ -1,7 +1,8 @@
 AUX industri-1.01-exec-stack.patch 642 RMD160 ddb22f84e2daf1f2eee27ad13e30b7175aab2e4f SHA1 3df0fd513eb05e63ac83e897aef0cff51b7dcbb5 SHA256 d04cbf31f16929b27040ea9f4e599db2ea4e14b696708034ae523ff406de011c
+AUX industri-1.01-ldflags.patch 840 RMD160 73640f13612497748fd4b4a976ceec8a00e113df SHA1 6f37906bc383c547fa1d0efcc3523d8585b930ce SHA256 a637626ff4d60619d9dc4751af0ce35dcecbc64c68779efc7e826b76f2a2988c
 AUX industri.pretty 42 RMD160 45b349d4a44a8cdeb4fd2215af11be46b2ce33e3 SHA1 9d44b2cdfe7862993cba4581bad1b4d87b87960c SHA256 127a00f5ce37b1502a09d049d9ad32e468c398ba0a98fbf66142d1408c382ba3
 DIST industri-1.00.zip 30339989 RMD160 a8c3086f0105c4c9f6ad8405fb58297c3a2fba26 SHA1 ba383c48ab043849b5a6908f550ad99356f4d2d2 SHA256 6c0761c6eacb501fffe37f9be4b9e2ae62074f8714c4ef36251241aba6b90652
 DIST industri_BIN-1.01-src.tar.gz 1086838 RMD160 288c35c9864d127ec1ea0c7f4bf90f65480c8ebf SHA1 34b3dfa47c8d838ad9d79432906f8be3ddf1e479 SHA256 b702b819c0b99cc9a7f8e9ec89c9a58812212826f592e3594904b4cd3cdd09f8
-EBUILD industri-1.01.ebuild 2063 RMD160 13dea538d067e116ab80d9b95329f2e62805445d SHA1 fc9bde59435e65602d982aadc8e8f286d091636a SHA256 6fae26f1123bd8cd4066d8aefa9883d22362180bd48f1cd22ab8695b11831f69
-MISC ChangeLog 1424 RMD160 19f0273f645d2f06a02f1ea98a5971b0d500c99e SHA1 ac04aca77331dc2d0ec5755857a4442debb4b420 SHA256 f52104c171f61e2570e8b5b024b7144057f811a357d93adde4e88052e624b1a0
+EBUILD industri-1.01.ebuild 2071 RMD160 0925a5c820b556abc328c61dbc1fbcda8f85789b SHA1 0a2e03c7b20e4c3277ee7fa5145e46ebaf26f6c1 SHA256 300449d2d7b38be17a45433313183c380860e2e2bf84fdc30ccdf43cf713dd2f
+MISC ChangeLog 1587 RMD160 f30e82300d55b4aa7c5287da4b753aafdc11b3d0 SHA1 1b2bab31fa1dcad5a9fa00b5a4e897dccb3213b4 SHA256 e5dc566b7e3ab3733fcc7f4af7582a0b914876a0175bb9c76f5e38e4e794e63e
 MISC metadata.xml 579 RMD160 f45d7504b9b1e9ab4a41fdf5aa396b6d7f71576d SHA1 3d060ebb0e9cd696cdcc8962363e3298c9b3b452 SHA256 2a18b6d76e1fe87370d6113bca5c558e0073866f5fa2ef316d76874b79aafb2a
diff --git a/games-fps/industri/files/industri-1.01-ldflags.patch b/games-fps/industri/files/industri-1.01-ldflags.patch
new file mode 100644
index 000000000000..987d464f6b48
--- /dev/null
+++ b/games-fps/industri/files/industri-1.01-ldflags.patch
@@ -0,0 +1,20 @@
+--- linux/Makefile.old	2010-10-13 11:37:27.000000000 +0200
++++ linux/Makefile	2010-10-13 11:38:20.000000000 +0200
+@@ -42,7 +42,7 @@
+ RELEASE_CFLAGS = $(BASE_CFLAGS) -O2 -march=pentium4 -pipe -msse -mfpmath=sse \
+ 	-fomit-frame-pointer -fexpensive-optimizations
+ DEBUG_CFLAGS  = $(BASE_CFLAGS) -g 
+-LDFLAGS       = -lm -ldl $(X11_LIBS) $(OPENGL_LIBS) $(PNG_LIBS) $(OPENAL_LIBS) 
++LDLIBS        = -lm -ldl $(X11_LIBS) $(OPENGL_LIBS) $(PNG_LIBS) $(OPENAL_LIBS) 
+ 
+ DO_GL_CC      = $(CC) $(CFLAGS) -o $@ -c $<
+ DO_GL_AS      = $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
+@@ -156,7 +156,7 @@
+ 
+ 
+ $(BUILDDIR)/bin/industri.run : $(GLQUAKE_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(LDLIBS)
+ 
+ $(BUILDDIR)/glquake/cl_demo.o :      $(MOUNT_DIR)/cl_demo.c
+ 	$(DO_GL_CC)
diff --git a/games-fps/industri/industri-1.01.ebuild b/games-fps/industri/industri-1.01.ebuild
index cf8d665b0b13..9ed669e3c83f 100644
--- a/games-fps/industri/industri-1.01.ebuild
+++ b/games-fps/industri/industri-1.01.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/industri-1.01.ebuild,v 1.16 2010/03/10 22:35:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/industri-1.01.ebuild,v 1.17 2010/10/13 09:53:58 tupone Exp $
+EAPI="2"
 
 inherit eutils toolchain-funcs games
 
@@ -30,15 +31,11 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/industri_BIN
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"/linux
-	mv Makefile.i386linux Makefile
-	sed -i -e "s:-mpentiumpro.*:${CFLAGS} \\\\:" Makefile || die "sed failed"
+src_prepare() {
+	mv linux/Makefile{.i386linux,}
+	sed -i -e "s:-mpentiumpro.*:${CFLAGS} \\\\:" linux/Makefile || die "sed failed"
 
 	# Remove duplicated typedefs #71841
-	cd "${S}"
 	for typ in PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC PFNGLVERTEXARRAYRANGEAPPLEPROC ; do
 		if echo '#include <GL/gl.h>' | $(tc-getCC) -E - 2>/dev/null | grep -sq ${typ} ; then
 			sed -i \
@@ -52,7 +49,8 @@ src_unpack() {
 		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \
 		gl_warp.c || die
 
-	epatch "${FILESDIR}"/${P}-exec-stack.patch
+	epatch "${FILESDIR}"/${P}-exec-stack.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
 }
 
 src_compile() {