Respect LDFLAGS. Bug #337774

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

4 files changed, 46 insertions, 15 deletions

diff --git a/games-rpg/xu4/ChangeLog b/games-rpg/xu4/ChangeLog
index 075ce4745a09..b49b9a5cb590 100644
--- a/games-rpg/xu4/ChangeLog
+++ b/games-rpg/xu4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/xu4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/ChangeLog,v 1.7 2010/09/13 05:14:29 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/ChangeLog,v 1.8 2010/09/30 04:20:39 tupone Exp $
+
+  30 Sep 2010; Tupone Alfredo <tupone@gentoo.org> xu4-0.9.ebuild,
+  +files/xu4-0.9-ldflags.patch:
+  Respect LDFLAGS. Bug #337774 by flameeyes@gentoo.org
 
   13 Sep 2010; Joseph Jezak <josejx@gentoo.org> xu4-0.9.ebuild:
   Marked ppc stable for bug #334201.
diff --git a/games-rpg/xu4/Manifest b/games-rpg/xu4/Manifest
index cf523ad7c578..3f165e41acfa 100644
--- a/games-rpg/xu4/Manifest
+++ b/games-rpg/xu4/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.9-savegame.patch 1861 RMD160 8246605a0dcf36769d6e4c4c0356a38d21f95728 SHA1 7a61912d20c551c2a5327f1e40340cc906dfb15c SHA256 29f2d391e59f91ce79b07efb036476d1f21cdcf150d9286e094dcdc56e1b575d
+AUX xu4-0.9-ldflags.patch 1793 RMD160 721e0254e9106ee992cec194aca33a5c35f28a41 SHA1 9429afbfd37a3a10bba477907c9c5bbbb89793a1 SHA256 28809292afb10f4c959cfb8c0f805c1d9d0ea1cf252fbb34171959aee4e529e8
 DIST u4upgrad.zip 632072 RMD160 863f4626089ad511a1b4dc60f9115c5f8a5b6a70 SHA1 052fb6ef53a689576d7a8148acb3380e859504d2 SHA256 400ac37311f3be74c1b2d7836561b2ead2b146f5162586865b0f4881225cca58
 DIST ultima4-1.01.zip 537487 RMD160 9711d2b1041d7d5577fed09d5271bcdeab9f1fdc SHA1 e8b633cefb107caaf618171652c92684261b54c2 SHA256 ec84ef08e9e38156622300065aa62260276fc8f1c1ff2774f7916e7c10db40dc
 DIST xu4-0.9.tar.gz 320090 RMD160 2129a2bd7e8789ffa901082c248957335b1e5e9d SHA1 6103c3903aeb771da946af5dfac6d83549de6f01 SHA256 26d7a957411e98474d3a06a0bf63a683208d3c35c0cf7afe90db992a934b0bf3
