summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2007-03-12 13:16:10 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2007-03-12 13:16:10 +0000
commit4b9f8e95382dae12f5d5fbdc92c8f77c4b8c9d77 (patch)
tree59c6ff907e699dad5badf7eaedb8dbf099b02342 /games-rpg
parentMIPS love. (diff)
downloadgentoo-2-4b9f8e95382dae12f5d5fbdc92c8f77c4b8c9d77.tar.gz
gentoo-2-4b9f8e95382dae12f5d5fbdc92c8f77c4b8c9d77.tar.bz2
gentoo-2-4b9f8e95382dae12f5d5fbdc92c8f77c4b8c9d77.zip
Added a patch from Darren West <deefster@cheerful.com> to do a couple minor cleanups, and fixed some syntax. Closing bug #170531.
(Portage version: 2.1.2.1)
Diffstat (limited to 'games-rpg')
-rw-r--r--games-rpg/nwn-data/ChangeLog7
-rw-r--r--games-rpg/nwn-data/nwn-data-1.29-r1.ebuild12
2 files changed, 13 insertions, 6 deletions
diff --git a/games-rpg/nwn-data/ChangeLog b/games-rpg/nwn-data/ChangeLog
index e09988bd27b0..62983038968f 100644
--- 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/nwn-data-1.29-r1.ebuild b/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild
index fbcb875c75be..c620339f8483 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.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 \