summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-02-21 11:20:13 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-02-21 11:20:13 +0000
commitce43200e7861c6f5ddd6da67d03162c6d51a5f72 (patch)
tree15c296a324a1e0ba935043adca6a651e41d2ddb4
parentAdd upstream patch for compatibility with newer imagemagick versions, fixes #... (diff)
downloadhistorical-ce43200e7861c6f5ddd6da67d03162c6d51a5f72.tar.gz
historical-ce43200e7861c6f5ddd6da67d03162c6d51a5f72.tar.bz2
historical-ce43200e7861c6f5ddd6da67d03162c6d51a5f72.zip
touchups
Package-Manager: portage-2.1.7.16/cvs/Linux i686
-rw-r--r--games-rpg/egoboo/Manifest4
-rw-r--r--games-rpg/egoboo/egoboo-2.7.4.ebuild15
-rw-r--r--games-rpg/egoboo/files/egoboo-2.7.4-enet.patch92
3 files changed, 83 insertions, 28 deletions
diff --git a/games-rpg/egoboo/Manifest b/games-rpg/egoboo/Manifest
index 5132de818f0d..dcf3a8d7567a 100644
--- a/games-rpg/egoboo/Manifest
+++ b/games-rpg/egoboo/Manifest
@@ -1,9 +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
+AUX egoboo-2.7.4-enet.patch 2547 RMD160 635633dab2c3f8fb1722851e2e4c7d0b0f9b5c46 SHA1 9a09b65bf1f8e727c5c6412aac32863087b3ce4d SHA256 e029bd10f65f92d5deb1d73dd68da05d3350b527675b19c43e7c41b80459fc00
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.2.2-r1.ebuild 1644 RMD160 27327e4f139973728149ce02e84ded14306d3edc SHA1 7a493eb5bcb19fe33dd50822061e4e530d0c888b SHA256 342b1a51204ca4039b6febf8bc7c3a015cd3af23fac6be31859e1ba1bfb17915
-EBUILD egoboo-2.7.4.ebuild 1399 RMD160 83abd2f498d01a2dc9008cc21f9d786a2f90daef SHA1 efb4d18dd445fdba663d12119435f616f91a922c SHA256 d67e2b58eaf83512c741518d1d9ccc715d8b756801ac28d4803afec12885a196
+EBUILD egoboo-2.7.4.ebuild 1352 RMD160 d42dd079d0b705b8f8e20dd19fa20c467c11bf7f SHA1 90970523bd73ca19635fd57403d6b0fecf46eea7 SHA256 e2bd12c331ac3f0604d29ad31b9f5fc402255d91b4395ac4be77f2140b4b26aa
MISC ChangeLog 3409 RMD160 23a3aac13370f5a1b69755d9b599e4cfd9bc56ce SHA1 7cc14fb8637a4d901d070e6c73f5c0d8418c5c80 SHA256 04dbaeb008a63ce0880163f35d74f627e2e2eed28f50789e71a5b70f1f785aa5
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
index 1da0696784d7..fcf5573989f2 100644
--- a/games-rpg/egoboo/egoboo-2.7.4.ebuild
+++ b/games-rpg/egoboo/egoboo-2.7.4.ebuild
@@ -1,9 +1,9 @@
# 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.3 2010/02/21 08:27:05 tupone Exp $
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/egoboo-2.7.4.ebuild,v 1.4 2010/02/21 11:20:12 mr_bones_ Exp $
-inherit eutils toolchain-funcs games
+EAPI=2
+inherit eutils games
DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
HOMEPAGE="http://egoboo.sourceforge.net/"
@@ -14,16 +14,15 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
-RDEPEND="virtual/opengl
+DEPEND="virtual/opengl
virtual/glu
+ media-libs/libsdl[video]
media-libs/sdl-image
- media-libs/sdl-mixer
+ media-libs/sdl-mixer[vorbis]
media-libs/sdl-ttf
net-libs/enet"
-DEPEND="${RDEPEND}"
src_prepare() {
- edos2unix game/Makefile.unix
epatch "${FILESDIR}"/${P}-enet.patch
sed -i \
-e "s:\${EGOBOO_PREFIX}/share:${GAMES_DATADIR}:" \
@@ -32,7 +31,7 @@ src_prepare() {
}
src_compile() {
- emake -C game -f Makefile.unix CC="$(tc-getCC)" || die "emake failed"
+ emake -C game -f Makefile.unix || die "emake failed"
}
src_install() {
diff --git a/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch b/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch
index 82a9f8c5025f..ded70622d013 100644
--- a/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch
+++ b/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch
@@ -1,23 +1,79 @@
---- 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
+diff -ur egoboo-2.7.4.orig/game/Makefile.unix egoboo-2.7.4/game/Makefile.unix
+--- egoboo-2.7.4.orig/game/Makefile.unix 2009-07-03 05:36:02.000000000 -0400
++++ egoboo-2.7.4/game/Makefile.unix 2010-02-21 06:11:32.096511264 -0500
+@@ -1,5 +1,5 @@
+-# note if you change the prefix also update egoboo.sh
+-PREFIX := ${HOME}/.local
++# note if you change the prefix also update egoboo.sh
++PREFIX := ${HOME}/.local
+ EGO_SRC := camera.c char.c client.c clock.c configfile.c egoboo_endian.c \
+ egoboo_fileutil.c egoboo_math.c egoboo_setup.c egoboo_strutil.c \
+ enchant.c file_common.c file_linux.c font.c game.c graphic.c\
+@@ -9,36 +9,35 @@
+ egoboo_console.c script_functions.c mad.c mpd.c egoboo_typedef.c \
+ ogl_texture.c ogl_extensions.c ogl_include.c ogl_debug.c \
+ SDL_extensions.c SDL_GL_extensions.c mesh.c
+-
+-EGO_OBJ := ${EGO_SRC:.c=.o}
+-ENET_SRC := ../enet/host.c ../enet/list.c ../enet/memory.c \
+- ../enet/packet.c ../enet/peer.c ../enet/protocol.c \
+- ../enet/unix.c
+-ENET_OBJ := ${ENET_SRC:.c=.o}
+-
+-SDL_CONF := sdl-config
+-SDLCONF_I := $(shell ${SDL_CONF} --cflags)
+-SDLCONF_L := $(shell ${SDL_CONF} --libs)
+-
+-CC := gcc
++
++EGO_OBJ := ${EGO_SRC:.c=.o}
++ENET_SRC := ../enet/host.c ../enet/list.c ../enet/memory.c \
++ ../enet/packet.c ../enet/peer.c ../enet/protocol.c \
++ ../enet/unix.c
++ENET_OBJ := ${ENET_SRC:.c=.o}
++
++SDL_CONF := sdl-config
++SDLCONF_I := $(shell ${SDL_CONF} --cflags)
++SDLCONF_L := $(shell ${SDL_CONF} --libs)
++
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../enet/include -I.. ${SDLCONF_I}
+-CFLAGS := ${OPT} ${INC}
+-LDFLAGS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image
+-
+-EGO_BIN := egoboo
+-
+-all: ${EGO_BIN}
+-
+-
+-${EGO_BIN}: ${EGO_OBJ} ${ENET_OBJ}
+- ${CC} -o $@ $^ ${LDFLAGS}
+-
+-install: ${EGO_BIN}
+- mkdir -p ${PREFIX}/bin
+- mkdir -p ${PREFIX}/libexec
+- install -m 755 ${EGO_BIN} ${PREFIX}/libexec
+- install -p -m 755 ${EGO_BIN}.sh ${PREFIX}/bin/${EGO_BIN}
+-
+-clean:
+- rm -f ${ENET_OBJ} ${EGO_OBJ} ${EGO_BIN}
+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 := egoboo
++
++all: ${EGO_BIN}
++
++
+${EGO_BIN}: ${EGO_OBJ}
- ${CC} -o $@ $^ ${LDFLAGS}
-
- install: ${EGO_BIN}
++ ${CC} -o $@ $^ ${LDFLAGS}
++
++install: ${EGO_BIN}
++ mkdir -p ${PREFIX}/bin
++ mkdir -p ${PREFIX}/libexec
++ install -m 755 ${EGO_BIN} ${PREFIX}/libexec
++ install -p -m 755 ${EGO_BIN}.sh ${PREFIX}/bin/${EGO_BIN}
++
++clean:
++ rm -f ${ENET_OBJ} ${EGO_OBJ} ${EGO_BIN}