Added a patch from Darren West <deefster@cheerful.com> to do a couple minor cleanups...

Package-Manager: portage-2.1.2.1

diff --git a/games-rpg/nwn-data/ChangeLog b/games-rpg/nwn-data/ChangeLog
index e09988bd27b05da2cbc677c453712466b7d6509a..62983038968f562c10943cf5350a2d0f044affe0 100644 (file)
--- a/games-rpg/nwn-data/ChangeLog
+++ b/games-rpg/nwn-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-rpg/nwn-data
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.27 2007/03/11 16:45:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.28 2007/03/12 13:16:10 wolf31o2 Exp $
+
+  12 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  nwn-data-1.29-r1.ebuild:
+  Added a patch from Darren West <deefster@cheerful.com> to do a couple minor
+  cleanups, and fixed some syntax. Closing bug #170531.
 
   11 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   nwn-data-1.29-r1.ebuild:

diff --git a/games-rpg/nwn-data/Manifest b/games-rpg/nwn-data/Manifest
index 1f08a187949d92ddb40c9c9b4b9c6a1749129f15..ba51e9627cf2273b48fbebaab5e949c5721e6e1b 100644 (file)
--- a/games-rpg/nwn-data/Manifest
+++ b/games-rpg/nwn-data/Manifest
@@ -8,18 +8,18 @@ DIST nwitalian129.tar.gz 3926804 RMD160 62d6e3219a88636df60db2c8339337fa277c8467
 DIST nwn.png 4296 RMD160 958ed2051e91b0ab5f7ae8892c8ed3012cfe3900 SHA1 a4de1822df20ffaa18ff14060d00ea75eee56939 SHA256 9703cb47b32d6bf0202198ab490395046d2ef4ffdde22dca91748a966134e139
 DIST nwresources129.tar.gz 1212356127 RMD160 1a986d12bc3153ff7646053e60d610155944b5ac SHA1 6f399dbf876f357a57096996447d4b9fa68bcb58 SHA256 40e7bb8aebae931c2ce05f199ed15714845b403c4a6d9fab88092e784214bee2
 DIST nwspanish129.tar.gz 3912516 RMD160 8fd2592cfc92246c64be2930a5a4032fe8c07ed1 SHA1 6d60d168a232f845913b3bb41e91362faf29bcbe SHA256 100833e91e3f729a473de3372019e1086aac444f3c90c799af43d16833b7a1ed
-EBUILD nwn-data-1.29-r1.ebuild 16629 RMD160 2ca2bc6eda28ccab42e62f7d0dcfaabffc755c94 SHA1 2f02fdca9f48efa4d5c2060acbe95066c0f9b76b SHA256 a115d8e4a63f4677fd1110c9176fc5121a6c3e77a7736aed4953ccef150b9348
-MD5 f15c3ac7babf7c3fb79bb7f909415174 nwn-data-1.29-r1.ebuild 16629
-RMD160 2ca2bc6eda28ccab42e62f7d0dcfaabffc755c94 nwn-data-1.29-r1.ebuild 16629
-SHA256 a115d8e4a63f4677fd1110c9176fc5121a6c3e77a7736aed4953ccef150b9348 nwn-data-1.29-r1.ebuild 16629
+EBUILD nwn-data-1.29-r1.ebuild 16686 RMD160 2bf57ca12cd85a2dfd60c6294cfd0ffdf698d185 SHA1 bcc3aaa1b5fbfd7eec3a2d4bbd328ad1c496d389 SHA256 23576633709fe7bece8407e707eb82cbb3e262f4018fb081f288882b948d2686
+MD5 09c6a4cd3dabbcd1dc30da1ee3b7f31a nwn-data-1.29-r1.ebuild 16686
+RMD160 2bf57ca12cd85a2dfd60c6294cfd0ffdf698d185 nwn-data-1.29-r1.ebuild 16686
+SHA256 23576633709fe7bece8407e707eb82cbb3e262f4018fb081f288882b948d2686 nwn-data-1.29-r1.ebuild 16686
 EBUILD nwn-data-1.29.ebuild 6794 RMD160 4a4d79ec38da44687f991c660991e028174e44c0 SHA1 32dc813450f215748f6fd4a022f35f1497a3d5c6 SHA256 a303e01014990b144c1a624be9dd9aae20563d47e6721d0ff8de3fae13087e83
 MD5 d01c0a74a938fb056ccc9089e96c30b5 nwn-data-1.29.ebuild 6794
 RMD160 4a4d79ec38da44687f991c660991e028174e44c0 nwn-data-1.29.ebuild 6794
 SHA256 a303e01014990b144c1a624be9dd9aae20563d47e6721d0ff8de3fae13087e83 nwn-data-1.29.ebuild 6794
