Version bump to 2.8.1 Bug #366731

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

4 files changed, 132 insertions, 7 deletions

diff --git a/games-rpg/egoboo/ChangeLog b/games-rpg/egoboo/ChangeLog
index 0a8ca6347b83..c846c0f0b595 100644
--- a/games-rpg/egoboo/ChangeLog
+++ b/games-rpg/egoboo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/egoboo
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.25 2011/06/18 18:34:57 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.26 2012/04/30 08:35:45 tupone Exp $
+
+*egoboo-2.8.1 (30 Apr 2012)
+
+  30 Apr 2012; Tupone Alfredo <tupone@gentoo.org> +egoboo-2.8.1.ebuild,
+  +files/egoboo-2.8.1-gentoo.patch:
+  Version bump to 2.8.1 Bug #366731 by Matija "hook" Šuklje
 
   18 Jun 2011; Tupone Alfredo <tupone@gentoo.org> egoboo-2.7.4.ebuild,
   +files/egoboo-2.7.4-underlink.patch:
diff --git a/games-rpg/egoboo/Manifest b/games-rpg/egoboo/Manifest
index ee15dde666ec..c0db321fa300 100644
--- a/games-rpg/egoboo/Manifest
+++ b/games-rpg/egoboo/Manifest
@@ -5,14 +5,17 @@ AUX 2.22-amd64.patch 317 RMD160 527dd8f17d21f98f9948dc952a83f37aabea1e19 SHA1 16
 AUX 2.22-endian.patch 6416 RMD160 21e216ae006cf57521b1982291afaebaec679c08 SHA1 839a30b15a266d0d0eb694647f8316d4513d5fe8 SHA256 1beb221b609b7dca4d8b2b0682d7a58675046cb7cb727c734640184d84d41307
 AUX egoboo-2.7.4-enet.patch 2547 RMD160 7459f7b0ec57ac76d0c07032e72a015ff4d1050b SHA1 ffb785ed44f8a8323623574427260b74f47090ba SHA256 51bf33933856c7375d510ce00bbe93803592bf351f6fb1246abc70c255776fa6
 AUX egoboo-2.7.4-underlink.patch 415 RMD160 d55fee46fd1b358c2d828d6f74f8d8e98d4579e9 SHA1 6fefe0fc1440d7fdde72fd7dcb53bf3657d59030 SHA256 de078df2550c3d0e5db00f5a5cbcc6364d845e1f0bb0f097a13836dc31fe3c67
+AUX egoboo-2.8.1-gentoo.patch 2233 RMD160 37e8e3df9f8b2c47d2cfa800c1c84a08a444fe79 SHA1 41a034a024724e67dc7aed75d39f7f414ed0f7a0 SHA256 000e654f3c08acdc51d401b924f76a9557f21be87e0e73f5ff956c50040063fd
 DIST egoboo-2.7.4.tar.gz 143487850 RMD160 b74e811fc3591bf8cdf9c315ef614f3ac1dd06c4 SHA1 1974e0bcaab73722ab29a19e1331aa3611b15816 SHA256 b22cdb70eab99bf5579404592e4a227015da8087debdf32f11ee43d406bd9c90
+DIST egoboo-2.8.1.tar.gz 150029960 RMD160 3e1f87e8e5044c3f449c96218f0b55b983e321d8 SHA1 c0fdfba4bbefe04f5666dab3c1b25db867fb3663 SHA256 a2694187d28a7aadf4ca3b9b7a6c6dcd3bb03ec8f145435c744bb77afb5f4c26
 EBUILD egoboo-2.7.4.ebuild 1387 RMD160 21cb47c60e83eabfd12a54c34931e75593506d0f SHA1 98065242f502b22f2f94262d8db8487fe5eb045a SHA256 9c32df5bb566339078c748740fed10d99a80da857a3540a6d60cd064d8cd9d89
