old

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

6 files changed, 7 insertions, 335 deletions

diff --git a/games-rpg/egoboo/ChangeLog b/games-rpg/egoboo/ChangeLog
index cefb6b0754ac..8975680af735 100644
--- a/games-rpg/egoboo/ChangeLog
+++ b/games-rpg/egoboo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-rpg/egoboo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.31 2012/10/30 11:11:59 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.32 2013/01/30 19:00:22 mr_bones_ Exp $
+
+  30 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> -egoboo-2.7.4.ebuild,
+  -files/2.22-amd64.patch, -files/2.22-endian.patch,
+  -files/egoboo-2.7.4-enet.patch, -files/egoboo-2.7.4-underlink.patch:
+  old
 
   30 Oct 2012; <ago@gentoo.org> egoboo-2.8.1.ebuild:
   Stable for amd64, wrt bug #437314
diff --git a/games-rpg/egoboo/egoboo-2.7.4.ebuild b/games-rpg/egoboo/egoboo-2.7.4.ebuild
deleted file mode 100644
index 94607b508d8e..000000000000
--- a/games-rpg/egoboo/egoboo-2.7.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 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.9 2011/06/18 18:34:57 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=""
-
-DEPEND="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"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-enet.patch \
-		"${FILESDIR}"/${P}-underlink.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 || die "emake failed"
-}
-
-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/2.22-amd64.patch b/games-rpg/egoboo/files/2.22-amd64.patch
deleted file mode 100644
index c8e5ed8ba678..000000000000
--- a/games-rpg/egoboo/files/2.22-amd64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- code/egobootypedef.h.orig	2006-04-24 15:50:56.000000000 -0400
-+++ code/egobootypedef.h	2006-04-24 15:51:15.000000000 -0400
-@@ -99,7 +99,7 @@
- 	/*Return the result*/

- 	return data.f;

- }

--#elif __i386__

-+#elif defined( __i386__ ) || defined( __x86_64__ )

- #define _LITTLE_ENDIAN

- #else

- #define _BIG_ENDIAN

diff --git a/games-rpg/egoboo/files/2.22-endian.patch b/games-rpg/egoboo/files/2.22-endian.patch
deleted file mode 100644
index 02c3d578a69c..000000000000
--- a/games-rpg/egoboo/files/2.22-endian.patch
+++ /dev/null
@@ -1,178 +0,0 @@
---- egoboo/code/egobootypedef.h.orig	2004-02-15 15:19:03.000000000 +0100
-+++ egoboo/code/egobootypedef.h	2004-02-15 15:23:58.000000000 +0100
-@@ -71,13 +71,49 @@
- typedef Sint32			LONG;

- typedef Uint32			DWORD;

- typedef struct lin_RECT { LONG left; LONG right; LONG top; LONG bottom; } RECT;

-+

-+#ifdef __powerpc__

-+#define _BIG_ENDIAN

-+

-+/*

-+ * __lwbrx - Load Word Byte-Reverse Indexed

-+ *

-+ *   int __lwbrx(void *, int);

-+ */

-+#define __lwbrx(base, index)    \

-+	({ unsigned long lwbrxResult; \

-+	__asm__ volatile ("lwbrx %0, %1, %2" : "=r" (lwbrxResult) : "b%" (index), "r" (base) : "memory"); \

-+	/*return*/ lwbrxResult; })

-+

-+static float LoadFloatByteswapped( float *ptr );

-+static inline float LoadFloatByteswapped( float *ptr )

-+{

-+	union {

-+		float f;

-+		long l;

-+	} data;

-+

-+	/*Load byteswapped and store to the stack*/

-+	data.l = __lwbrx( ptr, 0 ); 

-+

-+	/*Return the result*/

-+	return data.f;

-+}

-+#elif __i386__

- #define _LITTLE_ENDIAN

-+#else

-+#define _BIG_ENDIAN

-+#error You have to implement LoadFloatByteswapped on your architecture!

-+#endif

-+

- #define LE32bitToHost( pData, pNumByte ) pData

- #define BE32bitToHost( pData, pNumByte ) pData

- #define LE16bitToHost( pData, pNumByte ) pData

- #define BE16bitToHost( pData, pNumByte ) pData

