use more games eclass; tidy

diff --git a/games-action/armagetron/ChangeLog b/games-action/armagetron/ChangeLog
index 9e991671d6a2a763e9213cff742fa21cdebbe736..57fd4cc07bcbbe92cb7965e0c2af83dc5abcb3d6 100644 (file)
--- a/games-action/armagetron/ChangeLog
+++ b/games-action/armagetron/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/armagetron
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/armagetron/ChangeLog,v 1.5 2004/06/24 21:51:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/armagetron/ChangeLog,v 1.6 2004/12/07 09:32:13 mr_bones_ Exp $
+
+  07 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  armagetron-0.2.6.0.ebuild:
+  use more games eclass; tidy
 
   23 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml:
   add game team to the metadata file in addition to Luke-Jr.

diff --git a/games-action/armagetron/Manifest b/games-action/armagetron/Manifest
index 024ac28244715b5fdf1a6dd86ee97291335e958f..b9dfa4cdf85dc1a115777419c7b2f8906a7ab383 100644 (file)
--- a/games-action/armagetron/Manifest
+++ b/games-action/armagetron/Manifest
@@ -1,5 +1,5 @@
-MD5 5e347839ba90d75bdd53cda34908aba8 ChangeLog 2725
-MD5 7edc1c4041d31562ae8d37180a32501a armagetron-0.2.6.0.ebuild 2015
+MD5 7bbdf8cd83b959dc051b5846d77b456e ChangeLog 2841
+MD5 8abcc483a1617a96316bf53cfda824f1 armagetron-0.2.6.0.ebuild 1794
 MD5 18f4639411b07b64d8b764c6af213eb5 metadata.xml 283
 MD5 b099d1ac147af025edade2ecdb5d4ba0 files/armagetron-0.1.4.9-Makefile.global.in.patch 400
 MD5 778ff6fa5181b49c27da527ddf9a246f files/armagetron-0.1.4.9-configure.patch 422

diff --git a/games-action/armagetron/armagetron-0.2.6.0.ebuild b/games-action/armagetron/armagetron-0.2.6.0.ebuild
index 72ff1df004dfa06541a26912a09c6d98ea3bb197..379d499778783743d94f65aed69a5db7ff25fcc6 100644 (file)
--- a/games-action/armagetron/armagetron-0.2.6.0.ebuild
+++ b/games-action/armagetron/armagetron-0.2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/armagetron/armagetron-0.2.6.0.ebuild,v 1.6 2004/06/24 21:51:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/armagetron/armagetron-0.2.6.0.ebuild,v 1.7 2004/12/07 09:32:13 mr_bones_ Exp $
 
 inherit games flag-o-matic
 
@@ -22,45 +22,37 @@ RDEPEND="virtual/x11
        sys-libs/zlib
        media-libs/libpng"
 DEPEND="${RDEPEND}
-       >=sys-apps/sed-4
        app-arch/unzip"
 
 src_unpack() {
-       unpack ${PN}-${PV}.tar.bz2
-       unpack moviesounds_fq.zip
-       unpack moviepack.zip
+       unpack ${A}
        set > /tmp/emerge-env.txt
-       cd ${S}
+       cd "${S}"
        # Uses $SYNC which which conflicts with emerge
        sed -i \
-               -e 's/$(SYNC)/$(SYNCDISK)/' Makefile.global.in || \
-                       die 'sed Makefile.global.in failed'
-}
-
-src_compile() {
+               -e 's/$(SYNC)/$(SYNCDISK)/' Makefile.global.in \
+               || die 'sed Makefile.global.in failed'
        filter-flags -fno-exceptions
-       egamesconf || die
-       emake || die
 }
 
 src_install() {
        # make install for armagetron is non-existant
-       dodir ${GAMES_BINDIR}
-       dodir ${GAMES_LIBDIR}/${PN}
-       dodir ${GAMES_DATADIR}/${PN}
-       dodir /usr/share/fonts
-       cp src/tron/armagetron ${D}/${GAMES_LIBDIR}/${PN} || die "No Armagetron Executable"
+       dodir "${GAMES_LIBDIR}/${PN}" "${GAMES_DATADIR}/${PN}" /usr/share/fonts
+       cp src/tron/armagetron "${D}/${GAMES_LIBDIR}/${PN}" \
+               || die "cp failed"
        cp -r arenas models sound textures language config \
-               ${D}/${GAMES_DATADIR}/${PN}/ || die "Missing ArmageTRON data"
+               "${D}/${GAMES_DATADIR}/${PN}/" \
+               || die "cp failed"
        # maybe convert this to a .png or something
        #cp tron.ico ${D}/${GAMES_DATADIR}/${PN}
        dohtml doc
-       newgamesbin ${FILESDIR}/${PN}-0.2.4-r1.sh ${PN} || die "ArmageTRON shell script not found"
-       dosed "s:DATADIR:${GAMES_DATADIR}/${PN}:" ${GAMES_BINDIR}/${PN}
-       dosed "s:BINDIR:${GAMES_LIBDIR}/${PN}:" ${GAMES_BINDIR}/${PN}
-       cp -r ../moviepack ${D}/${GAMES_DATADIR}/${PN}
-       cp -r ../moviesounds ${D}/${GAMES_DATADIR}/${PN}
-       chmod -R a+r ${D}
-       chmod a+rx ${D}/${GAMES_BINDIR}/${PN}
-       chmod a+rx ${D}/${GAMES_LIBDIR}/${PN}/${PN}
+       newgamesbin "${FILESDIR}/${PN}-0.2.4-r1.sh" ${PN} \
+               || die "newgamesbin failed"
+       sed -i \
+               -e "s:DATADIR:${GAMES_DATADIR}/${PN}:" \
+               -e "s:BINDIR:${GAMES_LIBDIR}/${PN}:" "${D}${GAMES_BINDIR}/${PN}" \
+               || die "sed failed"
+       cp -r ../moviepack "${D}/${GAMES_DATADIR}/${PN}" || die "cp failed"
+       cp -r ../moviesounds "${D}/${GAMES_DATADIR}/${PN}" || die "cp failed"
+       prepgamesdirs
 }