Respect LDFLAGS. Bug #334583

(Portage version: 2.1.9.14/cvs/Linux i686)

5 files changed, 122 insertions, 26 deletions

diff --git a/games-fps/red-blue-quake2/ChangeLog b/games-fps/red-blue-quake2/ChangeLog
index f9e1fefe3540..9d43218f2815 100644
--- a/games-fps/red-blue-quake2/ChangeLog
+++ b/games-fps/red-blue-quake2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/red-blue-quake2
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/ChangeLog,v 1.8 2007/02/22 00:09:11 peper Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/ChangeLog,v 1.9 2010/10/18 07:42:31 tupone Exp $
+
+  18 Oct 2010; Tupone Alfredo <tupone@gentoo.org> files/0.1-gentoo.patch,
+  red-blue-quake2-0.1.ebuild, files/red-blue-quake2-0.1-gcc41.patch,
+  +files/red-blue-quake2-0.1-ldflags.patch:
+  Respect LDFLAGS. Bug #334583 by flameeyes@gentoo.org
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-fps/red-blue-quake2/files/0.1-gentoo.patch b/games-fps/red-blue-quake2/files/0.1-gentoo.patch
index e43013a1a8b2..fd13df9bcb45 100644
--- a/games-fps/red-blue-quake2/files/0.1-gentoo.patch
+++ b/games-fps/red-blue-quake2/files/0.1-gentoo.patch
@@ -1,6 +1,6 @@
-diff -ur orig/quake2-3.21/linux/Makefile work-mywork/quake2-3.21/linux/Makefile
---- orig/quake2-3.21/linux/Makefile	2001-12-29 20:37:22.000000000 -0500
-+++ work-mywork/quake2-3.21/linux/Makefile	2003-07-17 22:14:50.000000000 -0400
+diff -ur Makefile.old Makefile
+--- Makefile	2001-12-29 20:37:22.000000000 -0500
++++ Makefile	2003-07-17 22:14:50.000000000 -0400
 @@ -54,7 +54,7 @@
  RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -ffast-math -funroll-loops \
  	-fomit-frame-pointer -fexpensive-optimizations
@@ -10,9 +10,9 @@ diff -ur orig/quake2-3.21/linux/Makefile work-mywork/quake2-3.21/linux/Makefile
  	-fomit-frame-pointer -fexpensive-optimizations
  endif
  
-diff -ur orig/quake2-3.21/linux/sys_linux.c work-mywork/quake2-3.21/linux/sys_linux.c
---- orig/quake2-3.21/linux/sys_linux.c	2001-12-22 18:45:58.000000000 -0500
-+++ work-mywork/quake2-3.21/linux/sys_linux.c	2003-07-17 22:34:11.000000000 -0400
+diff -ur sys_linux.c.old sys_linux.c
+--- sys_linux.c.old	2001-12-22 18:45:58.000000000 -0500
++++ sys_linux.c	2003-07-17 22:34:11.000000000 -0400
 @@ -220,7 +220,7 @@
  	char	curpath[MAX_OSPATH];

  	char	*path;

@@ -37,9 +37,9 @@ diff -ur orig/quake2-3.21/linux/sys_linux.c work-mywork/quake2-3.21/linux/sys_li
  		}

  	}

  

-diff -ur orig/quake2-3.21/qcommon/files.c work-mywork/quake2-3.21/qcommon/files.c
---- orig/quake2-3.21/qcommon/files.c	2001-12-22 16:32:26.000000000 -0500
-+++ work-mywork/quake2-3.21/qcommon/files.c	2003-07-17 22:34:29.000000000 -0400
+diff -ur ../qcommon/files.c ../qcommon/files.c
+--- ../qcommon/files.c	2001-12-22 16:32:26.000000000 -0500
++++ ../qcommon/files.c	2003-07-17 22:34:29.000000000 -0400
 @@ -865,7 +865,7 @@
  	//

  	// start up with baseq2 by default

@@ -49,9 +49,9 @@ diff -ur orig/quake2-3.21/qcommon/files.c work-mywork/quake2-3.21/qcommon/files.
  

  	// any set gamedirs will be freed up to here

  	fs_base_searchpaths = fs_searchpaths;

-diff -ur orig/quake2-3.21/qcommon/qcommon.h work-mywork/quake2-3.21/qcommon/qcommon.h
---- orig/quake2-3.21/qcommon/qcommon.h	2001-12-22 16:32:26.000000000 -0500
-+++ work-mywork/quake2-3.21/qcommon/qcommon.h	2003-07-17 21:20:03.000000000 -0400
+diff -ur ../qcommon/qcommon.h ../qcommon/qcommon.h
+--- ../qcommon/qcommon.h	2001-12-22 16:32:26.000000000 -0500
++++ ../qcommon/qcommon.h	2003-07-17 21:20:03.000000000 -0400
 @@ -25,7 +25,7 @@
  

  #define	VERSION		3.21

diff --git a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch
index 1090c306069f..1f933d33537e 100644
--- a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch
+++ b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch
@@ -1,5 +1,5 @@
---- game/g_local.h.old	2006-05-07 00:27:45.000000000 +0200
-+++ game/g_local.h	2006-05-07 00:28:06.000000000 +0200
+--- ../game/g_local.h.old	2006-05-07 00:27:45.000000000 +0200
++++ ../game/g_local.h	2006-05-07 00:28:06.000000000 +0200
 @@ -458,11 +458,6 @@
  extern	int	sm_meat_index;

  extern	int	snd_fry;

