expand filename before passing to unpack (bug #107532); tidy

Package-Manager: portage-2.0.51.22-r3

diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog
index a5bb1b5e03414bdab2633eb57630dc4734ad5aa9..56186f46061aa38a25eba5f37de9a02b19f21530 100644 (file)
--- a/games-engines/exult/ChangeLog
+++ b/games-engines/exult/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-engines/exult
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.12 2005/05/06 15:03:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.13 2005/10/07 03:49:18 mr_bones_ Exp $
+
+  06 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org> exult-1.2.ebuild:
+  expand filename before passing to unpack (bug #107532); tidy
 
   06 May 2005; Sven Wegener <swegener@gentoo.org> exult-1.2.ebuild:
   Removed * postfix from <, <=, >= and > dependencies.

diff --git a/games-engines/exult/Manifest b/games-engines/exult/Manifest
index 99812296041fd33fcf8fdeed36d0271ab1dae7c0..20606c9fff578588da64ccb07443e233d6ee02c2 100644 (file)
--- a/games-engines/exult/Manifest
+++ b/games-engines/exult/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ecf9763436c2e1c7ad1c4bf89d3202ec exult-1.2.ebuild 2570
-MD5 1168f77aaa56e214673f58bc384d02c8 ChangeLog 1614
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 f57e6d96772375d1636621b8505cfbc8 ChangeLog 1752
+MD5 3272a723ea396097f3a9e0cbb64d1ed7 exult-1.2.ebuild 2570
 MD5 b1ba6382930a1604b072fe00fad87c3a files/digest-exult-1.2 194
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCe4dII1lqEGTUzyQRAmYMAJ46PtdiEOyHsdBDcRkCPfe5JlyEgwCfSTZ2
-y+PYLZfRvnq3kx5o/zOSrO0=
-=KKCr
------END PGP SIGNATURE-----

diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild
index 83e3a4c2cc97e77f2e2e3af6b575a99db577f83d..7c3a83cb651afdf1cae7a69137a52f6347ca011d 100644 (file)
--- a/games-engines/exult/exult-1.2.ebuild
+++ b/games-engines/exult/exult-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.4 2005/05/06 15:03:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.5 2005/10/07 03:49:18 mr_bones_ Exp $
 
 inherit games
 
@@ -12,8 +12,8 @@ SRC_URI="mirror://sourceforge/exult/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~amd64"
-IUSE="timidity zlib mmx 3dnow"
+KEYWORDS="~amd64 ppc ~sparc x86"
+IUSE="3dnow mmx timidity zlib"
 
 RDEPEND=">=media-libs/libsdl-1.2
        >=media-libs/sdl-mixer-1.2.4
@@ -33,8 +33,8 @@ src_unpack() {
        unpack ${P}.tar.gz
        mkdir music/
        cd music/
-       unpack U7MusicOGG_[12]of2.zip
-       cd ${S}
+       unpack U7MusicOGG_{1,2}of2.zip
+       cd "${S}"
        sed -i \
                -e "s/u7siinstrics.data/u7siintrinsics.data/" \
                usecode/ucxt/data/Makefile.in \
@@ -51,18 +51,18 @@ src_compile() {
                --disable-dependency-tracking \
                --disable-tools \
                --disable-opengl \
+               $(use_enable 3dnow) \
+               $(use_enable mmx) \
                $(use_enable timidity) \
                $(use_enable zlib zip-support) \
-               $(use_enable mmx) \
-               $(use_enable 3dnow) \
                || die
        emake || die "emake failed"
 }
 
 src_install() {
        make DESTDIR="${D}" \
-               desktopdir='/usr/share/applications/' \
-               icondir='/usr/share/icons' \
+               desktopdir=/usr/share/applications/ \
+               icondir=/usr/share/icons \
                install || die "make install failed"
        # no need for this directory for just playing the game
        rm -rf "${D}${GAMES_DATADIR}/${PN}/estudio"