Version bump #74871 by Francois Guimond et al.

9 files changed, 130 insertions, 387 deletions

diff --git a/games-rpg/nwn/ChangeLog b/games-rpg/nwn/ChangeLog
index 005b636d682a..56efe5f4fa3d 100644
--- a/games-rpg/nwn/ChangeLog
+++ b/games-rpg/nwn/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-rpg/nwn
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.17 2004/08/29 05:00:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.18 2004/12/30 09:06:24 vapier Exp $
+
+*nwn-1.65 (30 Dec 2004)
+
+  30 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  -files/nwn-1.30-fixinstall, -files/nwn-1.32-fixinstall,
+  -files/nwn-1.61-fixinstall, -files/nwn-1.62-fixinstall,
+  +files/nwn-1.65-fixinstall, -nwn-1.62.ebuild, +nwn-1.65.ebuild:
+  Version bump #74871 by Francois Guimond et al.
 
   28 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> nwn-1.62.ebuild:
   fix DESCRIPTION (bug #62066)
diff --git a/games-rpg/nwn/files/digest-nwn-1.62 b/games-rpg/nwn/files/digest-nwn-1.62
deleted file mode 100644
index f3c87c41e4e0..000000000000
--- a/games-rpg/nwn/files/digest-nwn-1.62
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 73c6515fd6aa5f860802098a55000ae8 nwclient129.tar.gz 5504342
-MD5 89f373e0a5e0042912a3a214ebf4436b linuxclientupdate129to162eng.tar.gz 71917130
-MD5 8222401efe25235b56d01b38ae880b5b nwresources129.tar.gz 1212356127
diff --git a/games-rpg/nwn/files/digest-nwn-1.65 b/games-rpg/nwn/files/digest-nwn-1.65
new file mode 100644
index 000000000000..c3408ca1a59e
--- /dev/null
+++ b/games-rpg/nwn/files/digest-nwn-1.65
@@ -0,0 +1,4 @@
+MD5 73c6515fd6aa5f860802098a55000ae8 nwclient129.tar.gz 5504342
+MD5 8222401efe25235b56d01b38ae880b5b nwresources129.tar.gz 1212356127
+MD5 920e498efc0763b6a4f03d22ad689db7 linuxclientupdate1xxto165eng.tar.gz 80623755
+MD5 7564b803aad04595058f3351e8606139 NWNEnglish1.65dialog.zip 3180152
diff --git a/games-rpg/nwn/files/nwn-1.30-fixinstall b/games-rpg/nwn/files/nwn-1.30-fixinstall
deleted file mode 100644
index 44a67423b87b..000000000000
--- a/games-rpg/nwn/files/nwn-1.30-fixinstall
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/bash
-# Initial version by Bioware
-# Modified to match the gentoo setup
-# 03/27/2003 phoen][x <phoenix@gentoo.org>
-
-FaRequiredDirs=(ambient data music override miles nwm)
-aRequiredFiles=(chitin.key dialog.tlk nwmain patch.key)
-aLCDirs=(ambient data dmvault hak localvault music override portraits)
-aProblemFiles=()
-
-printf "\nFixing case\n\n"
-
-if [ -f dialog.TLK ]
-then
-    mv dialog.TLK dialog.tlk
-fi
-
-if [ -f dialogF.TLK ]
-then
-    mv dialogF.TLK dialogf.tlk
-fi
-
-printf "Checking for required files\n\n"
-
-for d in ${aRequiredDirs[@]}
-do
-    if [ -d $d ]
-    then
-        printf "PASSED: $d directory exists\n"
-    else
-        printf "FAILED: $d directory missing\n"
-        exit
-    fi
-done
-
-for f in ${aRequiredFiles[@]}
-do
-    if [ -f $f ]
-    then
-        printf "PASSED: $f exists\n"
-    else
-        printf "FAILED: $f missing\n"
-        exit
-    fi
-done
-
-printf "\nFixing case\n\n"
-
-for d in ${aLCDirs[@]}
-do
-    if [ -d $d ]
-    then
-        printf "$d\n"
-  
-        cd $d
-
-        for f in $(find *.*)
-        do
-            lcf=$(echo $f | tr [:upper:] [:lower:])
-            if [ $f != $lcf ]
-            then
-	        if [ -f $f ]
-	        then
-	            mv $f $(echo $f | tr [:upper:] [:lower:]) 
-	        fi
-            fi
-            printf .
-        done
-
-        cd ..
-
-	printf "\n"
-    fi
-done
-
-printf "\nChecking for problem files\n\n"
-
-for f in ${aProblemFiles[@]}
-do
-    if [ -f $f ]
-    then
-        printf "WARNING: $f exists, deleting this file is recommended\n"
-    fi
-done
-
-printf "\nFixing permissions\n\n"
-
-chown GENTOO_USER:GENTOO_GROUP GENTOO_DIR/nwn/ -R
-chmod g+rwX GENTOO_DIR/nwn/ -R
-
-printf "\nYou are ready to run Neverwinter Nights.\n\n"
diff --git a/games-rpg/nwn/files/nwn-1.32-fixinstall b/games-rpg/nwn/files/nwn-1.32-fixinstall
deleted file mode 100644
index 15ae08d872fc..000000000000
--- a/games-rpg/nwn/files/nwn-1.32-fixinstall
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-# Initial version by Bioware
-# Modified to match the gentoo setup
-# 03/27/2003 phoen][x <phoenix@gentoo.org>
-
-cd GAMES_PREFIX_OPT/nwn
-
-FaRequiredDirs=(ambient data music override miles nwm)
-aRequiredFiles=(chitin.key dialog.tlk nwmain patch.key)
-aLCDirs=(ambient data dmvault hak localvault music override portraits)
-aProblemFiles=()
-
-printf "\nFixing case\n\n"
-
-if [ -f dialog.TLK ]
-then
-    mv dialog.TLK dialog.tlk
-fi
-
-if [ -f dialogF.TLK ]
-then
-    mv dialogF.TLK dialogf.tlk
-fi
-
-printf "Checking for required files\n\n"
-
-for d in ${aRequiredDirs[@]}
-do
-    if [ -d $d ]
-    then
-        printf "PASSED: $d directory exists\n"
-    else
-        printf "FAILED: $d directory missing\n"
-        exit
-    fi
-done
-
-for f in ${aRequiredFiles[@]}
-do
-    if [ -f $f ]
-    then
-        printf "PASSED: $f exists\n"
-    else
-        printf "FAILED: $f missing\n"
-        exit
-    fi
-done
-
-printf "\nFixing case\n\n"
-
-for d in ${aLCDirs[@]}
-do
-    if [ -d $d ]
-    then
-        printf "$d\n"
-  
-        cd $d
-
-        for f in $(find *.*)
-        do
-            lcf=$(echo $f | tr [:upper:] [:lower:])
-            if [ $f != $lcf ]
-            then
-	        if [ -f $f ]
-	        then
-	            mv $f $(echo $f | tr [:upper:] [:lower:]) 
-	        fi
-            fi
-            printf .
-        done
-
-        cd ..
-
-	printf "\n"
-    fi
-done
-
-printf "\nChecking for problem files\n\n"
-
-for f in ${aProblemFiles[@]}
-do
-    if [ -f $f ]
-    then
-        printf "WARNING: $f exists, deleting this file is recommended\n"
-    fi
-done
-
-printf "\nFixing permissions\n\n"
-
-chown GENTOO_USER:GENTOO_GROUP GENTOO_DIR/nwn/ -R
-chmod g+rwX GENTOO_DIR/nwn/ -R
-
-printf "\nYou are ready to run Neverwinter Nights.\n\n"
diff --git a/games-rpg/nwn/files/nwn-1.61-fixinstall b/games-rpg/nwn/files/nwn-1.61-fixinstall
deleted file mode 100644
index a1e6063df9b6..000000000000
--- a/games-rpg/nwn/files/nwn-1.61-fixinstall
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-# Initial version by Bioware
-# Modified to match the gentoo setup
-# 03/27/2003 phoen][x <phoenix@gentoo.org>
-
-cd GENTOO_DIR/nwn
-
-FaRequiredDirs=(ambient data music override miles nwm)
-aRequiredFiles=(chitin.key dialog.tlk nwmain patch.key)
-aLCDirs=(ambient data dmvault hak localvault music override portraits)
-aProblemFiles=()
-
-printf "\nFixing case\n\n"
-
-if [ -f dialog.TLK ]
-then
-    mv dialog.TLK dialog.tlk
-fi
-
-if [ -f dialogF.TLK ]
-then
-    mv dialogF.TLK dialogf.tlk
-fi
-
-printf "Checking for required files\n\n"
-
-for d in ${aRequiredDirs[@]}
-do
-    if [ -d $d ]
-    then
-        printf "PASSED: $d directory exists\n"
-    else
-        printf "FAILED: $d directory missing\n"
-        exit
-    fi
-done
-
-for f in ${aRequiredFiles[@]}
-do
-    if [ -f $f ]
-    then
-        printf "PASSED: $f exists\n"
-    else
-        printf "FAILED: $f missing\n"
-        exit
-    fi
-done
-
-printf "\nFixing case\n\n"
-
-for d in ${aLCDirs[@]}
-do
-    if [ -d $d ]
-    then
-        printf "$d\n"
-  
-        cd $d
-
-        for f in $(find *.*)
-        do
-            lcf=$(echo $f | tr [:upper:] [:lower:])
-            if [ $f != $lcf ]
-            then
-	        if [ -f $f ]
-	        then
-	            mv $f $(echo $f | tr [:upper:] [:lower:]) 
-	        fi
-            fi
-            printf .
-        done
-
-        cd ..
-
-	printf "\n"
-    fi
-done
-
-printf "\nChecking for problem files\n\n"
-
-for f in ${aProblemFiles[@]}
-do
-    if [ -f $f ]
-    then
-        printf "WARNING: $f exists, deleting this file is recommended\n"
-    fi
-done
-
-printf "\nFixing permissions\n\n"
-
-chown GENTOO_USER:GENTOO_GROUP GENTOO_DIR/nwn/ -R
-chmod g+rwX GENTOO_DIR/nwn/ -R
-
-printf "\nYou are ready to run Neverwinter Nights.\n\n"
diff --git a/games-rpg/nwn/files/nwn-1.62-fixinstall b/games-rpg/nwn/files/nwn-1.62-fixinstall
deleted file mode 100644
index a1e6063df9b6..000000000000
--- a/games-rpg/nwn/files/nwn-1.62-fixinstall
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-# Initial version by Bioware
-# Modified to match the gentoo setup
-# 03/27/2003 phoen][x <phoenix@gentoo.org>
-
-cd GENTOO_DIR/nwn
-
-FaRequiredDirs=(ambient data music override miles nwm)
-aRequiredFiles=(chitin.key dialog.tlk nwmain patch.key)
-aLCDirs=(ambient data dmvault hak localvault music override portraits)
-aProblemFiles=()
-
-printf "\nFixing case\n\n"
-
-if [ -f dialog.TLK ]
-then
-    mv dialog.TLK dialog.tlk
-fi
-
-if [ -f dialogF.TLK ]
-then
-    mv dialogF.TLK dialogf.tlk
-fi
-
-printf "Checking for required files\n\n"
-
-for d in ${aRequiredDirs[@]}
-do
-    if [ -d $d ]
-    then
-        printf "PASSED: $d directory exists\n"
-    else
-        printf "FAILED: $d directory missing\n"
-        exit
-    fi
-done
-
-for f in ${aRequiredFiles[@]}
-do
-    if [ -f $f ]
-    then
-        printf "PASSED: $f exists\n"
-    else
-        printf "FAILED: $f missing\n"
-        exit
-    fi
-done
-
-printf "\nFixing case\n\n"
-
-for d in ${aLCDirs[@]}
-do
-    if [ -d $d ]
-    then
-        printf "$d\n"
-  
-        cd $d
-
-        for f in $(find *.*)
-        do
-            lcf=$(echo $f | tr [:upper:] [:lower:])
-            if [ $f != $lcf ]
-            then
-	        if [ -f $f ]
-	        then
-	            mv $f $(echo $f | tr [:upper:] [:lower:]) 
-	        fi
-            fi
-            printf .
-        done
-
-        cd ..
-
-	printf "\n"
-    fi
-done
-
-printf "\nChecking for problem files\n\n"
-
-for f in ${aProblemFiles[@]}
-do
-    if [ -f $f ]
-    then
-        printf "WARNING: $f exists, deleting this file is recommended\n"
-    fi
-done
-
-printf "\nFixing permissions\n\n"
-
-chown GENTOO_USER:GENTOO_GROUP GENTOO_DIR/nwn/ -R
-chmod g+rwX GENTOO_DIR/nwn/ -R
-
-printf "\nYou are ready to run Neverwinter Nights.\n\n"
diff --git a/games-rpg/nwn/files/nwn-1.65-fixinstall b/games-rpg/nwn/files/nwn-1.65-fixinstall
new file mode 100755
index 000000000000..d0d7a4c80315
--- /dev/null
+++ b/games-rpg/nwn/files/nwn-1.65-fixinstall
@@ -0,0 +1,105 @@
+#!/bin/bash
+# Initial version by Bioware
+# Modified to match the gentoo setup
+# 03/27/2003 phoen][x <phoenix@gentoo.org>
+
+cd GENTOO_DIR/nwn || exit 1
+
+aRequiredDirs=(ambient data music override miles nwm)
+aRequiredFiles=(chitin.key dialog.tlk nwmain)
+aLCDirs=(ambient data dmvault hak localvault music override portraits)
+aProblemFiles=()
+aWritables=(nwn.ini nwnplayer.ini nwncdkey.ini saves localvault tempclient currentgame dmvault)
+
+printf "Checking for required files\n\n"
+
+for d in ${aRequiredDirs[@]} ; do
+	if [[ -d $d ]] ; then
+		printf "PASSED: $d directory exists\n"
+	else
+		printf "FAILED: $d directory missing\n"
+		exit 1
+	fi
+done
+
+for f in ${aRequiredFiles[@]} ; do
+	if [[ -f $f ]] ; then
+		printf "PASSED: $f exists\n"
+	else
+		printf "FAILED: $f missing\n"
+		exit 1
+	fi
+done
+
+printf "\nFixing case\n\n"
+
+if [[ -f dialog.TLK ]] ; then
+	mv dialog.TLK dialog.tlk
+fi
+
+if [[ -f dialogF.TLK ]] ; then
+	mv dialogF.TLK dialogf.tlk
+fi
+
+for d in ${aLCDirs[@]} ; do
+	if [[ -d $d ]] ; then
+		printf "$d\n"
+		cd $d
+
+		for f in $(find . -name '*.*') ; do
+			lcf=$(echo $f | tr [:upper:] [:lower:])
+			if [[ $f != $lcf ]] && [[ -f $f ]] ; then
+				mv $f $(echo $f | tr [:upper:] [:lower:]) 
+			fi
+			printf .
+		done
+
+		cd ..
+		printf "\n"
+	fi
+done
+
+defIFS=$IFS
+IFS='|'
+
+if [[ -d saves ]] ; then
+	cd saves
+	for d in $(find . -name '* - *' -type d -printf "%f|") ; do
+		printf "saves/$d\n"
+		cd "$d"
+
+		[[ -f Portrait.tga ]] && mv Portrait.tga portrait.tga
+		[[ -f Screen.tga ]] && mv Screen.tga screen.tga
+
+		cd ..
+	done
+	cd ..
+fi
+
+IFS=$defIFS
+
+printf "\nChecking for problem files\n\n"
+
+for f in ${aProblemFiles[@]} ; do
+	if [[ -e $f ]] ; then
+		printf "WARNING: $f exists, deleting this file is recommended\n"
+	fi
+done
+
+printf "\nFixing permissions\n\n"
+
+chown GENTOO_USER:GENTOO_GROUP GENTOO_DIR/nwn/ -R
+chmod g+rwX GENTOO_DIR/nwn/ -R
+
+# 1.65-specific fixes to permissions
+chmod a-x GENTOO_DIR/nwn/data/patch.bif
+chmod a-x GENTOO_DIR/nwn/nwm/Chapter1.nwm
+chmod a-x GENTOO_DIR/nwn/nwm/Chapter1E.nwm
+chmod a-x GENTOO_DIR/nwn/nwm/Chapter2.nwm
+chmod a-x GENTOO_DIR/nwn/nwm/Chapter2E.nwm
+chmod a-x GENTOO_DIR/nwn/nwm/Chapter3.nwm
+chmod a-x GENTOO_DIR/nwn/nwm/Chapter4.nwm
+chmod a-x GENTOO_DIR/nwn/nwm/Prelude.nwm
+chmod a-x GENTOO_DIR/nwn/patch.key
+
+printf "\nYou are ready to run Neverwinter Nights.\n\n"
diff --git a/games-rpg/nwn/nwn-1.62.ebuild b/games-rpg/nwn/nwn-1.65.ebuild
index 17fa834bb006..0ef646f65d0a 100644
--- a/games-rpg/nwn/nwn-1.62.ebuild
+++ b/games-rpg/nwn/nwn-1.65.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-rpg/nwn/nwn-1.62.ebuild,v 1.11 2004/08/29 05:00:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.65.ebuild,v 1.1 2004/12/30 09:06:24 vapier Exp $
 
 inherit games
 
@@ -8,12 +8,13 @@ UPDATEVER=${PV//.}
 DESCRIPTION="Neverwinter Nights"
 HOMEPAGE="http://nwn.bioware.com/downloads/linuxclient.html"
 SRC_URI="http://nwdownloads.bioware.com/neverwinternights/linux/129/nwclient129.tar.gz
-	nowin? ( ftp://jeuxlinux.com/bioware/Neverwinter_Nights/nwresources129.tar.gz )
-	http://nwdownloads.bioware.com/neverwinternights/linux/${UPDATEVER}/linuxclientupdate129to${UPDATEVER}eng.tar.gz"
+	nowin? ( http://www.tucows.iinet.net/pub/games/neverwinter/linux/nwresources129.tar.gz )
+	http://content.bioware.com/neverwinternights/linux/${UPDATEVER}/linuxclientupdate1xxto${UPDATEVER}eng.tar.gz
+	http://nwdownloads.bioware.com/neverwinternights/patch/dialog/english/NWNEnglish${PV}dialog.zip"
 
 LICENSE="NWN-EULA"
 SLOT="0"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="amd64 x86"
 IUSE="nowin"
 RESTRICT="nostrip nomirror"
 
@@ -31,7 +32,9 @@ src_unpack() {
 	cd ${WORKDIR}
 	use nowin && unpack nwresources129.tar.gz
 	cd ${S}
-	unpack linuxclientupdate129to${UPDATEVER}eng.tar.gz
+	rm -rf override/*
+	unpack linuxclientupdate1xxto${UPDATEVER}eng.tar.gz
+	unpack NWNEnglish${PV}dialog.zip
 }
 
 src_install() {
@@ -41,12 +44,12 @@ src_install() {
 		-e "s:GENTOO_GROUP:${GAMES_GROUP}:" \
 		-e "s:GENTOO_DIR:${GAMES_PREFIX_OPT}:" \
 		${FILESDIR}/${P}-fixinstall > ${WORKDIR}/nwn/fixinstall
-	mv ${WORKDIR}/nwn ${D}/${GAMES_PREFIX_OPT}
+	mv ${S} ${D}/${GAMES_PREFIX_OPT}
 	insinto /usr/share/pixmaps
 	doins ${FILESDIR}/nwn.png
 	dogamesbin ${FILESDIR}/nwn
 	dosed "s:GENTOO_DIR:${GAMES_PREFIX_OPT}:" ${GAMES_BINDIR}/nwn
-	make_desktop_entry nwn "Never Winter Nights" nwn.png
+	make_desktop_entry nwn "Neverwinter Nights" nwn.png
 	prepgamesdirs
 }
 
@@ -56,24 +59,20 @@ pkg_postinst() {
 		einfo "The NWN linux client is now installed."
 		einfo "Proceed with the following steps in order to get it working:"
 		einfo "1) Copy the following directories/files from your installed and"
-		einfo "   patched (${PV}) Never Winter Nights to ${GAMES_PREFIX_OPT}/nwn:"
+		einfo "   patched (${PV}) Neverwinter Nights to ${GAMES_PREFIX_OPT}/nwn:"
 		einfo "    ambient/"
-		einfo "    data/"
+		einfo "    data/ (all files except for patch.bif)"
 		einfo "    dmvault/"
 		einfo "    hak/"
 		einfo "    localvault/"
 		einfo "    modules/"
 		einfo "    music/"
-		einfo "    nwm/"
 		einfo "    override/"
 		einfo "    portraits/"
 		einfo "    saves/"
 		einfo "    servervault/"
 		einfo "    texturepacks/"
 		einfo "    chitin.key"
-		einfo "    patch.key"
-		einfo "    dialog.tlk"
-		einfo "    dialogF.tlk (French, German, Italian, and Spanish)"
 		einfo "2) Chown and chmod the files with the following commands"
 		einfo "    chown -R ${GAMES_USER}:${GAMES_GROUP} ${GAMES_PREFIX_OPT}/nwn"
 		einfo "    chmod -R g+rwX ${GAMES_PREFIX_OPT}/nwn"