-MISC ChangeLog 4126 RMD160 c072abf45440c4edda86fc74f83ae73dd365bdbb SHA1 15c37a39a6e0bec88a605eaf593fe4a8caadaf34 SHA256 d28733ea9ae601e49c396ee2376cb24a0e332f002ba42363508de8ad1882ac2b
+EBUILD egoboo-2.8.1.ebuild 1578 RMD160 a957eaba967ed47a7a80fb080dea1d431cb655d3 SHA1 48c40e4433f91db694fc2a09f3114a77859a98b1 SHA256 60d26258c2c13e07e244f2fdc9ccd05e60fd451a3e818e42714702670967754d
+MISC ChangeLog 4325 RMD160 ecabc05cedec7933026b48b5fba0f18650696b2c SHA1 a5c853d57ae650d1abee68c1d1f4a28420e459ab SHA256 eee247baff2a871d047efbabc0f3497c1e074cfb1695f69854eb5984fa1c9280
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk3879oACgkQIY77eQFFFC34HACguWCimJXQexjJJ+FBqjCXzLED
-NBAAoJ4iOp44UFv9/7ASGwIpPQwvMtEV
-=O27f
+iEYEARECAAYFAk+eTu0ACgkQIY77eQFFFC0PXQCg39qbSAzoADIb78I9GthWeEyU
+Qb4An30PDYTCU3X7zoPSkBHsBU+G3Kss
+=9LJB
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/egoboo/egoboo-2.8.1.ebuild b/games-rpg/egoboo/egoboo-2.8.1.ebuild
new file mode 100644
index 000000000000..ee7db215a110
--- /dev/null
+++ b/games-rpg/egoboo/egoboo-2.8.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/egoboo-2.8.1.ebuild,v 1.1 2012/04/30 08:35:45 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/libsdl[video]
+	media-libs/sdl-image
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-ttf
+	net-libs/enet:0
+	dev-games/physfs"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	edos2unix src/game/platform/file_linux.c \
+		src/game/network.c \
+		src/game/Makefile
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		-e "s:@GENTOO_CONFDIR@:${GAMES_SYSCONFDIR}/${PN}:" \
+		src/game/platform/file_linux.c || die "sed failed"
+	rm -rf src/enet || die "failed removing enet"
+}
+
+src_compile() {
+	make -C src/game PROJ_NAME=egoboo-2.x || die "emake failed"
+}
+
+src_install() {
+	dodoc BUGS.txt Changelog.txt doc/*.txt doc/*.pdf || die "dodoc failed"
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r basicdat modules \
+		|| die "doins failed"
+	insinto "${GAMES_SYSCONFDIR}/${PN}"
+	doins -r controls.txt setup.txt \
+		|| die "doins on sysconf failed"
+
+	newgamesbin src/game/egoboo-2.x ${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.8.1-gentoo.patch b/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch
new file mode 100644
index 000000000000..36cb33b55c54
--- /dev/null
+++ b/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch
@@ -0,0 +1,56 @@
+--- src/game/platform/file_linux.c.old	2012-04-29 21:45:29.627419281 +0200
++++ src/game/platform/file_linux.c	2012-04-29 21:45:29.628419211 +0200
+@@ -79,9 +79,9 @@
+     strncpy( linux_dataPath,   PREFIX "/share/games/egoboo-2.x", SDL_arraysize( linux_dataPath ) );
+ #else
+     // these are read-only directories
+-    strncpy( linux_configPath, "/etc/egoboo-2.x/",         SDL_arraysize( linux_configPath ) );
++    strncpy( linux_configPath, "@GENTOO_CONFDIR@",         SDL_arraysize( linux_configPath ) );
+     strncpy( linux_binaryPath, "/games/",                  SDL_arraysize( linux_binaryPath ) );
+-    strncpy( linux_dataPath,   "/share/games/egoboo-2.x/", SDL_arraysize( linux_dataPath ) );
++    strncpy( linux_dataPath,   "@GENTOO_DATADIR@", SDL_arraysize( linux_dataPath ) );
+ #endif
+ 
+     // the log file cannot be started until there is a user data path to dump the file into
+--- src/game/network.c.old	2012-04-29 20:14:31.482179973 +0200
++++ src/game/network.c	2012-04-29 20:14:52.077730184 +0200
+@@ -37,7 +37,7 @@
+ #include "egoboo_setup.h"
+ #include "egoboo.h"
+ 
+-#include "enet/enet.h"
++#include <enet/enet.h>
+ #include "file_common.h"
+ 
+ #include <stdarg.h>
+--- src/game/Makefile.old	2012-04-29 20:17:09.303070070 +0200
++++ src/game/Makefile	2012-04-29 20:18:21.047023847 +0200
+@@ -33,8 +33,7 @@
+ # the compiler options
+ 
+-CC      := gcc
+-INC     := -I. -I.. -I../enet/include ${SDLCONF_I} -I./extensions -I./file_formats -I./platform
+-LDFLAGS := ${SDLCONF_L} -L../enet/lib -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs -lenet
++INC     := -I. -I.. ${SDLCONF_I} -I./extensions -I./file_formats -I./platform
++LDLIBS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs -lenet -lm
+ 
+ # use different options if the environmental variable PREFIX is defined
+ ifdef ($(PREFIX),"")
+@@ -43,7 +43,7 @@
+ 	OPT := -Os -Wall -DPREFIX=\"${PREFIX}\" -D_NIX_PREFIX
+ endif
+ 
+-CFLAGS  := ${OPT} ${INC}
++CFLAGS  += ${INC} -DENET11
+ 
+ #------------------------------------
+ # definitions of the target projects
+@@ -52,7 +52,7 @@
+ all: ${EGO_BIN}
+ 
+ ${EGO_BIN}: ${EGO_OBJ} 
+-	${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS}
++	${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS} ${LDLIBS}
+ 
+ clean:
+ 	rm -f ${ENET_OBJ} ${EGO_OBJ} ${EGO_BIN}