unpack in src_unpack; use games.eclass functions; tidy

2 files changed, 37 insertions, 26 deletions

diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 634de5d8eb01..bf60b88ddc0b 100644
--- a/games-rpg/eternal-lands/ChangeLog
+++ b/games-rpg/eternal-lands/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/eternal-lands
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.1 2004/08/27 16:40:01 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.2 2004/08/27 20:10:47 mr_bones_ Exp $
+
+  27 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  eternal-lands-1.0.0.ebuild:
+  unpack in src_unpack; use games.eclass functions; tidy
 
 *eternal-lands-1.0.0 (17 Aug 2004)
 
diff --git a/games-rpg/eternal-lands/eternal-lands-1.0.0.ebuild b/games-rpg/eternal-lands/eternal-lands-1.0.0.ebuild
index 21d3146c9598..fc036c74c7d6 100644
--- a/games-rpg/eternal-lands/eternal-lands-1.0.0.ebuild
+++ b/games-rpg/eternal-lands/eternal-lands-1.0.0.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.0.0.ebuild,v 1.1 2004/08/27 16:40:01 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.0.0.ebuild,v 1.2 2004/08/27 20:10:47 mr_bones_ Exp $
 
 inherit games
 
-DESCRIPTION="Eternal Lands is an online MMORPG written in C and SDL"
+DESCRIPTION="An online MMORPG written in C and SDL"
 HOMEPAGE="http://www.eternal-lands.com"
 TMP_PV=${PV%_p*}
-SRC_URI="http://el.tfm.ro/el_${TMP_PV//.}.zip ftp://ftp.berlios.de/pub/elc/elc_${PV//.}.tgz"
+SRC_URI="http://el.tfm.ro/el_${TMP_PV//.}.zip
+	ftp://ftp.berlios.de/pub/elc/elc_${PV//.}.tgz"
 
 LICENSE="eternal_lands"
 SLOT="0"
@@ -15,51 +16,57 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="virtual/x11
-		virtual/opengl
-		>=media-libs/libsdl-1.2.5
-		>=media-libs/sdl-net-1.2.5
-		>media-libs/openal-20020127
-		media-libs/libvorbis
-		>=dev-libs/libxml2-2.6.7"
-
-RDEPEND=${DEPEND}
+	virtual/opengl
+	>=media-libs/libsdl-1.2.5
+	>=media-libs/sdl-net-1.2.5
+	>media-libs/openal-20020127
+	media-libs/libvorbis
+	>=dev-libs/libxml2-2.6.7"
 
 S="${WORKDIR}/elc"
 
-src_compile() {
-	cd ${S}
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
 	sed \
 		-e "s@CFLAGS=\$(PLATFORM) -Wall -ggdb -pipe@CFLAGS=${CFLAGS}@g" \
 		-e 's@OPTIONS=@OPTIONS=-DDATA_DIR="\\"${GAMES_DATADIR}/${PN}/\\"" @g' \
-		Makefile.linux > Makefile || die "sed failed"
-	emake || die "emake failed"
-	cp el.x86.linux.bin ../el.x86.linux.bin || die "copy failed"
-	cp eternal_lands_license.txt ../LICENSE || die "copy failed"
+		Makefile.linux > Makefile \
+		|| die "sed failed"
 	sed \
 		-e 's/#browser/browser/g' \
 		-e 's/browser = mozilla/#browser = mozilla/g' \
 		-e "s@data_dir = /usr/local/games/el/@#data_dir = ${GAMES_DATADIR}/${PN}/@g" \
-		el.ini > ../el.ini || die "sed failed"
+		el.ini > ../el.ini \
+		|| die "sed failed"
 	cd ..
-	cp license.txt EULA || die "copy failed"
-	if [[ -e Encyclopedia/images/.xvpics ]]; then
-		rm -r Encyclopedia/images/.xvpics || die "could not clean xvpics"
-	fi
+	cp license.txt EULA || die "cp failed"
+	rm -fr Encyclopedia/images/.xvpics
+}
+
+src_compile() {
+	emake || die "emake failed"
+	cp el.x86.linux.bin ../el.x86.linux.bin || die "cp failed"
 }
 
 src_install () {
 	cd "${WORKDIR}"
-	insinto ${GAMES_DATADIR}/${PN}
+	insinto "${GAMES_DATADIR}/${PN}"
 	newgamesbin el.x86.linux.bin el
-	dodoc changes.txt faq.txt readme.txt LICENSE EULA
+	dodoc changes.txt faq.txt readme.txt EULA
 	doins el.ini *.lst el_icon.png icon.bmp global_filters.txt global_ignores.txt \
 		|| die "Files failed to be installed"
 	cp -R 2dobjects 3dobjects Encyclopedia maps md2 sound textures tiles \
-		${D}/${GAMES_DATADIR}/${PN} || die "copy failed"
+		"${D}/${GAMES_DATADIR}/${PN}" \
+		|| die "copy failed"
+	prepgamesdirs
 }
 
 pkg_postinst() {
+	games_pkg_postinst
+	echo
 	einfo "To run the game: el"
 	einfo "Copy ${GAMES_DATADIR}/${PN}/el.ini to ~/.elc/"
 	einfo "to make per-user changes."
+	echo
 }