[patch] Patch to nwn-data-1.29-r2

nwn-data-ebuild-patch-3in1_dvd-udf_fix-loop_fix.diff (text/plain), 3.98 KB, created by Kai Krakow on 2007-12-26 23:02:35 UTC

--- /usr/portage/games-rpg/nwn-data/nwn-data-1.29-r2.ebuild	2007-09-19 15:06:15.000000000 +0200
+++ nwn-data-1.29-r2.ebuild	2007-12-20 23:44:47.753389747 +0100
@@ -4,6 +4,7 @@
 
 inherit eutils games
 
+# 3-in-1 DVD - NWN, SoU, HotU (1 disk)
 # Diamond DVD - NWN, SoU, HotU (1 disk)
 # Platinum CD/DVD - NWN, SoU, HotU (4 disks/1 disk)
 # Deluxe CD - NWN, SoU, HotU (5 disks)
@@ -74,7 +75,11 @@
 	# this will make our lives so much easier.
 	if [[ -n "${CD_ROOT}" ]]
 	then
-		if [[ -f "${CD_ROOT}"/KingmakerSetup.exe ]]
+		if [[ -f "${CD_ROOT}"/data5.cab ]]
+		then
+			NWN_SET="3in1_dvd"
+			einfo "Neverwinter Nights 3-in-1 DVD found..."
+		elif [[ -f "${CD_ROOT}"/KingmakerSetup.exe ]]
 		then
 			NWN_SET="diamond_dvd"
 			einfo "Neverwinter Nights Diamond DVD found..."
@@ -95,7 +100,11 @@
 	# set, or even a DVD set.
 	elif [[ -n "${CD_ROOT_1}" ]]
 	then
-		if [[ -f "${CD_ROOT_1}"/KingmakerSetup.exe ]]
+		if [[ -f "${CD_ROOT_1}"/data5.cab ]]
+		then
+			NWN_SET="3in1_dvd"
+			einfo "Neverwinter Nights 3-in-1 DVD found..."
+		elif [[ -f "${CD_ROOT_1}"/KingmakerSetup.exe ]]
 		then
 			NWN_SET="diamond_dvd"
 			einfo "Neverwinter Nights Diamond DVD found..."
@@ -116,9 +125,13 @@
 	# to figure out what we have to work from.
 	else
 		local mline=
-		for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}')
+		for mline in $(mount | egrep -e '(iso|cdrom|udf)' | awk '{print $3}')
 		do
-			if [[ -f "${mline}"/KingmakerSetup.exe ]]
+			if [[ -f "${mline}"/data5.cab ]]
+			then
+				NWN_SET="3in1_dvd"
+				einfo "Neverwinter Nights 3-in-1 DVD found..."
+			elif [[ -f "${mline}"/KingmakerSetup.exe ]]
 			then
 				NWN_SET="diamond_dvd"
 				einfo "Neverwinter Nights Diamond DVD found..."
@@ -150,6 +163,14 @@
 	# Here is where we start our CD/DVD detection for changing disks.
 	export CDROM_NAME_1="CD1" CDROM_NAME_2="CD2" CDROM_NAME_3="CD3"
 	case "${NWN_SET}" in
+	3in1_dvd)
+		einfo "Both Shadows of Undrentide and Hordes of the Underdark will"
+		einfo "be installed from your DVD along with Neverwinter Nights."
+		touch .metadata/sou || die "touch sou"
+		touch .metadata/hou || die "touch hou"
+		touch .metadata/orig || die "touch orig"
+		cdrom_get_cds data5.cab
+		;;
 	diamond_dvd)
 		einfo "Both Shadows of Undrentide and Hordes of the Underdark will"
 		einfo "be installed from your DVD along with Neverwinter Nights."
@@ -235,6 +256,34 @@
 		get_cd_set
 
 		case ${NWN_SET} in
+		3in1_dvd)
+			mkdir -p "${S}"
+			cd "${S}"
+			einfo "Unpacking files..."
+			# We don't give the user the option to install SoU/HotU.  While some
+			# people might complain about this, most newer NWN stuff requires
+			# them both anyway, so it makes no sense not to install them.
+			unshield x "${CDROM_ROOT}"/data1.hdr || die "unpacking"
+			# We have to adjust the files after unpacking the cab file.
+			rm -rf _*
+			#mv -f App_Executables/Miles/* miles/
+			mkdir -p ambient/
+			mkdir -p data/
+			mv -f App_Executables/ambient/*.wav ambient/
+			#mv -f App_Executables/docs .
+			mv -f App_Executables/{modules,texturepacks} .
+			mv -f App_Executables/{dm,local}vault .
+			mv -f App_Executables/data/xp*.bif data/
+			mv -f App_Executables/*.key .
+			mv -f App_Executables/nwm .
+			if use videos
+			then
+				mv -f App_Executables/movies .
+			fi
+			mkdir -p utils/nwupdateskins/
+			mv -f App_Executables/utils/nwupdateskins/*.bmp utils/nwupdateskins/
+			rm -rf App_Executables/
+			;;
 		diamond_dvd)
 			# This is probably the simplest NWN to install.
 			mkdir -p "${S}"
@@ -433,6 +482,10 @@
 			mkdir -p $currentlocale
 			cd ${currentlocale}
 			unpack ${a} || die "unpacking ${a}"
+			# go back to continue the loop, otherwise further
+			# unpacking goes to the wrong directory and the next
+			# block after this loop throws errors
+			cd ..
 		fi
 	done
 	if use linguas_en
@@ -446,7 +499,7 @@
 	mv nwn.ini nwn.ini.default
 
 	sed -i -e 's,/bin/sh,/bin/bash,g' -e '\:^./nwmain .*:i \
-'"dir='${dir}';LINGUAS='${LINGUAS}'"' \
+'"dir='${dir}';LINGUAS='${LINGUAS}'"';LANG="${LANG/_*}" \
 die() { \
 	echo "$*" 1>&2 \
 	exit 1 \