--- nwn-1.68-r1.ebuild.orig	2006-12-03 17:31:37.000000000 +0100
+++ nwn-1.68-r1.ebuild.orig	2006-12-03 19:16:48.000000000 +0100
@@ -154,11 +154,10 @@ 
 src_unpack() {
 	mkdir -p "${S}"
 	cd "${S}"
-	AA=""
 	mkdir -p .metadata
 	for a in ${A}
 	do
-		if [ -n "${a/*dialog*}" ]
+		if [ -z "${a/*orig*}" ]
 		then
 			currentlocale=""
 			if [ -z "${a/*German*/}" ]
@@ -182,6 +181,7 @@ 
 				mkdir -p "${currentlocale}"
 				cd "${currentlocale}"
 				unpack "${a}" || die "unpack ${a}"
+				cd ..
 			fi
 		fi
 	done
@@ -190,7 +190,30 @@ 
 	do
 		if [ -z "${a/*$SOU_NAME}" ]
 		then
-			rm -f data/patch.bif patch.key && unpack ${a}
+			currentlocale=""
+			if [ -z "${a/*German*/}" ]
+			then
+				currentlocale=de
+			elif [ -z "${a/*English*/}" ]
+			then
+				currentlocale=en
+			elif [ -z "${a/*Spanish*/}" ]
+			then
+				currentlocale=es
+			elif [ -z "${a/*Italian*/}" ]
+			then
+				currentlocale=it
+			elif [ -z "${a/*French*/}" ]
+			then
+				currentlocale=fr
+			fi
+			if [ -n "$currentlocale" ]
+			then
+				cd "${currentlocale}"
+				rm -f data/patch.bif patch.key
+				unpack "${a}" || die "unpack ${a}"
+				cd ..
+			fi
 		fi
 	done )
 	use hou && (
@@ -198,8 +221,32 @@ 
 	do
 		if [ -z "${a/*$HOU_NAME}" ]
 		then
-			rm -f data/patch.bif patch.key data/xp1patch.bif xp1patch.key \
-				override/* && unpack ${a}
+			currentlocale=""
+			if [ -z "${a/*German*/}" ]
+			then
+				currentlocale=de
+			elif [ -z "${a/*English*/}" ]
+			then
+				currentlocale=en
+			elif [ -z "${a/*Spanish*/}" ]
+			then
+				currentlocale=es
+			elif [ -z "${a/*Italian*/}" ]
+			then
+				currentlocale=it
+			elif [ -z "${a/*French*/}" ]
+			then
+				currentlocale=fr
+			fi
+			if [ -n "$currentlocale" ]
+			then
+				cd "${currentlocale}"
+				rm -f data/patch.bif patch.key data/xp1patch.bif xp1patch.key override/*
+				unpack "${a}" || die "unpack ${a}"
+				cd ..
+			fi
+
+
 		fi
 	done )
 	for a in ${A}
@@ -225,7 +272,7 @@ 
 			fi
 			if [ -n "$currentlocale" ]
 			then
-				(cd "${currentlocale}" ; unpack ${a} )
+				(cd "${currentlocale}" ; unpack ${a} ; cd .. )
 			fi
 		fi
 	done