Version bump to 2.7.4 Bug #193403

Fix ELF file installed in /usr/share. Bug #305243
(Portage version: 2.1.7.16/cvs/Linux i686)

3 files changed, 85 insertions, 2 deletions

diff --git a/games-rpg/egoboo/ChangeLog b/games-rpg/egoboo/ChangeLog
index 6e21f9df9108..dac10d3f158a 100644
--- a/games-rpg/egoboo/ChangeLog
+++ b/games-rpg/egoboo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-rpg/egoboo
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.15 2007/05/27 19:30:04 tupone Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.16 2010/02/20 22:35:15 tupone Exp $
+
+*egoboo-2.7.4 (20 Feb 2010)
+
+  20 Feb 2010; Tupone Alfredo <tupone@gentoo.org> +egoboo-2.7.4.ebuild,
+  +files/egoboo-2.7.4-enet.patch:
+  Version bump to 2.7.4 Bug #193403 by Matija Suklje (hook)
+  Fix ELF file installed in /usr/share. Bug #305243 by flameeyes@gentoo.org
 
 *egoboo-2.22-r1 (27 May 2007)
 
diff --git a/games-rpg/egoboo/egoboo-2.7.4.ebuild b/games-rpg/egoboo/egoboo-2.7.4.ebuild
new file mode 100644
index 000000000000..0279021d39dc
--- /dev/null
+++ b/games-rpg/egoboo/egoboo-2.7.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/egoboo-2.7.4.ebuild,v 1.1 2010/02/20 22:35:15 tupone Exp $
+EAPI=2
+
+inherit eutils games
+
+DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
+HOMEPAGE="http://egoboo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="virtual/opengl
+	virtual/glu
+	media-libs/sdl-image
+	media-libs/sdl-mixer
+	media-libs/sdl-ttf"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	edos2unix game/Makefile.unix
+	epatch "${FILESDIR}"/${P}-enet.patch
+	sed -i \
+		-e "s:\${EGOBOO_PREFIX}/share:${GAMES_DATADIR}:" \
+		-e "s:\${EGOBOO_PREFIX}/libexec:$(games_get_libdir):" \
+		game/egoboo.sh || die "sed failed"
+}
+
+src_compile() {
+	emake -C game -f Makefile.unix
+}
+
+src_install() {
+	dodoc Changelog.txt doc/* || die "dodoc failed"
+
+	exeinto "$(games_get_libdir)"
+	doexe game/${PN} || die "doexe failed"
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r basicdat modules players controls.txt setup.txt \
+		|| die "doins failed"
+
+	newgamesbin game/egoboo.sh ${PN} || die "newgamesbin failed"
+
+	newicon basicdat/icon.bmp ${PN}.bmp
+	make_desktop_entry ${PN} Egoboo /usr/share/pixmaps/${PN}.bmp
+
+	prepgamesdirs
+}
diff --git a/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch b/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch
new file mode 100644
index 000000000000..82a9f8c5025f
--- /dev/null
+++ b/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch
@@ -0,0 +1,23 @@
+--- game/Makefile.unix.old	2010-02-20 22:53:56.000000000 +0100
++++ game/Makefile.unix	2010-02-20 22:56:07.000000000 +0100
+@@ -22,16 +22,16 @@
+ 
+ CC      := gcc
+ OPT     := -Os -Wall
+-INC     := -I. -I../enet/include -I.. ${SDLCONF_I}
+-CFLAGS  := ${OPT} ${INC}
+-LDFLAGS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image
++INC     := -I. -I.. ${SDLCONF_I} -DENET11
++CFLAGS  := ${CFLAGS} ${INC}
++LDFLAGS := ${SDLCONF_L} -lenet -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image
+ 
+ EGO_BIN := egoboo
+ 
+ all: ${EGO_BIN}
+    
+ 
+-${EGO_BIN}: ${EGO_OBJ} ${ENET_OBJ}
++${EGO_BIN}: ${EGO_OBJ}
+ 	${CC} -o $@ $^ ${LDFLAGS}
+ 
+ install: ${EGO_BIN}