Respect LDFLAGS. Bug #338145 & EAPI=2

(Portage version: 2.1.8.3/cvs/Linux i686)

6 files changed, 127 insertions, 25 deletions

diff --git a/games-fps/aaquake2/ChangeLog b/games-fps/aaquake2/ChangeLog
index f9a1896f7ccc..c2fcfdd6efa5 100644
--- a/games-fps/aaquake2/ChangeLog
+++ b/games-fps/aaquake2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/aaquake2
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/aaquake2/ChangeLog,v 1.8 2008/03/18 22:41:41 tupone Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/aaquake2/ChangeLog,v 1.9 2010/09/21 09:11:01 tupone Exp $
+
+  21 Sep 2010; Tupone Alfredo <tupone@gentoo.org> files/0.1-gentoo.patch,
+  aaquake2-0.1.ebuild, files/aaquake2-0.1-gcc41.patch,
+  files/aaquake2-0.1-glibc.patch, +files/aaquake2-0.1-ldflags.patch:
+  Respect LDFLAGS. Bug #338145 by flameeyes@gentoo.org
+  EAPI=2
 
   18 Mar 2008; Tupone Alfredo <tupone@gentoo.org>
   +files/aaquake2-0.1-glibc.patch, aaquake2-0.1.ebuild:
diff --git a/games-fps/aaquake2/aaquake2-0.1.ebuild b/games-fps/aaquake2/aaquake2-0.1.ebuild
index 151786b56d44..b8e53e621b04 100644
--- a/games-fps/aaquake2/aaquake2-0.1.ebuild
+++ b/games-fps/aaquake2/aaquake2-0.1.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2008 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/aaquake2/aaquake2-0.1.ebuild,v 1.11 2008/03/18 22:41:41 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/aaquake2/aaquake2-0.1.ebuild,v 1.12 2010/09/21 09:11:00 tupone Exp $
+EAPI="2"
 
 inherit eutils games
 
@@ -20,14 +21,12 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/quake2-3.21/linux
 
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"/quake2-3.21
+src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PV}-gentoo.patch \
 		"${FILESDIR}"/${P}-glibc.patch \
-		"${FILESDIR}"/${P}-gcc41.patch
-	cd linux
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
 	sed -i \
 		-e "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" sys_linux.c \
 		|| die "sed failed"
diff --git a/games-fps/aaquake2/files/0.1-gentoo.patch b/games-fps/aaquake2/files/0.1-gentoo.patch
index 30379cb2c2dc..4a9b38bf5ecb 100644
--- a/games-fps/aaquake2/files/0.1-gentoo.patch
+++ b/games-fps/aaquake2/files/0.1-gentoo.patch
@@ -1,5 +1,5 @@
---- linux/Makefile.old	2001-12-29 20:37:22.000000000 -0500
-+++ linux/Makefile	2003-07-17 22:14:50.000000000 -0400
+--- Makefile.old	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
@@ -40,8 +40,8 @@
  		$(BUILD_RELEASE_DIR)/game \
  		$(BUILD_RELEASE_DIR)/ctf \
  #		$(BUILD_RELEASE_DIR)/xatrix \
---- linux/sys_linux.c.old	2001-12-22 18:45:58.000000000 -0500
-+++ linux/sys_linux.c	2003-07-17 22:34:11.000000000 -0400
+--- 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;

@@ -66,8 +66,8 @@
  		}

  	}

  

---- qcommon/files.c.old	2001-12-22 16:32:26.000000000 -0500
-+++ qcommon/files.c	2003-07-17 22:34:29.000000000 -0400
+--- ../qcommon/files.c.old	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

@@ -77,8 +77,8 @@
  

  	// any set gamedirs will be freed up to here

  	fs_base_searchpaths = fs_searchpaths;

---- qcommon/qcommon.h.old	2001-12-22 16:32:26.000000000 -0500
-+++ qcommon/qcommon.h	2003-07-17 21:20:03.000000000 -0400
+--- ../qcommon/qcommon.h.old	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/aaquake2/files/aaquake2-0.1-gcc41.patch b/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
index 0871d2c17389..f3d3da6cad63 100644
--- a/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
+++ b/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
@@ -1,5 +1,5 @@
---- game/g_local.h.old	2006-05-05 21:26:25.000000000 +0200
-+++ game/g_local.h	2006-05-05 21:26:48.000000000 +0200
+--- ../game/g_local.h.old	2006-05-05 21:26:25.000000000 +0200
++++ ../game/g_local.h	2006-05-05 21:26:48.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-05 21:41:10.000000000 +0200
-+++ ctf/g_local.h	2006-05-05 21:41:23.000000000 +0200
+--- ../ctf/g_local.h.old	2006-05-05 21:41:10.000000000 +0200
++++ ../ctf/g_local.h	2006-05-05 21:41:23.000000000 +0200
 @@ -466,11 +466,6 @@
  extern	int	sm_meat_index;

  extern	int	snd_fry;

diff --git a/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch b/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
index 806406357a31..580df210d472 100644
--- a/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
+++ b/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
@@ -1,5 +1,5 @@
---- linux/rw_aa.c.old	2008-03-18 23:29:28.000000000 +0100
-+++ linux/rw_aa.c	2008-03-18 23:29:44.000000000 +0100
+--- rw_aa.c.old	2008-03-18 23:29:28.000000000 +0100
++++ rw_aa.c	2008-03-18 23:29:44.000000000 +0100
 @@ -61,7 +61,7 @@
  #include <signal.h>

  #include <sys/mman.h>

@@ -9,8 +9,8 @@
  

  #include <aalib.h>

  

---- linux/rw_in_aa.c.old	2008-03-18 23:29:33.000000000 +0100
-+++ linux/rw_in_aa.c	2008-03-18 23:29:54.000000000 +0100
+--- rw_in_aa.c.old	2008-03-18 23:29:33.000000000 +0100
++++ rw_in_aa.c	2008-03-18 23:29:54.000000000 +0100
 @@ -46,7 +46,7 @@
  #include <signal.h>

  #include <sys/mman.h>

diff --git a/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch b/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch
new file mode 100644
index 000000000000..3c011f8a6851
--- /dev/null
+++ b/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch
@@ -0,0 +1,97 @@
+--- Makefile.old	2010-09-21 10:43:43.000000000 +0200
++++ Makefile	2010-09-21 10:47:26.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
+ AALDFLAGS=-lm -laa
+@@ -195,7 +195,7 @@
+ endif
+ 
+ $(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -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) $(CFLAGS) $(LDFLAGS) -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) $(CFLAGS) $(LDFLAGS) $(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) $(CFLAGS) $(LDFLAGS) $(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) $(CFLAGS) $(LDFLAGS) $(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) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS)
+ 
+ $(BUILDDIR)/rogue/dm_ball.o :      $(ROGUE_DIR)/dm_ball.c
+ 	$(DO_SHLIB_CC)
+@@ -1291,15 +1291,15 @@
+ 	$(BUILDDIR)/ref_soft/rw_in_aa.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) $(CFLAGS) $(LDFLAGS) $(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) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
+ 		$(REF_SOFT_X11_OBJS) $(XLDFLAGS)
+ 
+ $(BUILDDIR)/ref_softaa.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_AA_OBJS)
+-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
+ 		$(REF_SOFT_AA_OBJS) $(AALDFLAGS)
+ 
+ $(BUILDDIR)/ref_soft/r_aclip.o :      $(REF_SOFT_DIR)/r_aclip.c
+@@ -1445,10 +1445,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) $(CFLAGS) $(LDFLAGS) $(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) $(CFLAGS) $(LDFLAGS) $(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)