diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-01-02 19:19:43 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-01-02 19:19:43 +0000 |
| commit | 7bbbce338f149b5acb0f009720cc37e6fda6c3d1 (patch) | |
| tree | 8f06cd8aebdfb82c4ef038581655107fea68b1c0 /games-arcade/koules | |
| parent | Remove qt3 support (diff) | |
| download | gentoo-2-7bbbce338f149b5acb0f009720cc37e6fda6c3d1.tar.gz gentoo-2-7bbbce338f149b5acb0f009720cc37e6fda6c3d1.tar.bz2 gentoo-2-7bbbce338f149b5acb0f009720cc37e6fda6c3d1.zip | |
Not installing ELF files on /usr/share Bug #298105
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'games-arcade/koules')
| -rw-r--r-- | games-arcade/koules/ChangeLog | 8 | ||||
| -rw-r--r-- | games-arcade/koules/files/koules-1.4-sndsrv.patch | 22 | ||||
| -rw-r--r-- | games-arcade/koules/koules-1.4-r2.ebuild | 15 |
3 files changed, 35 insertions, 10 deletions
diff --git a/games-arcade/koules/ChangeLog b/games-arcade/koules/ChangeLog index 24ea657732c2..f449ededb3f9 100644 --- a/games-arcade/koules/ChangeLog +++ b/games-arcade/koules/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/koules -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/koules/ChangeLog,v 1.14 2007/02/24 01:28:44 nyhm Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/koules/ChangeLog,v 1.15 2010/01/02 19:19:42 tupone Exp $ + + 02 Jan 2010; Tupone Alfredo <tupone@gentoo.org> koules-1.4-r2.ebuild, + +files/koules-1.4-sndsrv.patch: + Not installing ELF files on /usr/share Bug #298105 by flameeyes@gentoo.org 24 Feb 2007; Tristan Heaven <nyhm@gentoo.org> koules-1.4-r2.ebuild: Fix dependencies, bug #168179 diff --git a/games-arcade/koules/files/koules-1.4-sndsrv.patch b/games-arcade/koules/files/koules-1.4-sndsrv.patch new file mode 100644 index 000000000000..4a124a6e36a8 --- /dev/null +++ b/games-arcade/koules/files/koules-1.4-sndsrv.patch @@ -0,0 +1,22 @@ +--- Makefile.svgalib.old 2009-12-30 22:53:33.000000000 +0100 ++++ Makefile.svgalib 2009-12-30 22:54:04.000000000 +0100 +@@ -28,7 +28,7 @@ + OPTIMIZE = -Isvgalib -fomit-frame-pointer -O3 -ffast-math -s -Dlinux -Wall -DHAVEUSLEEP + OPTIMIZE1 = -I svgalib -fomit-frame-pointer -O6 -ffast-math -funroll-loops -finline-functions -s -Dlinux -Wall -DHAVEUSLEEP + CFLAGS = $(DEFINES) $(ARCH) $(JOYSTICK) -DSOUNDDIR="\"$(SOUNDDIR)\"" $(SOUND) $(MOUSE) $(NET)\ +- -DSOUNDSERVER=\"$(SOUNDDIR)/$(SOUNDSERVER)\" \ ++ -DSOUNDSERVER=\"$(KOULESDIR)/$(SOUNDSERVER)\" \ + -DSOUNDDIR=\"$(SOUNDDIR)\" \ + -DSOUNDDEV=\"$(SOUNDDEV)\" + +--- Imakefile.old 2009-12-30 22:56:19.000000000 +0100 ++++ Imakefile 2009-12-30 22:56:35.000000000 +0100 +@@ -56,7 +56,7 @@ + + DEFINES = -DONLYANSI -DSOUND $(JOYSTICK1) $(NET) $(MITSHM1) $(HAVEUSLEEP1) $(SYSDEFS) $(JOYSTICK) -Ixlib\ + $(NAMEDEF) $(ASMDEF)\ +- -DSOUNDSERVER=\"$(SOUNDDIR)/$(SOUNDSERVER)\" \ ++ -DSOUNDSERVER=\"$(KOULESDIR)/$(SOUNDSERVER)\" \ + -DSOUNDDIR=\"$(SOUNDDIR)\" \ + -DSOUNDDEV=\"$(SOUNDDEV)\" + #endif diff --git a/games-arcade/koules/koules-1.4-r2.ebuild b/games-arcade/koules/koules-1.4-r2.ebuild index 3b976c6c8cd0..1f875f23bb2e 100644 --- a/games-arcade/koules/koules-1.4-r2.ebuild +++ b/games-arcade/koules/koules-1.4-r2.ebuild @@ -1,6 +1,7 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/koules/koules-1.4-r2.ebuild,v 1.4 2007/02/24 01:28:44 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/koules/koules-1.4-r2.ebuild,v 1.5 2010/01/02 19:19:43 tupone Exp $ +EAPI=2 inherit eutils games @@ -36,10 +37,9 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN}${PV} -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${WORKDIR}"/${P}-gcc3.patch +src_prepare() { + epatch "${WORKDIR}"/${P}-gcc3.patch \ + "${FILESDIR}"/${P}-sndsrv.patch sed -i \ -e "/^KOULESDIR/s:=.*:=${GAMES_BINDIR}:" \ -e "/^SOUNDDIR/s:=.*:=${GAMES_DATADIR}/${PN}:" Iconfig \ @@ -89,9 +89,8 @@ src_compile() { } src_install() { - dogamesbin koules bins/* || die "dogamesbin failed" + dogamesbin koules koules.sndsrv.linux bins/* || die "dogamesbin failed" exeinto "${GAMES_DATADIR}/${PN}" - doexe koules.sndsrv.linux || die "doexe failed" if use tk ; then dogamesbin koules.tcl || die "dogamebin failed (tcl)" fi |