-MISC ChangeLog 5016 RMD160 1d19c501cacae18e9e6e942e020e62e806ec8e63 SHA1 63adb3637e5fa8ffc1c80f988b713f86907c251b SHA256 a4508351a25a9012d8afa987be15249a9fe8f83ac885043fa3f2d5101818e9ab
-MD5 7a59c307bd975e91e8676d352abffa44 ChangeLog 5016
-RMD160 1d19c501cacae18e9e6e942e020e62e806ec8e63 ChangeLog 5016
-SHA256 a4508351a25a9012d8afa987be15249a9fe8f83ac885043fa3f2d5101818e9ab ChangeLog 5016
+MISC ChangeLog 5232 RMD160 ee8504685838a2df7ad47ce151b624e817de5f96 SHA1 689aa0053becbe88d2e95c54de65a5f231f44d73 SHA256 e8607cda560d80c8edf2b3aaa898246db4781789d8701714bfd8d138c730eea3
+MD5 e19ad71000c13cc572917d59c68aec67 ChangeLog 5232
+RMD160 ee8504685838a2df7ad47ce151b624e817de5f96 ChangeLog 5232
+SHA256 e8607cda560d80c8edf2b3aaa898246db4781789d8701714bfd8d138c730eea3 ChangeLog 5232
 MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
@@ -33,7 +33,7 @@ SHA256 20aa5cd74dc16059279869c6299ecc66397bde28c0d315c913431d514a696ca2 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF9DMHkT4lNIS36YERAvsrAKCS84+lTbPy+3AYrnMewLPBgiUiyQCeIIQl
-rzPk8WtKaKhAb0fwtIHiZ2c=
-=IFu1
+iD8DBQFF9VNSkT4lNIS36YERAgyCAJ0ZBgEOGfOOAWtnnpVR5FfV9AaT5wCglzT5
+69RQLPcLo49oEGJOTcGHLrs=
+=Aj+o
 -----END PGP SIGNATURE-----

diff --git a/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild b/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild
index fbcb875c75be2f755a1ab24d01ca3d1ea3e8e97c..c620339f8483b426472811ff793eeea9b27d748b 100644 (file)
--- a/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild
+++ b/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild,v 1.11 2007/03/11 16:45:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild,v 1.12 2007/03/12 13:16:10 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -231,18 +231,20 @@ src_unpack() {
                        unzip -qo "${CDROM_ROOT}"/Language_update.zip || die "unpacking"
                        unshield x "${CDROM_ROOT}"/data2.cab || die "unpacking"
                        # We have to adjust the files after unpacking the cab file.
-                       rm -rf _*
+                       mkdir -p miles/
+                       mkdir -p ambient/
+                       mkdir -p utils/nwupdateskins/
                        mv -f NWN_Platinum/Miles/* miles/
                        mv -f NWN_Platinum/ambient/*.wav ambient/
                        mv -f NWN_Platinum/docs .
                        mv -f NWN_Platinum/modules .
                        mv -f NWN_Platinum/nwm .
-                       mv -f NWN_Platinum/nwm .
                        mv -f NWN_Platinum/utils/nwupdateskins/*.bmp utils/nwupdateskins/
                        rm -rf NWN_Platinum/
+                       rm -rf _*
                        # If we have the DVD, we're done.  If not, we need to switch CDs and
                        # unpack the files on them.
-                       if [[ `du -b "${CDROM_ROOT}"/Data_Shared.zip` -lt 700000000 ]]
+                       if [[ $(du -b "${CDROM_ROOT}"/Data_Shared.zip | awk '{print $1}') -lt 700000000 ]]
                        then
                                cdrom_load_next_cd
                                einfo "Unpacking files..."
@@ -397,7 +399,7 @@ else \
        p=${HOME}/.nwn \
        for i in ${LINGUAS} \
        do \
-               if [[ -z "${LANG}" ]] && [[ -r ".metadata/linguas_$i" -a -d "$i" ]] \
+               if [ -z "${LANG}" -a -r ".metadata/linguas_$i" -a -d "$i" ] \
                then \
                        LANG=$i \
                        p=${HOME}/.nwn \