Version bump to 2.7.4 Bug #193403

Fix ELF file installed in /usr/share. Bug #305243
Package-Manager: portage-2.1.7.16/cvs/Linux i686

4 files changed, 89 insertions, 3 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/Manifest b/games-rpg/egoboo/Manifest
index 918f5fa2fb14..1ad46b577dbc 100644
--- a/games-rpg/egoboo/Manifest
+++ b/games-rpg/egoboo/Manifest
@@ -1,6 +1,9 @@
 AUX 2.22-amd64.patch 317 RMD160 527dd8f17d21f98f9948dc952a83f37aabea1e19 SHA1 16adfb20f585cef7bf3b5899efa5c4755d0bda52 SHA256 bc913af7c6cc3f91736b8e3f2b4a2d066ae5322356a28c3bbcb03e42e2a70788
 AUX 2.22-endian.patch 6416 RMD160 21e216ae006cf57521b1982291afaebaec679c08 SHA1 839a30b15a266d0d0eb694647f8316d4513d5fe8 SHA256 1beb221b609b7dca4d8b2b0682d7a58675046cb7cb727c734640184d84d41307
+AUX egoboo-2.7.4-enet.patch 637 RMD160 3252c494f0b77cda00ac6fe0f40f66c68f2a1ebc SHA1 68533c4688427be57f7d883bfa846c7182fd1577 SHA256 ac6dd113d9ba77f948d60c3337dae9d740928828e93eb8712766bac84794ee5e
 DIST ego222.tar.gz 17283653 RMD160 915cf675147940e8687031a60db837cb6dbe3e2e SHA1 4bbd3cfbb852864574f5331f323e13a4aea2169f SHA256 eb024b4e7fd4b1d2babfd9e0fbc1caabd2d1864c67fa4e2f03a806a5a4e6552b
+DIST egoboo-2.7.4.tar.gz 143487850 RMD160 b74e811fc3591bf8cdf9c315ef614f3ac1dd06c4 SHA1 1974e0bcaab73722ab29a19e1331aa3611b15816 SHA256 b22cdb70eab99bf5579404592e4a227015da8087debdf32f11ee43d406bd9c90
 EBUILD egoboo-2.22-r1.ebuild 1623 RMD160 a56b60767d20e57089c5ab1885ec6e3f1a0ccdff SHA1 abc74fd832fd648f6b52190efd2a21e9fb9348b9 SHA256 9681f3ab3b32fe0411484b4a9c74b7f159b3b4d11dacdb4bd46ce9ddf8fb7194
-MISC ChangeLog 2708 RMD160 a29c0e93d02a0146b9c6ce4aefe1133409f84618 SHA1 a0de9a38aa3e1126b8d555a7639673191745ee5c SHA256 1de51b8faef44b73cee9c08dd99b308407b78d27edb0e87ba242a5e88a600e97
+EBUILD egoboo-2.7.4.ebuild 1329 RMD160 8afcb643ff5e4ac063a9286a9f1d2e1e7b346583 SHA1 35eac1d3e7434f677d73835de0d4634e01ed8cdc SHA256 cd3a0add4bf5a94c8c7c8c6e31fe5b726971d5a478519939210c96dc05c55489
+MISC ChangeLog 2980 RMD160 09e93997295d06b07734e8a791b32b8e5e44107c SHA1 091c0759ec23518443ab9190b01751569452e0de SHA256 77b700c5493c903d0b81fb570de46c804f40e40ca362f356d2682602e2cf555c
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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}