patched for amd64 and added ~amd64

Package-Manager: portage-2.0.54

4 files changed, 29 insertions, 25 deletions

diff --git a/games-rpg/egoboo/ChangeLog b/games-rpg/egoboo/ChangeLog
index b0b34e573a24..4a8fdbb3ed83 100644
--- a/games-rpg/egoboo/ChangeLog
+++ b/games-rpg/egoboo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-rpg/egoboo
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.11 2006/03/14 04:18:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.12 2006/03/14 20:23:43 deltacow Exp $
+
+  14 Mar 2006; Scott Stoddard <deltacow@gentoo.org> +files/2.22-amd64.patch,
+  egoboo-2.22.ebuild:
+  Added patch to determine correct endianness for amd64 submitted by Bruno 
+  Roggeri <bruno.roggeri@metz.supelec.fr> and marked ~amd64.
 
   14 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org> egoboo-2.22.ebuild:
   X is implicit
diff --git a/games-rpg/egoboo/Manifest b/games-rpg/egoboo/Manifest
index 4aa57994101e..f34761cc06e7 100644
--- a/games-rpg/egoboo/Manifest
+++ b/games-rpg/egoboo/Manifest
@@ -1,21 +1,8 @@
-MD5 f4e07c244b40aaab040c0e41637ca330 ChangeLog 2052
-RMD160 f1cada181be4d4c8230a90f722bc41871aecf23f ChangeLog 2052
-SHA256 23bd28b02578486485e79fe11475d3b98729f4305d57a623a9e19a6c5ae81e0d ChangeLog 2052
-MD5 353c5e6a3f5db2dc9d188cdec0cba79b egoboo-2.22.ebuild 1516
-RMD160 b6e159d27c0bc5f58a761815000636f05981fe5e egoboo-2.22.ebuild 1516
-SHA256 4a53098eadffc0950f20e34c016b20fc41dee3b5c32466fed7ad3ddcdbc2a98b egoboo-2.22.ebuild 1516
+MD5 26a8fe8d0ad7a069d6b6e71e5ed636c9 ChangeLog 2288
+MD5 407414dbcadc2df154e2dec4cf065ae1 egoboo-2.22.ebuild 1553
+MD5 c3d07f2d6d88be2c9c9835e371cc8d33 files/2.22-amd64.patch 399
 MD5 0fc47d542e1b356cc9f9a99c4e8884f6 files/2.22-endian.patch 6416
-RMD160 21e216ae006cf57521b1982291afaebaec679c08 files/2.22-endian.patch 6416
-SHA256 1beb221b609b7dca4d8b2b0682d7a58675046cb7cb727c734640184d84d41307 files/2.22-endian.patch 6416
 MD5 51c7e53fd5f581bc0e057240613daccd files/digest-egoboo-2.22 60
-RMD160 d30daf132e60ba1bbce78058a8be4c8af8389e30 files/digest-egoboo-2.22 60
-SHA256 3810d0542778012a1cc67211f5b42cced259e2c58ad990f966f852d38a43816c files/digest-egoboo-2.22 60
 MD5 2afa7b7e1883fef3200371e1d3f3300f files/egoboo-2.22-makefile-gentoo.patch 672
-RMD160 660ad9c7f96c6b8e555402c19d3ed54fb48b3dcc files/egoboo-2.22-makefile-gentoo.patch 672
-SHA256 962e0e1bffbc3f6b065fa0549dcb9df0df8a50df9c179a0c10e2db0f15680f6d files/egoboo-2.22-makefile-gentoo.patch 672
 MD5 53d4b92337a6d90ccfc2e0256d47d46f files/egoboo-2.22.sh 269
-RMD160 4a6649d709ab5f8cc61bf1b0ede2ab6f835d4500 files/egoboo-2.22.sh 269
-SHA256 f3ed493ce0ba045fbbfc167bf435d57369fc1bbaedf215df7f82abf8907fd441 files/egoboo-2.22.sh 269
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
-SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-rpg/egoboo/egoboo-2.22.ebuild b/games-rpg/egoboo/egoboo-2.22.ebuild
index 30f8ccff1af6..d7263e717112 100644
--- a/games-rpg/egoboo/egoboo-2.22.ebuild
+++ b/games-rpg/egoboo/egoboo-2.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/egoboo-2.22.ebuild,v 1.14 2006/03/14 04:18:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/egoboo-2.22.ebuild,v 1.15 2006/03/14 20:23:43 deltacow Exp $
 
 inherit eutils flag-o-matic toolchain-funcs games
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/ego${PV/./}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ppc x86"
+KEYWORDS="-* ~amd64 ppc x86"
 IUSE=""
 
 DEPEND="virtual/opengl
@@ -20,27 +20,27 @@ DEPEND="virtual/opengl
 S=${WORKDIR}/${PN}
 
 src_unpack() {
-	replace-cpu-flags 'athlon*' pentium4 i686
+	use !amd64 && replace-cpu-flags 'athlon*' pentium4 i686
 
 	unpack ${A}
 	cd "${S}"
 
-	sed -i \
-		-e "/^CC=/ s:=.*:=$(tc-getCC):" \
-		-e "s:-ffast-math -funroll-loops -O3 -g:${CFLAGS}:" code/Makefile \
-		|| die "sed code/Makefile failed"
 	sed \
 		-e "s:GENTOODIR:${GAMES_DATADIR}:" "${FILESDIR}/${P}.sh" \
 		> "${T}/egoboo" || die "sed wrapper failed"
 
 	# Fix endianess using SDL
 	epatch ${FILESDIR}/${PV}-endian.patch
+
+	# amd64 patch must be applied after ${PV}-endian.patch
+	# this addresses bug #104271
+	epatch ${FILESDIR}/${PV}-amd64.patch
 }
 
 src_compile() {
 	cd code
 	make clean || die "make clean failed"
-	emake egoboo || die "emake failed"
+	emake FLAGS="-D_LINUX ${CFLAGS}" CC="$(tc-getCC)" egoboo || die "emake failed"
 }
 
 src_install () {
diff --git a/games-rpg/egoboo/files/2.22-amd64.patch b/games-rpg/egoboo/files/2.22-amd64.patch
new file mode 100644
index 000000000000..5e3ea57a0c1a
--- /dev/null
+++ b/games-rpg/egoboo/files/2.22-amd64.patch
@@ -0,0 +1,12 @@
+diff -ur egoboo/code/egobootypedef.h egoboo.new/code/egobootypedef.h

+--- egoboo/code/egobootypedef.h	2005-08-31 18:16:26.000000000 +0200

++++ egoboo/code/egobootypedef.h	2005-08-31 18:08:12.000000000 +0200

+@@ -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