Respect LDFLAGS. Bug #335459

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

5 files changed, 63 insertions, 26 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/Manifest b/games-sports/miniracer/Manifest
index fcd27eac4b96..966a2db95c16 100644
--- a/games-sports/miniracer/Manifest
+++ b/games-sports/miniracer/Manifest
@@ -1,5 +1,6 @@
-AUX miniracer-1.04-nosharedelf.patch 1187 RMD160 cd81b52cb4cc180bb595ce8e4b414f94af1da2c6 SHA1 af6342891b5d512d6e9261bb65d9e90d03c742b6 SHA256 77dbba8ecaab6b53a8c9c775de8f8aed4073edaaa53a6608d6981dcb1da4c140
+AUX miniracer-1.04-ldflags.patch 1988 RMD160 5498d4c5f4776465b5ebe187284c7805bcf76605 SHA1 5551418aeb637cef556fe0066e4ff8152323c6e8 SHA256 4906b9f9ce4aad83b48113187bcacca0c045cb7eb6d98a5c29245235117bd97e
+AUX miniracer-1.04-nosharedelf.patch 542 RMD160 b2197f5c5d44217c93fe587ebd0499c2e8d03307 SHA1 c713a1cf0064c4d6e40df0947420e39235bf90b4 SHA256 185efe81b41ac9d14b4163f1571819c97d886b4c26323fcda0e17d0cbcf4088d
 DIST miniracer-1.04.tar.gz 5315353 RMD160 7221de9943c2af5b99594adbe8601cc72bd65d7d SHA1 7a0a5fe5ca6749e4cadf5634edadf9ea0585680c SHA256 474ab98fd952df6233e51a5080bae655012ad573ff22cb42eca2ceaf97fe385d
-EBUILD miniracer-1.04.ebuild 1363 RMD160 f3431bf9f099e55d5554a77084ed0fe589ca4541 SHA1 f990391e8474c5bc32ab85195bd550dc77be9149 SHA256 59f439925d781ce68e193cc102872df28cffb88a052596a0364e809341f7ace2
-MISC ChangeLog 1051 RMD160 491d9ede033df46fb2a606b551caebb9d9109094 SHA1 1c00def96b3a8fdc7643f7163ee4ebf773c965a9 SHA256 48a291fb4cb76787e204fc718d89cfe1c31bd63e8b76607cbc012f3ad0fa592c
+EBUILD miniracer-1.04.ebuild 1123 RMD160 8e23ade962552bd85a71347b1c5ab8b161570f92 SHA1 6cb9f3a9b10864b195537e3b9ecb543a0ab5ac66 SHA256 220e3207d3648a853d9eecd29434b7aad769e292056714bde87d7210f05890e9
+MISC ChangeLog 1261 RMD160 c702f86424342fa58588278704110f4b3f4038d4 SHA1 c44d434d883278f4cf2d88946ba0ea27bcb18aa7 SHA256 3deafda8b86ad6913fea49129a066b5dfbfafdb6417f254654dad062b329a900
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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"