Respect LDFLAGS. Bug #336967

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

4 files changed, 83 insertions, 24 deletions

diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog
index 235a851df5b6..55c6f30868a9 100644
--- a/games-fps/quake2-icculus/ChangeLog
+++ b/games-fps/quake2-icculus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake2-icculus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.40 2010/02/22 12:57:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.41 2010/09/15 10:56:43 tupone Exp $
+
+  15 Sep 2010; Tupone Alfredo <tupone@gentoo.org>
+  quake2-icculus-0.16.1-r1.ebuild,
+  +files/quake2-icculus-0.16.1-ldflags.patch:
+  Respect LDFLAGS. Bug #336967 by flameeyes@gentoo.org
 
   22 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   quake2-icculus-0.16.1-r1.ebuild:
diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 096a8ed1b3ae..9d906ed75fe4 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -4,12 +4,13 @@ AUX README-postinstall 3083 RMD160 fc8094e39bf5ed779fdd4c5e2b911422e69d03da SHA1
 AUX quake2-icculus-0.16.1-amd64.patch 534 RMD160 ad9193d1977ac2c0036e30022b198e5ff8b850dd SHA1 16776e9c7edf09e190393dd5c6646db1c4680bd1 SHA256 e95aeace865f089b6c1c9e0c362da407d1bd603147fb6886b9c13b37218c3a37
 AUX quake2-icculus-0.16.1-gcc41.patch 364 RMD160 b85910d79a8e7e2cc71da21f5f22e331b94c0719 SHA1 3c80e62267223fbf83aa2f7ce73fcf6eba0297c9 SHA256 1010f97c15f202de682f56ac372cc342299f1e6c20e9072d8fa346a1469adf72
 AUX quake2-icculus-0.16.1-gentoo-paths.patch 7688 RMD160 db521205c1d787fb31262d1710a57b7da50194a9 SHA1 dcf87cd07cade4b31251a63834819c131cfb81c2 SHA256 22d47f76fe1f06028088d2b7d9b1bc0bf1c91c559149859373af29f467ed2ea9
+AUX quake2-icculus-0.16.1-ldflags.patch 1609 RMD160 3ac08c24bb2f32c3067f2a1e10b9ddb16b896ea2 SHA1 f634ef0807934341562041778a7281e2616e09fd SHA256 b161ab85ab2fd8a4bf5b20e8ac9a80429f735eb1bae611b79b92677f04eacc42
 AUX quake2-icculus-0.16.1-no-asm-io.patch 513 RMD160 0ae685e8f5d02511013b6f5b9106e11c024cc2a9 SHA1 53651b2175b9e547e8f01215bf9e6f94f3cee539 SHA256 05a648b32ce0c260046706ee2f4c6f49a0e7049ed07cd02fd895f6fd83556012
 AUX quake2.xpm 1234 RMD160 4afa56af8446c288b5779cf7e2c0b8dfe98e9bba SHA1 7adcc4c3242ea6468c259d181e9cd251ce1fd570 SHA256 0a5232384c56ccead145345a30e4ed7004bf36fe7656d43c46f1bed34d8fc2a9
 DIST maxpak.pak 3282742 RMD160 6b5223fee63dbb2c886e3c1e39d9e157d65f589f SHA1 ecafe118f20b96c7ba74842839702fde6965d640 SHA256 653569fe880f1ed5f7529483ac961b22078482e6ff0e83f4d9d1bc503c866770
 DIST quake2-r0.16.1.tar.gz 1525384 RMD160 dbbf9cad08ab381e0c2cd037e317104085455c23 SHA1 9226acadc896ddc9924c6b7f9b71857078af5dba SHA256 49f4d3d53772b6ffd7733506f5d121c7893bfd8884133bfc36a28039c0744642
 DIST roguesrc320.shar.Z 626769 RMD160 767c5b1a7a1123370e9c924282656dfdcc6cebba SHA1 7c5cadde75f5353622552cd28501ce60ac83dca2 SHA256 ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919
 DIST xatrixsrc320.shar.Z 455917 RMD160 357182dcd760a95b27942cdf807ba1242bcb1160 SHA1 ec67b6d2be623dd344c100869fc48bcbadea927a SHA256 94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589
