From e829f518a5e5b6b81519855022bb283aa443a99c Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 7 Mar 2007 17:34:19 +0000 Subject: [PATCH] Change all instances of [ to [[. Package-Manager: portage-2.1.2.1 --- games-rpg/nwn-data/ChangeLog | 6 ++- games-rpg/nwn-data/Manifest | 34 +++++++++------ games-rpg/nwn-data/nwn-data-1.29-r1.ebuild | 48 +++++++++++----------- games-rpg/nwn-data/nwn-data-1.29.ebuild | 12 +++--- 4 files changed, 57 insertions(+), 43 deletions(-) diff --git a/games-rpg/nwn-data/ChangeLog b/games-rpg/nwn-data/ChangeLog index b06d31202c4c..b5d8e4801f53 100644 --- a/games-rpg/nwn-data/ChangeLog +++ b/games-rpg/nwn-data/ChangeLog @@ -1,6 +1,10 @@ # 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.25 2007/02/02 16:42:01 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.26 2007/03/07 17:34:19 wolf31o2 Exp $ + + 07 Mar 2007; Chris Gianelloni nwn-data-1.29.ebuild, + nwn-data-1.29-r1.ebuild: + Change all instances of [ to [[. 02 Feb 2007; Chris Gianelloni nwn-data-1.29-r1.ebuild: diff --git a/games-rpg/nwn-data/Manifest b/games-rpg/nwn-data/Manifest index cd38e547021e..0e4f6848a984 100644 --- a/games-rpg/nwn-data/Manifest +++ b/games-rpg/nwn-data/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST nwclient129.tar.gz 5504342 RMD160 3cffcec613ec8fdd8241d6f6b47fe891434d5024 SHA1 501c5ca495366993413fa3e7e6969aa82f096bde SHA256 3d75e07f4d44fde789481240d02c07a7a7e0599bc2300d8a73f98f4c752da80e DIST nwfrench129.tar.gz 357777520 RMD160 d64a2e52691e9d7897fedb9faae038b1c88699f5 SHA1 08ce997118af131cdaac3e3b3c01124291cffe14 SHA256 9a5ddcbc8ca443cb5bbcacb76587b171d37441906a1319155bba35f1bfffa9e0 DIST nwgerman129.tar.gz 381832822 RMD160 02d5d76e9a59f07d5baea1bf7e29e3ed65466936 SHA1 995f4ac5fae0ea574d41692ce4e1efcae685b516 SHA256 950f730121a90fef2fd5a0810c329a04d1697a7b5f859e240e3307d31050e6e0 @@ -5,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 16575 RMD160 89a90e83f3680079e05f02f60f9421453e6fb626 SHA1 51c4043d23444b31235084f80d2c0566ee66ee77 SHA256 4465e659d81a463b087d4a4935be03dcee090a23f75aa3124c2cd0852b8619e0 -MD5 c8a75e7f7258dde48d37f90e3d56615c nwn-data-1.29-r1.ebuild 16575 -RMD160 89a90e83f3680079e05f02f60f9421453e6fb626 nwn-data-1.29-r1.ebuild 16575 -SHA256 4465e659d81a463b087d4a4935be03dcee090a23f75aa3124c2cd0852b8619e0 nwn-data-1.29-r1.ebuild 16575 -EBUILD nwn-data-1.29.ebuild 6786 RMD160 f4646fbdb29b03237756cb6291488808a8a4a6af SHA1 3af135113a0e4b420aa0db2ea5bd92fe979b2f18 SHA256 8a60e32fa41ecd45e03e57ae1411b60368742cb6335c14a4ae3d170522067df4 -MD5 e98696ea3bc14e35add7addecd6f8378 nwn-data-1.29.ebuild 6786 -RMD160 f4646fbdb29b03237756cb6291488808a8a4a6af nwn-data-1.29.ebuild 6786 -SHA256 8a60e32fa41ecd45e03e57ae1411b60368742cb6335c14a4ae3d170522067df4 nwn-data-1.29.ebuild 6786 -MISC ChangeLog 4730 RMD160 8c66bdae3a2a5be4e5cd581d5abe8391b04cc828 SHA1 caf9693d7675d04012f0b27fb38a0c226109a960 SHA256 a237e36887686ce56305315ecb6eaf92fea9ef3a4e0ca174f82d3d92f28571b5 -MD5 126b4e232119ac8f486443190d6cff41 ChangeLog 4730 -RMD160 8c66bdae3a2a5be4e5cd581d5abe8391b04cc828 ChangeLog 4730 -SHA256 a237e36887686ce56305315ecb6eaf92fea9ef3a4e0ca174f82d3d92f28571b5 ChangeLog 4730 +EBUILD nwn-data-1.29-r1.ebuild 16623 RMD160 efce0c5b6aca1fd99c8856d18c88e61c4c21cf18 SHA1 eefb83a9a978e408ce28c74d973d264efe7b207b SHA256 aad5d05de6bb41baec8daa786f44cb22340cc1cb5126effe8e70f96fd83c0120 +MD5 411a5126ea063e4cc3ac8fe86425137f nwn-data-1.29-r1.ebuild 16623 +RMD160 efce0c5b6aca1fd99c8856d18c88e61c4c21cf18 nwn-data-1.29-r1.ebuild 16623 +SHA256 aad5d05de6bb41baec8daa786f44cb22340cc1cb5126effe8e70f96fd83c0120 nwn-data-1.29-r1.ebuild 16623 +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 4869 RMD160 4ca8e5f2a85db4c97d510f0154060289e1e2802d SHA1 78598e7e44a9a23db128af13291e22da8e04c1a2 SHA256 d5cd22d5207aaaf33d6eb0e5bf56365d02ca9ac8945042f7439b0919ae55ec28 +MD5 fa21577c07c78e1c577a0d6a2d33d077 ChangeLog 4869 +RMD160 4ca8e5f2a85db4c97d510f0154060289e1e2802d ChangeLog 4869 +SHA256 d5cd22d5207aaaf33d6eb0e5bf56365d02ca9ac8945042f7439b0919ae55ec28 ChangeLog 4869 MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254 @@ -27,3 +30,10 @@ SHA256 20aa5cd74dc16059279869c6299ecc66397bde28c0d315c913431d514a696ca2 files/di MD5 897a21d522d5ad2f4ebf1f515b525733 files/digest-nwn-data-1.29-r1 1660 RMD160 23a3ffbb3b4e708030b0bee0520d7e3c41f52687 files/digest-nwn-data-1.29-r1 1660 SHA256 20aa5cd74dc16059279869c6299ecc66397bde28c0d315c913431d514a696ca2 files/digest-nwn-data-1.29-r1 1660 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF7vhmkT4lNIS36YERArV8AJ4+xi93kqJAd3HN63GnZfm0Dxsf6QCgt8++ +Uh3O0vFdyeHp28bi8ke1Ns4= +=mNYV +-----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 458a05780293..6f93ff10443e 100644 --- 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.9 2007/02/22 05:29:30 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild,v 1.10 2007/03/07 17:34:19 wolf31o2 Exp $ inherit eutils games @@ -72,34 +72,34 @@ NWN_SET= get_nwn_set() { # First we check to see if we have CD_ROOT defined already. If we do, # this will make our lives so much easier. - if [ -n "${CD_ROOT}" ] + if [[ -n "${CD_ROOT}" ]] then - if [ -f "${CD_ROOT}"/KingmakerSetup.exe ] + if [[ -f "${CD_ROOT}"/KingmakerSetup.exe ]] then NWN_SET="diamond_dvd" einfo "Neverwinter Nights Diamond DVD found..." - elif [ -f "${CD_ROOT}"/ArcadeInstallNWNXP213f.EXE ] + elif [[ -f "${CD_ROOT}"/ArcadeInstallNWNXP213f.EXE ]] then NWN_SET="platinum_cd" einfo "Neverwinter Nights Platinum DVD/CD set found..." - elif [ -f "${CD_ROOT}"/ArcadeInstallNWN109.exe ] + elif [[ -f "${CD_ROOT}"/ArcadeInstallNWN109.exe ]] then NWN_SET="original_cd" einfo "Neverwinter Nights Original/Deluxe CD set found..." fi # Now we check to see if we have CD_ROOT_1 set, which means we have a CD # set, or even a DVD set. - elif [ -n "${CD_ROOT_1}" ] + elif [[ -n "${CD_ROOT_1}" ]] then - if [ -f "${CD_ROOT_1}"/KingmakerSetup.exe ] + if [[ -f "${CD_ROOT_1}"/KingmakerSetup.exe ]] then NWN_SET="diamond_dvd" einfo "Neverwinter Nights Diamond DVD found..." - elif [ -f "${CD_ROOT_1}"/ArcadeInstallNWNXP213f.EXE ] + elif [[ -f "${CD_ROOT_1}"/ArcadeInstallNWNXP213f.EXE ]] then NWN_SET="platinum_cd" einfo "Neverwinter Nights Platinum DVD/CD set found..." - elif [ -f "${CD_ROOT_1}"/ArcadeInstallNWN109.exe ] + elif [[ -f "${CD_ROOT_1}"/ArcadeInstallNWN109.exe ]] then NWN_SET="original_cd" einfo "Neverwinter Nights Original/Deluxe CD set found..." @@ -110,15 +110,15 @@ get_nwn_set() { local mline= for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') do - if [ -f "${mline}"/KingmakerSetup.exe ] + if [[ -f "${mline}"/KingmakerSetup.exe ]] then NWN_SET="diamond_dvd" einfo "Neverwinter Nights Diamond DVD found..." - elif [ -f "${mline}"/ArcadeInstallNWNXP213f.EXE ] + elif [[ -f "${mline}"/ArcadeInstallNWNXP213f.EXE ]] then NWN_SET="platinum_cd" einfo "Neverwinter Nights Platinum DVD/CD set found..." - elif [ -f "${mline}"/ArcadeInstallNWN109.exe ] + elif [[ -f "${mline}"/ArcadeInstallNWN109.exe ]] then NWN_SET="original_cd" einfo "Neverwinter Nights Original/Original CD set found..." @@ -128,7 +128,7 @@ get_nwn_set() { } get_cd_set() { - while `[ -z "${NWN_SET}" ]` + while `[[ -z "${NWN_SET}" ]]` do echo "Please insert your first Neverwinter Nights CD/DVD into your drive and" echo "press any key to continue" @@ -242,7 +242,7 @@ src_unpack() { rm -rf NWN_Platinum/ # 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` -lt 700000000 ]] then cdrom_load_next_cd einfo "Unpacking files..." @@ -347,20 +347,20 @@ src_unpack() { for a in ${A} do currentlocale="" - if [ -z ${a/*german*/} ] + if [[ -z ${a/*german*/} ]] then currentlocale=de - elif [ -z ${a/*spanish*/} ] + elif [[ -z ${a/*spanish*/} ]] then currentlocale=es - elif [ -z ${a/*italian*/} ] + elif [[ -z ${a/*italian*/} ]] then currentlocale=it - elif [ -z ${a/*french*/} ] + elif [[ -z ${a/*french*/} ]] then currentlocale=fr fi - if [ -n "$currentlocale" ] + if [[ -n "$currentlocale" ]] then touch ".metadata/linguas_$currentlocale" mkdir -p $currentlocale @@ -397,7 +397,7 @@ else \ p=${HOME}/.nwn \ for i in ${LINGUAS} \ do \ - if [ -z "${LANG}" -a -r ".metadata/linguas_$i" -a -d "$i" ] \ + if [[ -z "${LANG}" -a -r ".metadata/linguas_$i" -a -d "$i" ]] \ then \ LANG=$i \ p=${HOME}/.nwn \ @@ -454,12 +454,12 @@ src_install() { cd "${Ddir}" for d in ambient data dmvault hak localvault movies music override portraits do - if [ -d ${d} ] + if [[ -d ${d} ]] then ( cd ${d} for f in $(find . -name '*.*') ; do lcf=$(echo ${f} | tr [:upper:] [:lower:]) - if [ ${f} != ${lcf} ] && [ -f ${f} ] + if [[ ${f} != ${lcf} ]] && [[ -f ${f} ]] then mv ${f} ${lcf} fi @@ -468,11 +468,11 @@ src_install() { done if ! use sou && ! use hou && use nowin then - if [ -f data/patch.bif ] + if [[ -f data/patch.bif ]] then chmod a-x data/patch.bif fi - if [ -f patch.key ] + if [[ -f patch.key ]] then chmod a-x patch.key fi diff --git a/games-rpg/nwn-data/nwn-data-1.29.ebuild b/games-rpg/nwn-data/nwn-data-1.29.ebuild index c8510fa6558f..85b775e8923d 100644 --- a/games-rpg/nwn-data/nwn-data-1.29.ebuild +++ b/games-rpg/nwn-data/nwn-data-1.29.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.ebuild,v 1.21 2007/01/26 19:58:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29.ebuild,v 1.22 2007/03/07 17:34:19 wolf31o2 Exp $ inherit eutils games @@ -96,7 +96,7 @@ src_unpack() { rm -rf override/* # the following is so ugly, please pretend it doesnt exist declare -a Aarray=(${A}) - use nowin && if [ "${#Aarray[*]}" == "4" ] + use nowin && if [[ "${#Aarray[*]}" == "4" ]] then unpack ${Aarray[1]} fi @@ -124,7 +124,7 @@ src_unpack() { rm -f data/patch.bif patch.key sed -i -e '\:^./nwmain .*:i \ -if [[ -f ./nwmouse.so ]]; then \ +if [[ -f ./nwmouse.so ]] ; then \ export XCURSOR_PATH="$(pwd)" \ export XCURSOR_THEME=nwmouse \ export LD_PRELOAD=./nwmouse.so:$LD_PRELOAD \ @@ -151,12 +151,12 @@ src_install() { cd "${Ddir}" for d in ambient data dmvault hak localvault music override portraits do - if [ -d ${d} ] + if [[ -d ${d} ]] then cd ${d} for f in $(find . -name '*.*') ; do lcf=$(echo ${f} | tr [:upper:] [:lower:]) - if [ ${f} != ${lcf} ] && [ -f ${f} ] + if [[ ${f} != ${lcf} ]] && [[ -f ${f} ]] then mv ${f} $(echo ${f} | tr [:upper:] [:lower:]) fi -- 2.26.2