diff options
author | Alfredo Tupone <tupone@gentoo.org> | 2010-02-27 21:04:13 +0000 |
---|---|---|
committer | Alfredo Tupone <tupone@gentoo.org> | 2010-02-27 21:04:13 +0000 |
commit | 8805db831c11d6465356b051f7ef69e86cb2908e (patch) | |
tree | fc47870fd11d7e18f5b75b44b16c2062ee4ec8f8 /games-sports/miniracer | |
parent | Marked ~x64-macos, thanks Ramon van Alteren in bug #306705 (diff) | |
download | gentoo-2-8805db831c11d6465356b051f7ef69e86cb2908e.tar.gz gentoo-2-8805db831c11d6465356b051f7ef69e86cb2908e.tar.bz2 gentoo-2-8805db831c11d6465356b051f7ef69e86cb2908e.zip |
ELF file installed under game_libdir. Fix bug #304943
(Portage version: 2.1.7.16/cvs/Linux i686)
Diffstat (limited to 'games-sports/miniracer')
-rw-r--r-- | games-sports/miniracer/ChangeLog | 9 | ||||
-rw-r--r-- | games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch | 35 | ||||
-rw-r--r-- | games-sports/miniracer/miniracer-1.04.ebuild | 17 |
3 files changed, 53 insertions, 8 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/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() { |