try to fix bug 37474; use games eclass

4 files changed, 52 insertions, 50 deletions

diff --git a/games-rpg/egoboo/ChangeLog b/games-rpg/egoboo/ChangeLog
index eff90cdf45ff..69714c9fd4ec 100644
--- a/games-rpg/egoboo/ChangeLog
+++ b/games-rpg/egoboo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/egoboo
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.3 2003/10/01 23:11:46 mr_bones_ Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.4 2004/01/08 11:13:13 mr_bones_ Exp $
+
+  08 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> egoboo-2.22.ebuild,
+  files/egoboo-2.22.sh:
+  try to make things actually work (bug 37474); use games eclass
 
   01 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> egoboo-2.22.ebuild:
   chown user.group -> chown user:group
diff --git a/games-rpg/egoboo/Manifest b/games-rpg/egoboo/Manifest
index b417dc738cbd..ddaaaf6ac015 100644
--- a/games-rpg/egoboo/Manifest
+++ b/games-rpg/egoboo/Manifest
@@ -1,6 +1,6 @@
-MD5 ac9ef6834515f3591d34376677e0ad98 ChangeLog 1223
-MD5 7b1851977da3a8ac8ab7b90b9b72d542 egoboo-2.22.ebuild 1815
+MD5 36bc41ec434048c8062a7855ddf9c256 ChangeLog 1388
 MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
+MD5 b7be4c50b973c4e60548e73f33f198b8 egoboo-2.22.ebuild 1550
 MD5 51c7e53fd5f581bc0e057240613daccd files/digest-egoboo-2.22 60
 MD5 2afa7b7e1883fef3200371e1d3f3300f files/egoboo-2.22-makefile-gentoo.patch 672
-MD5 e7b50c0d2ed611fcc240bed0d000a9b3 files/egoboo-2.22.sh 56
+MD5 0a0a0fc9e09b819b73878b8ec3c61f5f files/egoboo-2.22.sh 279
diff --git a/games-rpg/egoboo/egoboo-2.22.ebuild b/games-rpg/egoboo/egoboo-2.22.ebuild
index d10bf016245f..95a314a18de9 100644
--- a/games-rpg/egoboo/egoboo-2.22.ebuild
+++ b/games-rpg/egoboo/egoboo-2.22.ebuild
@@ -1,63 +1,57 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.2 2003/10/01 23:11:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/egoboo-2.22.ebuild,v 1.3 2004/01/08 11:13:13 mr_bones_ Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic games
 
-N=egoboo
-S=${WORKDIR}/${N}
-DESCRIPTION="egoboo: a 3d dungeon crawling adventure in the spirit of NetHack"
-SRC_URI="mirror://sourceforge/${PN}/ego${PV/./}.tar.gz"
+S="${WORKDIR}/${PN}"
+DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
 HOMEPAGE="http://egoboo.sourceforge.net/"
-KEYWORDS="x86 -ppc"
+SRC_URI="mirror://sourceforge/${PN}/ego${PV/./}.tar.gz"
+
+KEYWORDS="-* x86"
+LICENSE="GPL-2"
 SLOT="0"
+IUSE=""
 
 DEPEND="virtual/x11
 	virtual/opengl
 	virtual/glu
-	media-libs/libsdl"
-LICENSE="GPL-2"
+	media-libs/libsdl
+	>=sys-apps/sed-4"
 
 src_unpack() {
-	SDLLIBS=`sdl-config --libs`
-	SDLFLAGS=`sdl-config --cflags`
+	replace-flags "-march=athlon*" "-march=i686"
+	replace-flags "-march=pentium4" "-march=i686"
 
 	unpack ${A}
-	cd ${S}/code
-	patch < ${FILESDIR}/${P}-makefile-gentoo.patch || die "Patch Failed"
-	mv Makefile Makefile.bak
-	echo SDLLIBS=${SDLLIBS} > /tmp/sdllibs.tmp || die "file already exists"
-	echo SDLFLAGS=${SDLFLAGS} > /tmp/sdlflags.tmp || die "file already exists"a
-	cat /tmp/sdllibs.tmp /tmp/sdlflags.tmp Makefile.bak > Makefile
-	rm -f /tmp/sdllibs.tmp
-	rm -f /tmp/sdlflags.tmp
+	cd ${S}
+
+	sed -i \
+		-e "/^CC=/ s:=.*:=${CC}:" \
+		-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"
 }
 
 src_compile() {
-	replace-flags "-march=athlon*" "-march=i686"
-	replace-flags "-march=pentium4" "-march=i686"
-
 	cd code
-	make clean || die "failed build"
-	make egoboo || die "failed build"
-	}
+	make clean || die "make clean failed"
+	emake egoboo || die "emake failed"
+}
 
 src_install () {
-	dodir /usr/share/egoboo
-	dodir /usr/bin
-	dodoc egoboo.txt gpl.txt
-	cp -r basicdat ${D}/usr/share/egoboo
-	cp code/egoboo ${D}/usr/share/egoboo
-	cp -r import ${D}/usr/share/egoboo
-	cp -r modules ${D}/usr/share/egoboo
-	cp -r players ${D}/usr/share/egoboo
-	cp -r text ${D}/usr/share/egoboo
-	cp controls.txt ${D}/usr/share/egoboo
-	cp setup.txt ${D}/usr/share/egoboo
-	cp ${FILESDIR}/${P}.sh ${D}/usr/bin/egoboo
-
-	#chown to root:users and chmod g+w to let regular users run the app
-	cd ${D}/usr/share/egoboo
-	chown -R root:users *
-	chmod -R g+w setup.txt basicdat players
+	dogamesbin "${T}/egoboo" || die "dogamesbin failed"
+	dodoc egoboo.txt || die "dodoc failed"
+	dodir "${GAMES_DATADIR}/${PN}" "${GAMES_BINDIR}" || die "dodir failed"
+	cp -R basicdat/ import/ modules/ players/ text/ \
+		code/egoboo controls.txt setup.txt \
+		"${D}${GAMES_DATADIR}/${PN}" || die "cp failed"
+
+	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/files/egoboo-2.22.sh b/games-rpg/egoboo/files/egoboo-2.22.sh
index feea548d0885..48206b65a26b 100644
--- a/games-rpg/egoboo/files/egoboo-2.22.sh
+++ b/games-rpg/egoboo/files/egoboo-2.22.sh
@@ -1,3 +1,7 @@
 #!/bin/sh
-cd /usr/share/egoboo
-/usr/share/egoboo/egoboo
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/files/egoboo-2.22.sh,v 1.2 2004/01/08 11:13:13 mr_bones_ Exp $
+
+cd GENTOODIR/egoboo
+exec ./egoboo $@