- #define EndianChange32bit( pData, pNumByte ) pData

- #define EndianChange16bit( pData, pNumByte ) pData

-+

-+

- #endif

- 

- 

---- egoboo/code/game.c.orig	2004-02-15 15:19:07.000000000 +0100
-+++ egoboo/code/game.c	2004-02-15 15:19:19.000000000 +0100
-@@ -10,6 +10,7 @@
- #define TITLE "Boo"

- 

- #define RELEASE(x) if (x) {x->Release(); x=NULL;}

-+#include <SDL/SDL_endian.h>

- 

- //---------------------------------------------------------------------------------------------

- char *os_cvrt_filename(char *name, char ch)

-@@ -2203,7 +2204,7 @@
-     #ifdef _LITTLE_ENDIAN

-     iTmp = ipIntPointer[0];

-     #else

--    iTmp = EndianS32_LtoB( ipIntPointer[0] );

-+    iTmp = SDL_SwapLE32( ipIntPointer[0] );

-     #endif

-     if(iTmp != MD2START ) return FALSE;

-     

-@@ -2284,14 +2285,14 @@
-     #ifdef _LITTLE_ENDIAN

-     int iNumCommands = ipIntPointer[9];

-     #else

--    int iNumCommands = EndianS32_LtoB( ipIntPointer[9] );

-+    int iNumCommands = SDL_SwapLE32( ipIntPointer[9] );

-     #endif

-     

- 	// Offset (in DWORDS) from the start of the file to the gl command list.

- 	#ifdef _LITTLE_ENDIAN

- 	int iCommandOffset = ipIntPointer[15]>>2;	

- 	#else

--	int iCommandOffset = EndianS32_LtoB( ipIntPointer[15] )>>2;

-+	int iCommandOffset = SDL_SwapLE32( ipIntPointer[15] )>>2;

- 	#endif

- 	

-     // Read in each command

-@@ -2306,7 +2307,7 @@
-         #ifdef _LITTLE_ENDIAN

-         iNumVertices = ipIntPointer[iCommandOffset]; iCommandOffset++; cnt++;

-         #else

--        iNumVertices = EndianS32_LtoB( ipIntPointer[iCommandOffset] );  iCommandOffset++;  cnt++;

-+        iNumVertices = SDL_SwapLE32( ipIntPointer[iCommandOffset] );  iCommandOffset++;  cnt++;

-         #endif

-         if(iNumVertices != 0)