-EBUILD quake2-icculus-0.16.1-r1.ebuild 5441 RMD160 184ed7e5c19a17c7085170f278cd5d6b251dd309 SHA1 62c249cbfe622033a45de681e84935fa59f2304a SHA256 9bdc480717fe28d05177e072942f46a043dcf6427c998679dd3848b2bf67b890
-MISC ChangeLog 7219 RMD160 d672701a4098fbfa4aec24f314a053f27efd0f27 SHA1 ec2c075758e13341d22be39ec4d128d314f2c53a SHA256 1d74d14a64ee0a68447a445812a4855c49ad435888bb0e334b7eba60f7c76d57
+EBUILD quake2-icculus-0.16.1-r1.ebuild 5407 RMD160 1a8243422cc247c1e8b216f754bfd3e82a61a8fe SHA1 e4dbfb42257869afbffc5198ab47ee7b53cedb71 SHA256 8eef30e359c82279220e422383c1c3f83607ba7d98ae146a1eaed6f9a9e89cee
+MISC ChangeLog 7403 RMD160 214f92f95f0ff2fa894daef5d1b3c108bc24e2a6 SHA1 ce82a1381c8c416ade1b0dc9ba8c7b4557564cd6 SHA256 3b045fc65437734da93ec0b28e5e76d08b234e6a0d185c9bac24ec7c3159790f
 MISC metadata.xml 513 RMD160 1dc52f937a6d3f1e62131171345cd429c4f080cf SHA1 01cfd49cdfd38befba81acae82c76c52edc38b31 SHA256 0608a118c068c5cb15473fc3ee2c6338b6a6330ee2063d1d2b6864c57a761e2c
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
new file mode 100644
index 000000000000..ec37b8be0fe8
--- /dev/null
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
@@ -0,0 +1,56 @@
+--- Makefile.old	2010-09-15 09:31:41.000000000 +0200
++++ Makefile	2010-09-15 10:13:01.000000000 +0200
+@@ -169,18 +169,18 @@
+ DEBUG_CFLAGS=$(BASE_CFLAGS) -g
+ 
+ ifeq ($(OSTYPE),FreeBSD)
+-LDFLAGS=-lm
++LDLIBS=-lm
+ endif
+ ifeq ($(OSTYPE),Linux)
+-LDFLAGS=-lm -ldl
++LDLIBS=-lm -ldl
+ endif
+ 
+ ifeq ($(strip $(BUILD_ARTS)),YES)
+-LDFLAGS+=$(shell artsc-config --libs)
++LDLIBS+=$(shell artsc-config --libs)
+ endif
+ 
+ ifeq ($(strip $(BUILD_ALSA)),YES)
+-LDFLAGS+=-lasound
++LDLIBS+=-lasound
+ endif
+ 
+ 
+@@ -226,7 +226,7 @@
+ SHLIBEXT=so
+ 
+ SHLIBCFLAGS=-fPIC
+-SHLIBLDFLAGS=-shared
++SHLIBLDFLAGS=$(LDFLAGS) -shared
+ 
+ DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
+ DO_DED_CC=$(CC) $(CFLAGS) -DDEDICATED_ONLY -o $@ -c $<
+@@ -518,10 +518,10 @@
+ endif
+ 
+ $(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_LNX_OBJS) $(QUAKE2_AS_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_LNX_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_LNX_OBJS) $(QUAKE2_AS_OBJS) $(LDLIBS)
+ 
+ $(BUILDDIR)/sdlquake2 : $(QUAKE2_OBJS) $(QUAKE2_SDL_OBJS) $(QUAKE2_AS_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_SDL_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS) $(SDLLDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_SDL_OBJS) $(QUAKE2_AS_OBJS) $(LDLIBS) $(SDLLDFLAGS)
+ 
+ $(BUILDDIR)/client/cl_cin.o :     $(CLIENT_DIR)/cl_cin.c
+ 	$(DO_CC)
+@@ -710,7 +710,7 @@
+        $(BUILDDIR)/ded/cd_null.o
+ 
+ $(BUILDDIR)/q2ded : $(Q2DED_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(Q2DED_OBJS) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q2DED_OBJS) $(LDLIBS)
+ 
+ $(BUILDDIR)/ded/cmd.o :        $(COMMON_DIR)/cmd.c
+ 	$(DO_DED_CC)
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index a7f8b978c28a..3144a9619d74 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.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/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.21 2010/02/22 12:57:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.22 2010/09/15 10:56:43 tupone Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs games
@@ -53,10 +53,21 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd "${S}"
-
+src_prepare() {
+	# Now we deal with the silly rogue / xatrix addons ... this is ugly :/
+	ln -s $(type -P echo) "${T}"/more
+	for g in rogue xatrix ; do
+		use ${g} || continue
+		mkdir -p src/${g}
+		pushd src/${g}
+		local shar=../../../${g}src320.shar
+		sed -i \
+			-e 's:^read ans:ans=yes :' ${shar} \
+			|| die "sed ${shar} failed"
+		echo ">>> Unpacking ${shar} to ${PWD}"
+		env PATH="${T}:${PATH}" unshar ${shar} || die "unpacking ${shar} failed"
+		popd
+	done
 	sed -i \
 		-e 's:jpeg_mem_src:_&:' \
 		src/ref_candygl/gl_image.c || die
@@ -66,28 +77,14 @@ src_unpack() {
 	epatch \
 		"${FILESDIR}"/${P}-amd64.patch \
 		"${FILESDIR}"/${P}-gentoo-paths.patch \
+		"${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-no-asm-io.patch #193107
 
-	# Now we deal with the silly rogue / xatrix addons ... this is ugly :/
-	ln -s $(type -P echo) "${T}"/more
-	for g in rogue xatrix ; do
-		use ${g} || continue
-		mkdir -p "${S}"/src/${g}
-		cd "${S}"/src/${g}
-		local shar=${g}src320.shar
-		unpack ${shar}.Z
-		sed -i \
-			-e 's:^read ans:ans=yes :' ${shar} \
-			|| die "sed ${shar} failed"
-		echo ">>> Unpacking ${shar} to ${PWD}"
-		env PATH="${T}:${PATH}" unshar ${shar} || die "unpacking ${shar} failed"
-		rm ${shar}
-	done
 	if use xatrix ; then
 		epatch "${FILESDIR}/${P}"-gcc41.patch
 	fi
 	if use rogue ; then
-		cd "${S}"/src
+		cd src
 		epatch \
 			"${FILESDIR}"/0.16-rogue-nan.patch \
 			"${FILESDIR}"/0.16-rogue-armor.patch