Using right compiler. Moving 2.22 to 2.2.2 (1st pass)

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

4 files changed, 73 insertions, 6 deletions

diff --git a/games-rpg/egoboo/ChangeLog b/games-rpg/egoboo/ChangeLog
index d9233d2c3951..f520f495ac46 100644
--- a/games-rpg/egoboo/ChangeLog
+++ b/games-rpg/egoboo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/egoboo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.17 2010/02/21 08:06:29 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.18 2010/02/21 08:27:05 tupone Exp $
+
+*egoboo-2.2.2-r1 (21 Feb 2010)
+
+  21 Feb 2010; Tupone Alfredo <tupone@gentoo.org> +egoboo-2.2.2-r1.ebuild,
+  egoboo-2.7.4.ebuild:
+  Using right compiler. Moving 2.22 to 2.2.2 (1st pass)
 
   21 Feb 2010; Tupone Alfredo <tupone@gentoo.org> egoboo-2.7.4.ebuild:
   Adding net-libs/enet dependency
diff --git a/games-rpg/egoboo/Manifest b/games-rpg/egoboo/Manifest
index 4690d8a36e30..9e3692ecffc0 100644
--- a/games-rpg/egoboo/Manifest
+++ b/games-rpg/egoboo/Manifest
@@ -3,7 +3,8 @@ AUX 2.22-endian.patch 6416 RMD160 21e216ae006cf57521b1982291afaebaec679c08 SHA1
 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.2.2-r1.ebuild 1646 RMD160 b09ffcd3dc7577b7aeb19d737a9df53a8a1227c2 SHA1 9fd728fecdba7a0f6f2e14ec06592784681ce378 SHA256 391fd5169cdd4df7deb1327d39253adcc7a86f4eb86d5ec17bb662950e9fdf68
 EBUILD egoboo-2.22-r1.ebuild 1623 RMD160 a56b60767d20e57089c5ab1885ec6e3f1a0ccdff SHA1 abc74fd832fd648f6b52190efd2a21e9fb9348b9 SHA256 9681f3ab3b32fe0411484b4a9c74b7f159b3b4d11dacdb4bd46ce9ddf8fb7194
-EBUILD egoboo-2.7.4.ebuild 1344 RMD160 f718ddafbbb8bb4c2d266cb6403fc037f2390832 SHA1 cf4032e4a4adfa23b05d9e1d80c9c9b6232bf2a8 SHA256 eb9a9b10189155da3055c09a8e8e319c56896c0ad16ccbdfc7885d086a644a23
-MISC ChangeLog 3086 RMD160 571ad2aa9b1ff8a8beee4bcc898ed93bcbbb5487 SHA1 1a750821c79efb008d6076b25eb3f4cfe3224c32 SHA256 5f91db2dd5ad9eda25289bbf2c8aabd97fb4c8896b9296b12eee1652020f65b7
+EBUILD egoboo-2.7.4.ebuild 1399 RMD160 83abd2f498d01a2dc9008cc21f9d786a2f90daef SHA1 efb4d18dd445fdba663d12119435f616f91a922c SHA256 d67e2b58eaf83512c741518d1d9ccc715d8b756801ac28d4803afec12885a196
+MISC ChangeLog 3273 RMD160 d7c2bc48c81a0ce1f6109c02f88f8b9f8a33313a SHA1 3d39e8fcdee2265f4b418c0e20d8fc9f6e164209 SHA256 cb0ab7e6457fc9950720915dd97003ce8a820cc1c269484a17f5624ee5be8ad8
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-rpg/egoboo/egoboo-2.2.2-r1.ebuild b/games-rpg/egoboo/egoboo-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..2e6af0965401
--- /dev/null
+++ b/games-rpg/egoboo/egoboo-2.2.2-r1.ebuild
@@ -0,0 +1,60 @@
+# 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.2.2-r1.ebuild,v 1.1 2010/02/21 08:27:05 tupone Exp $
+
+inherit eutils flag-o-matic toolchain-funcs games
+
+PVOLD="2.22"
+
+DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
+HOMEPAGE="http://egoboo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/ego${PVOLD/./}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/opengl
+	virtual/glu
+	media-libs/libsdl"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	use !amd64 && replace-cpu-flags 'athlon*' pentium4 i686
+
+	unpack ${A}
+	cd "${S}"
+
+	# Fix endianess using SDL
+	# amd64 patch must be applied after ${PV}-endian.patch
+	# this addresses bug #104271
+	epatch \
+		"${FILESDIR}"/${PVOLD}-endian.patch \
+		"${FILESDIR}"/${PVOLD}-amd64.patch
+}
+
+src_compile() {
+	cd code
+	emake clean || die "make clean failed"
+	emake FLAGS="-D_LINUX ${CFLAGS}" CC="$(tc-getCC)" egoboo || die "emake failed"
+}
+
+src_install () {
+	games_make_wrapper ${PN} ./${PN} "${GAMES_DATADIR}/${PN}"
+	dodoc egoboo.txt
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r basicdat/ import/ modules/ players/ text/ \
+		code/egoboo controls.txt setup.txt \
+		|| die "doins failed"
+	# FIXME: this is stupid.  should be patched to run out of GAMES_BINDIR
+	fperms 750 "${GAMES_DATADIR}/${PN}/${PN}"
+	newicon basicdat/icon.bmp ${PN}.bmp
+	make_desktop_entry ${PN} Egoboo /usr/share/pixmaps/${PN}.bmp
+
+	prepgamesdirs
+	# ugly, but the game needs write here.
+	cd "${D}${GAMES_DATADIR}/${PN}"
+	chmod -R g+w setup.txt basicdat players import
+}
diff --git a/games-rpg/egoboo/egoboo-2.7.4.ebuild b/games-rpg/egoboo/egoboo-2.7.4.ebuild
index 79d3ca1c0835..1da0696784d7 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.2 2010/02/21 08:06:29 tupone Exp $
+# $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
 
-inherit eutils games
+inherit eutils toolchain-funcs games
 
 DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
 HOMEPAGE="http://egoboo.sourceforge.net/"
@@ -32,7 +32,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake -C game -f Makefile.unix
+	emake -C game -f Makefile.unix CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {