Respect LDFLAGS. Bug #335459

(Portage version: 2.1.9.14/cvs/Linux i686)

4 files changed, 59 insertions, 23 deletions

diff --git a/games-sports/miniracer/ChangeLog b/games-sports/miniracer/ChangeLog
index d66cb041d4a8..aacc27093d81 100644
--- a/games-sports/miniracer/ChangeLog
+++ b/games-sports/miniracer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-sports/miniracer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/miniracer/ChangeLog,v 1.7 2010/02/27 21:04:12 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/miniracer/ChangeLog,v 1.8 2010/10/13 12:28:28 tupone Exp $
+
+  13 Oct 2010; Tupone Alfredo <tupone@gentoo.org> miniracer-1.04.ebuild,
+  +files/miniracer-1.04-ldflags.patch,
+  files/miniracer-1.04-nosharedelf.patch:
+  Respect LDFLAGS. Bug #335459 by flameeyes@gentoo.org
 
   27 Feb 2010; Tupone Alfredo <tupone@gentoo.org> miniracer-1.04.ebuild,
   +files/miniracer-1.04-nosharedelf.patch:
diff --git a/games-sports/miniracer/files/miniracer-1.04-ldflags.patch b/games-sports/miniracer/files/miniracer-1.04-ldflags.patch
new file mode 100644
index 000000000000..4c37dc9e1aa3
--- /dev/null
+++ b/games-sports/miniracer/files/miniracer-1.04-ldflags.patch
@@ -0,0 +1,48 @@
+--- Makefile.old	2010-10-13 12:41:01.000000000 +0200
++++ Makefile	2010-10-13 12:56:04.000000000 +0200
+@@ -10,13 +10,12 @@
+ 
+ BUILDDIR=obj
+ 
+-CC=gcc
+ DEFS=-DVIDMODEXT_GAMMA_RAMP -DSOUND
+-INCLUDES= -I. -I/usr/X11R6/include -I/usr/include/SDL
+-CFLAGS=$(DEFS) $(INCLUDES) -O3 -march=i486 -ffast-math -fexpensive-optimizations
++INCLUDES= -I. -I/usr/X11R6/include $(shell sdl-config --cflags)
++CFLAGS=$(DEFS) $(INCLUDES) @CFLAGS@
+ 
+ GL_LDFLAGS=-L/usr/X11R6/lib -lGL -lXxf86dga -lXxf86vm -lX11 -lXext -lm
+-LDFLAGS=$(GL_LDFLAGS) -ldl -lSDL -lSDL_mixer -lpthread
++LDLIBS=$(GL_LDFLAGS) -ldl -lSDL_mixer $(shell sdl-config --libs)
+ 
+ #############################################################################
+ # SETUP AND BUILD
+@@ -43,15 +42,16 @@
+ build_release: engine.glx
+ 
+ install:
+-	install -d $(DESTDIR)/usr/bin
++	install -d $(DESTDIR)@GAMES_BINDIR@
+ 	install -d $(DESTDIR)/usr/share/man/man6
+ 	install -d $(DESTDIR)/usr/share/games/MiniRacer
+ 	install -d $(DESTDIR)/usr/share/games/MiniRacer/data
+ 	install -d $(DESTDIR)/usr/share/games/MiniRacer/data/maps
+-	install -m 755 engine.glx $(DESTDIR)/usr/share/games/MiniRacer
++	install -d $(DESTDIR)@GAMES_LIBDIR@
++	install -m 755 engine.glx $(DESTDIR)@GAMES_LIBDIR@
+ 	install -m 644 data/pak0.pak $(DESTDIR)/usr/share/games/MiniRacer/data
+ 	install -m 644 data/config.cfg $(DESTDIR)/usr/share/games/MiniRacer/data
+-	install -m 755 miniracer $(DESTDIR)/usr/bin/miniracer
++	install -m 755 miniracer $(DESTDIR)@GAMES_BINDIR@/miniracer
+ 	install -m 644 miniracer.6 $(DESTDIR)/usr/share/man/man6
+ 	install -m 644 data/maps/*.bsp $(DESTDIR)/usr/share/games/MiniRacer/data/maps
+ 	install -m 644 data/maps/maps1.lst $(DESTDIR)/usr/share/games/MiniRacer/data/maps
+@@ -145,7 +145,7 @@
+ 	$(CC) $(CFLAGS) $(GLCFLAGS) -o $@ -c $<
+ 
+ engine.glx : $(GLMR_OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(GLMR_OBJS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(GLMR_OBJS) $(LDLIBS)
+ 
+ #############################################################################
+ # MISC
diff --git a/games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch b/games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch
index 1629c77b7dd5..0bb0b5da846e 100644
--- a/games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch
+++ b/games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch
@@ -21,15 +21,3 @@
 -      
 \ No newline at end of file
 +exec @GAMES_LIBDIR@/engine.glx $*
---- Makefile.old	2010-02-27 21:29:15.000000000 +0100
-+++ Makefile	2010-02-27 21:31:15.000000000 +0100
-@@ -48,7 +48,8 @@
- 	install -d $(DESTDIR)/usr/share/games/MiniRacer
- 	install -d $(DESTDIR)/usr/share/games/MiniRacer/data
- 	install -d $(DESTDIR)/usr/share/games/MiniRacer/data/maps
--	install -m 755 engine.glx $(DESTDIR)/usr/share/games/MiniRacer
-+	install -d $(DESTDIR)@GAMES_LIBDIR@
-+	install -m 755 engine.glx $(DESTDIR)@GAMES_LIBDIR@
- 	install -m 644 data/pak0.pak $(DESTDIR)/usr/share/games/MiniRacer/data
- 	install -m 644 data/config.cfg $(DESTDIR)/usr/share/games/MiniRacer/data
- 	install -m 755 miniracer $(DESTDIR)/usr/bin/miniracer
diff --git a/games-sports/miniracer/miniracer-1.04.ebuild b/games-sports/miniracer/miniracer-1.04.ebuild
index 51d16db82d21..866481842e70 100644
--- a/games-sports/miniracer/miniracer-1.04.ebuild
+++ b/games-sports/miniracer/miniracer-1.04.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-sports/miniracer/miniracer-1.04.ebuild,v 1.6 2010/02/27 21:04:12 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/miniracer/miniracer-1.04.ebuild,v 1.7 2010/10/13 12:28:28 tupone Exp $
 EAPI=2
 
 inherit eutils games
@@ -27,17 +27,12 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-nosharedelf.patch
-	sed -i \
-		-e '/^CC=/d' \
-		-e "s:\$(DESTDIR)/usr/bin:\$(DESTDIR)${GAMES_BINDIR}:" \
-		-e "/INCLUDES/s:-I/usr/include/SDL:$(sdl-config --cflags):" \
-		-e "/CFLAGS/s:-O3 -march=i486 -ffast-math -fexpensive-optimizations:${CFLAGS}:" \
-		-e "/LDFLAGS/s:-lSDL -lSDL_mixer -lpthread:$(sdl-config --libs) -lSDL_mixer:" \
-		Makefile \
-		|| die "sed failed"
+	epatch "${FILESDIR}"/${P}-nosharedelf.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
 	sed -i \
+		-e "s:@CFLAGS@:${CFLAGS}:" \
 		-e "s:@GAMES_LIBDIR@:$(games_get_libdir)/${PN}:" \
+		-e "s:@GAMES_BINDIR@:${GAMES_BINDIR}:" \
 		miniracer \
 		Makefile \
 		|| die "2nd sed failed"