@@ -12,8 +12,8 @@
  // means of death

  #define MOD_UNKNOWN			0

  #define MOD_BLASTER			1

---- ctf/g_local.h.old	2006-05-07 00:36:21.000000000 +0200
-+++ ctf/g_local.h	2006-05-07 00:36:38.000000000 +0200
+--- ../ctf/g_local.h.old	2006-05-07 00:36:21.000000000 +0200
++++ ../ctf/g_local.h	2006-05-07 00:36:38.000000000 +0200
 @@ -466,11 +466,6 @@
  extern	int	sm_meat_index;

  extern	int	snd_fry;

diff --git a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch
new file mode 100644
index 000000000000..58beb0f3cec5
--- /dev/null
+++ b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch
@@ -0,0 +1,92 @@
+--- Makefile.old	2010-10-18 09:09:48.000000000 +0200
++++ Makefile	2010-10-18 09:15:59.000000000 +0200
+@@ -59,7 +59,7 @@
+ endif
+ 
+ DEBUG_CFLAGS=$(BASE_CFLAGS) -g
+-LDFLAGS=-ldl -lm
++LDLIBS=-ldl -lm
+ SVGALDFLAGS=-lvga -lm
+ XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga
+ XCFLAGS=
+@@ -195,7 +195,7 @@
+ endif
+ 
+ $(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDLIBS)
+ 
+ $(BUILDDIR)/client/cl_cin.o :     $(CLIENT_DIR)/cl_cin.c
+ 	$(DO_CC)
+@@ -374,7 +374,7 @@
+ 	$(BUILDDIR)/ded/cd_null.o
+ 
+ $(BUILDDIR)/q2ded : $(Q2DED_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(Q2DED_OBJS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(Q2DED_OBJS) $(LDLIBS)
+ 
+ $(BUILDDIR)/ded/cmd.o :        $(COMMON_DIR)/cmd.c
+ 	$(DO_DED_CC)
+@@ -503,7 +503,7 @@
+ 	$(BUILDDIR)/game/m_flash.o
+ 
+ $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) : $(GAME_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
+ 
+ $(BUILDDIR)/game/g_ai.o :        $(GAME_DIR)/g_ai.c
+ 	$(DO_SHLIB_CC)
+@@ -682,7 +682,7 @@
+ 	$(BUILDDIR)/ctf/q_shared.o
+ 
+ $(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) : $(CTF_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS)
+ 
+ $(BUILDDIR)/ctf/g_ai.o :       $(CTF_DIR)/g_ai.c
+ 	$(DO_SHLIB_CC)
+@@ -821,7 +821,7 @@
+ 	$(BUILDDIR)/xatrix/q_shared.o
+ 
+ $(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) : $(XATRIX_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS)
+ 
+ $(BUILDDIR)/xatrix/g_ai.o :        $(XATRIX_DIR)/g_ai.c
+ 	$(DO_SHLIB_CC)
+@@ -1048,7 +1048,7 @@
+ 	$(BUILDDIR)/rogue/q_shared.o
+ 
+ $(BUILDDIR)/rogue/game$(ARCH).$(SHLIBEXT) : $(ROGUE_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS)
+ 
+ $(BUILDDIR)/rogue/dm_ball.o :      $(ROGUE_DIR)/dm_ball.c
+ 	$(DO_SHLIB_CC)
+@@ -1287,11 +1287,11 @@
+ 	$(BUILDDIR)/ref_soft/rw_x11.o
+ 
+ $(BUILDDIR)/ref_soft.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_SVGA_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \
++	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \
+ 		$(REF_SOFT_SVGA_OBJS) $(SVGALDFLAGS)
+ 
+ $(BUILDDIR)/ref_softx.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_X11_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
++	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
+ 		$(REF_SOFT_X11_OBJS) $(XLDFLAGS)
+ 
+ $(BUILDDIR)/ref_soft/r_aclip.o :      $(REF_SOFT_DIR)/r_aclip.c
+@@ -1431,10 +1431,10 @@
+ 	$(BUILDDIR)/ref_gl/gl_glx.o
+ 
+ $(BUILDDIR)/ref_gl.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS)
+ 
+ $(BUILDDIR)/ref_glx.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
+ 
+ $(BUILDDIR)/ref_gl/gl_draw.o :        $(REF_GL_DIR)/gl_draw.c
+ 	$(DO_GL_SHLIB_CC)
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
index acdd8174f80b..be337a561e67 100644
--- a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
+++ b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild,v 1.11 2007/04/09 18:19:41 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild,v 1.12 2010/10/18 07:42:31 tupone Exp $
+EAPI=2
 
 inherit eutils games
 
@@ -20,12 +21,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/quake2-3.21/linux
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
-	cd quake2-3.21
-	epatch "${FILESDIR}/${P}"-gcc41.patch
-	cd linux
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gentoo.patch \
+		"${FILESDIR}/${P}"-gcc41.patch \
+		"${FILESDIR}/${P}"-ldflags.patch
 	sed -i "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" sys_linux.c \
 		|| die "sed failed"
 	sed -i "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" \