-         {

-@@ -2337,7 +2338,7 @@
-                 #else

-                 fTmpu = LoadFloatByteswapped( &fpFloatPointer[iCommandOffset] );  iCommandOffset++;  cnt++;

-                 fTmpv = LoadFloatByteswapped( &fpFloatPointer[iCommandOffset] );  iCommandOffset++;  cnt++;

--                iTmp = EndianS32_LtoB( ipIntPointer[iCommandOffset] );  iCommandOffset++;  cnt++;

-+                iTmp = SDL_SwapLE32( ipIntPointer[iCommandOffset] );  iCommandOffset++;  cnt++;

-                 #endif

-                 madcommandu[modelindex][entry] = fTmpu-(.5/64); // GL doesn't align correctly

-                 madcommandv[modelindex][entry] = fTmpv-(.5/64); // with D3D

-@@ -2373,9 +2374,9 @@
-     iNumFrames = ipIntPointer[10];

-     iFrameOffset = ipIntPointer[14]>>2;

-     #else

--    iNumVertices = EndianS32_LtoB( ipIntPointer[6] );

--    iNumFrames = EndianS32_LtoB( ipIntPointer[10] );

--    iFrameOffset = EndianS32_LtoB( ipIntPointer[14] )>>2;

-+    iNumVertices = SDL_SwapLE32( ipIntPointer[6] );

-+    iNumFrames = SDL_SwapLE32( ipIntPointer[10] );

-+    iFrameOffset = SDL_SwapLE32( ipIntPointer[14] )>>2;

-     #endif

- 

- 

-@@ -2433,9 +2434,9 @@
-     iNumFrames = ipIntPointer[10];

-     iFrameOffset = ipIntPointer[14]>>2;

-     #else

--    iNumVertices = EndianS32_LtoB( ipIntPointer[6] );

--    iNumFrames = EndianS32_LtoB( ipIntPointer[10] );

--    iFrameOffset = EndianS32_LtoB( ipIntPointer[14] )>>2;

-+    iNumVertices = SDL_SwapLE32( ipIntPointer[6] );

-+    iNumFrames = SDL_SwapLE32( ipIntPointer[10] );

-+    iFrameOffset = SDL_SwapLE32( ipIntPointer[14] )>>2;

-     #endif

- 

- 

-@@ -3270,10 +3271,10 @@
-     fread(&itmp, 4, 1, fileread);  meshsizex = itmp;

-     fread(&itmp, 4, 1, fileread);  meshsizey = itmp;

-     #else

--    fread(&itmp, 4, 1, fileread);  if( ( int )EndianS32_LtoB( itmp ) != MAPID) return FALSE;

--    fread(&itmp, 4, 1, fileread);  numvert = ( int )EndianS32_LtoB( itmp );

--    fread(&itmp, 4, 1, fileread);  meshsizex = ( int )EndianS32_LtoB( itmp );

--    fread(&itmp, 4, 1, fileread);  meshsizey = ( int )EndianS32_LtoB( itmp );

-+    fread(&itmp, 4, 1, fileread);  if( ( int )SDL_SwapLE32( itmp ) != MAPID) return FALSE;

-+    fread(&itmp, 4, 1, fileread);  numvert = ( int )SDL_SwapLE32( itmp );

-+    fread(&itmp, 4, 1, fileread);  meshsizex = ( int )SDL_SwapLE32( itmp );

-+    fread(&itmp, 4, 1, fileread);  meshsizey = ( int )SDL_SwapLE32( itmp );

-     #endif

-     

-     numfan = meshsizex*meshsizey;

-@@ -3299,9 +3300,9 @@
-       meshfx[fan] = itmp>>16;

-       meshtile[fan] = itmp;

-       #else

--      meshtype[fan] = EndianS32_LtoB( itmp )>>24;

--      meshfx[fan] = EndianS32_LtoB( itmp )>>16;

--      meshtile[fan] = EndianS32_LtoB( itmp );

-+      meshtype[fan] = SDL_SwapLE32( itmp )>>24;

-+      meshfx[fan] = SDL_SwapLE32( itmp )>>16;

-+      meshtile[fan] = SDL_SwapLE32( itmp );

-       #endif

-       

-       fan++;

-@@ -3315,7 +3316,7 @@
-       #ifdef _LITTLE_ENDIAN

-       meshtwist[fan] = itmp;

-       #else

--      meshtwist[fan] = EndianS32_LtoB( itmp );

-+      meshtwist[fan] = SDL_SwapLE32( itmp );

-       #endif

-       

-       fan++;

-@@ -3387,7 +3388,7 @@
-         #ifdef _LITTLE_ENDIAN

-         meshvrta[cnt] = itmp;

-         #else

--        meshvrta[cnt] = EndianS32_LtoB( itmp );

-+        meshvrta[cnt] = SDL_SwapLE32( itmp );

-         #endif

-         meshvrtl[cnt] = 0;

-         

diff --git a/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch b/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch
deleted file mode 100644
index e203e85604ca..000000000000
--- a/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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

--

--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}
-+	${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}
diff --git a/games-rpg/egoboo/files/egoboo-2.7.4-underlink.patch b/games-rpg/egoboo/files/egoboo-2.7.4-underlink.patch
deleted file mode 100644
index 4130730037d3..000000000000
--- a/games-rpg/egoboo/files/egoboo-2.7.4-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- game/Makefile.unix.old	2011-06-18 20:29:27.450415076 +0200
-+++ game/Makefile.unix	2011-06-18 20:29:43.400421594 +0200
-@@ -23,7 +23,7 @@
- OPT     := -Os -Wall
- INC     := -I. -I.. ${SDLCONF_I} -DENET11
- CFLAGS  := ${CFLAGS} ${INC}
--LDFLAGS += ${SDLCONF_L} -lenet -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image
-+LDFLAGS += ${SDLCONF_L} -lenet -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lm
- 
- EGO_BIN := egoboo
-