-EBUILD xu4-0.9.ebuild 1805 RMD160 44384a417b18284d61ffde044ec548cc8998286f SHA1 079df14fa689e222ba85c898bada73d7a33e4f59 SHA256 26e9d11ded8c10d94acdf14d57b0741f3185c875df952d82ba92860a46863ab0
-MISC ChangeLog 897 RMD160 1454a4e14893ad016cbb1623621719aeb46a7b94 SHA1 ccc445fb50e7589af9649da4ac49f16cbe738f95 SHA256 5b74e29bef68380e894c99df43161d5dc232b255fba0372f0f388aec4e7be0b8
+EBUILD xu4-0.9.ebuild 1842 RMD160 e37111e58767ddf1b51bafb29289e0f38bc7a4bb SHA1 5f5d648d0c43f995b93515c06803243b91175471 SHA256 ef4c3ee70bc222c1a8f3e3ba48449f6f6552137a57b1363f569e722311e3dd24
+MISC ChangeLog 1051 RMD160 7e7d7e79aad8dd1cbea19374a6e5f1c07ae20e85 SHA1 e687f2b86e4c87b6926d121cc4623db83397a835 SHA256 3e5e51dc980f153e9bafb2d8c4823724f97919dd8e904d5edb1d7c729162d125
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyNsjYACgkQcsIHjyDViGSQiACg4A5vYO7TW1RJxKHnk0kxdkJT
-134AnjndKey1gLUE5EvrGbmGGLNH0A0J
-=AZtP
------END PGP SIGNATURE-----
diff --git a/games-rpg/xu4/files/xu4-0.9-ldflags.patch b/games-rpg/xu4/files/xu4-0.9-ldflags.patch
new file mode 100644
index 000000000000..c41600ad5148
--- /dev/null
+++ b/games-rpg/xu4/files/xu4-0.9-ldflags.patch
@@ -0,0 +1,35 @@
+--- src/Makefile.common.old	2010-09-30 06:12:23.000000000 +0200
++++ src/Makefile.common	2010-09-30 06:15:22.000000000 +0200
+@@ -68,25 +68,25 @@
+ mkutils::  dumpsavegame$(EXEEXT) lzwenc$(EXEEXT) lzwdec$(EXEEXT) rleenc$(EXEEXT) rledec$(EXEEXT) tlkconv$(EXEEXT)
+ 
+ $(MAIN): $(OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ dumpsavegame$(EXEEXT) : util/dumpsavegame.o savegame.o io.o names.o
+-	$(CC) $(CFLAGS) -o dumpsavegame util/dumpsavegame.o savegame.o io.o names.o
++	$(CC) $(LDFLAGS) $(CFLAGS) -o dumpsavegame util/dumpsavegame.o savegame.o io.o names.o
+ 
+ lzwenc$(EXEEXT) : util/lzwenc.o lzw/hash.o util/pngconv.o
+-	$(CC) $(CFLAGS) -o lzwenc util/lzwenc.o lzw/hash.o util/pngconv.o -lpng -lz
++	$(CC) $(LDFLAGS) $(CFLAGS) -o lzwenc util/lzwenc.o lzw/hash.o util/pngconv.o -lpng -lz
+ 
+ lzwdec$(EXEEXT) : util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o
+-	$(CC) $(CFLAGS) -o lzwdec util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o -lpng -lz
++	$(CC) $(LDFLAGS) $(CFLAGS) -o lzwdec util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o -lpng -lz
+ 
+ rleenc$(EXEEXT) : util/rleenc.o util/pngconv.o
+-	$(CC) $(CFLAGS) -o rleenc util/rleenc.o util/pngconv.o -lpng -lz
++	$(CC) $(LDFLAGS) $(CFLAGS) -o rleenc util/rleenc.o util/pngconv.o -lpng -lz
+ 
+ rledec$(EXEEXT) : util/rledec.o rle.o util/pngconv.o
+-	$(CC) $(CFLAGS) -o rledec util/rledec.o rle.o util/pngconv.o -lpng -lz
++	$(CC) $(LDFLAGS) $(CFLAGS) -o rledec util/rledec.o rle.o util/pngconv.o -lpng -lz
+ 
+ tlkconv$(EXEEXT) : util/tlkconv.o
+-	$(CC) $(CFLAGS) -o tlkconv util/tlkconv.o $(shell xml2-config --libs)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o tlkconv util/tlkconv.o $(shell xml2-config --libs)
+ 
+ clean:: cleanutil
+ 	rm -rf *~ */*~ $(OBJS) $(MAIN)
diff --git a/games-rpg/xu4/xu4-0.9.ebuild b/games-rpg/xu4/xu4-0.9.ebuild
index 0c561593f649..2333c0acd2c7 100644
--- a/games-rpg/xu4/xu4-0.9.ebuild
+++ b/games-rpg/xu4/xu4-0.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/games-rpg/xu4/xu4-0.9.ebuild,v 1.10 2010/09/13 05:14:29 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/xu4-0.9.ebuild,v 1.11 2010/09/30 04:20:39 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -38,7 +38,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-savegame.patch"
+	epatch "${FILESDIR}/${PV}-savegame.patch" \
+		"${FILESDIR}"/${P}-ldflags.patch
 	sed -i \
 		-e "s:/usr/local/lib/u4:$(games_get_libdir)/u4:" src/u4file.c \
 		|| die "sed u4file failed"