ELF file installed under game_libdir. Fix bug #304943

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

4 files changed, 56 insertions, 10 deletions

diff --git a/games-sports/miniracer/ChangeLog b/games-sports/miniracer/ChangeLog
index dd704962f04a..d66cb041d4a8 100644
--- a/games-sports/miniracer/ChangeLog
+++ b/games-sports/miniracer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-sports/miniracer
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/miniracer/ChangeLog,v 1.6 2008/01/30 17:10:40 nyhm Exp $
+# 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 $
+
+  27 Feb 2010; Tupone Alfredo <tupone@gentoo.org> miniracer-1.04.ebuild,
+  +files/miniracer-1.04-nosharedelf.patch:
+  ELF file installed under game_libdir. Fix bug #304943 by
+  flameeyes@gentoo.org
 
   30 Jan 2008; Tristan Heaven <nyhm@gentoo.org> miniracer-1.04.ebuild:
   Depend on virtual/opengl and not media-libs/mesa
diff --git a/games-sports/miniracer/Manifest b/games-sports/miniracer/Manifest
index b0e5e3e43930..fcd27eac4b96 100644
--- a/games-sports/miniracer/Manifest
+++ b/games-sports/miniracer/Manifest
@@ -1,4 +1,5 @@
+AUX miniracer-1.04-nosharedelf.patch 1187 RMD160 cd81b52cb4cc180bb595ce8e4b414f94af1da2c6 SHA1 af6342891b5d512d6e9261bb65d9e90d03c742b6 SHA256 77dbba8ecaab6b53a8c9c775de8f8aed4073edaaa53a6608d6981dcb1da4c140
 DIST miniracer-1.04.tar.gz 5315353 RMD160 7221de9943c2af5b99594adbe8601cc72bd65d7d SHA1 7a0a5fe5ca6749e4cadf5634edadf9ea0585680c SHA256 474ab98fd952df6233e51a5080bae655012ad573ff22cb42eca2ceaf97fe385d
-EBUILD miniracer-1.04.ebuild 1209 RMD160 83b834c2937f9f68f251fc9914fd4dd1d6f4ae2e SHA1 b120e7e03ceb51c21d59ddd3c38c75604b3a91ba SHA256 f99a7f42fa884bc6be0710728ba589d368589fadfc7f608f3d0f16d646db1679
-MISC ChangeLog 850 RMD160 4be1cf241685bf293a414a19fad7c05c898a0535 SHA1 ca8ecfa37226f1fd59b82ced883def1b66fa76e7 SHA256 86c8222aafa084719818050cae0c25ba1756e46f722a21a921a43d55bc57b7ef
+EBUILD miniracer-1.04.ebuild 1363 RMD160 f3431bf9f099e55d5554a77084ed0fe589ca4541 SHA1 f990391e8474c5bc32ab85195bd550dc77be9149 SHA256 59f439925d781ce68e193cc102872df28cffb88a052596a0364e809341f7ace2
+MISC ChangeLog 1051 RMD160 491d9ede033df46fb2a606b551caebb9d9109094 SHA1 1c00def96b3a8fdc7643f7163ee4ebf773c965a9 SHA256 48a291fb4cb76787e204fc718d89cfe1c31bd63e8b76607cbc012f3ad0fa592c
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch b/games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch
new file mode 100644
index 000000000000..1629c77b7dd5
--- /dev/null
+++ b/games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch
@@ -0,0 +1,35 @@
+--- miniracer.old	2010-02-27 21:05:11.000000000 +0100
++++ miniracer	2010-02-27 21:10:34.000000000 +0100
+@@ -12,10 +12,6 @@
+ fi
+ 
+ #checks for files
+-if ! [ -f $HOME/.MiniRacer/engine.glx ]; then
+-	ln -s $MINIRACERDIR/engine.glx $HOME/.MiniRacer
+-fi
+-
+ if ! [ -f $HOME/.MiniRacer/data/pak0.pak ]; then
+ 	ln -s $MINIRACERDIR/data/pak0.pak $HOME/.MiniRacer/data
+ fi
+@@ -35,7 +31,4 @@
+ 
+ # change directory and start MiniRacer
+ cd $HOME/.MiniRacer
+-./engine.glx $*
+-
+-exit 0
+-      
+\ 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 8c41f30b9caf..51d16db82d21 100644
--- a/games-sports/miniracer/miniracer-1.04.ebuild
+++ b/games-sports/miniracer/miniracer-1.04.ebuild
@@ -1,8 +1,9 @@
-# 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-sports/miniracer/miniracer-1.04.ebuild,v 1.5 2008/01/30 17:10:40 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/miniracer/miniracer-1.04.ebuild,v 1.6 2010/02/27 21:04:12 tupone Exp $
+EAPI=2
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="an OpenGL car racing game, based on ID's famous Quake engine"
 HOMEPAGE="http://miniracer.sourceforge.net/"
@@ -25,9 +26,8 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
 	x11-proto/xproto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nosharedelf.patch
 	sed -i \
 		-e '/^CC=/d' \
 		-e "s:\$(DESTDIR)/usr/bin:\$(DESTDIR)${GAMES_BINDIR}:" \
@@ -36,6 +36,11 @@ src_unpack() {
 		-e "/LDFLAGS/s:-lSDL -lSDL_mixer -lpthread:$(sdl-config --libs) -lSDL_mixer:" \
 		Makefile \
 		|| die "sed failed"
+	sed -i \
+		-e "s:@GAMES_LIBDIR@:$(games_get_libdir)/${PN}:" \
+		miniracer \
+		Makefile \
+		|| die "2nd sed failed"
 }
 
 src_install() {