--- /usr/portage/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild	2006-12-19 12:35:50.000000000 -0400
+++ /usr/local/portage/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild	2006-12-30 13:29:01.000000000 -0400
@@ -50,7 +50,6 @@
 	cdinstall? (
 		games-util/biounzip
 		app-arch/unshield )
-	amd64? ( cdinstall? ( ~app-arch/unshield-0.2 ) )
 	app-arch/unzip"
 
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/nwn/lib/libSDL-1.2.so.0.0.5
@@ -148,23 +147,14 @@
 		cdrom_get_cds KingmakerSetup.exe
 		;;
 	platinum_cd)
-		einfo "Shadows of the Undentride will be installed along with"
-		einfo "Neverwinter Nights.  If you also have Hordes of the"
-		einfo "Underdark, it will be installed afterwards."
+		einfo "Both Shadows of Undrentide and Hordes of the Underdark will"
+		einfo "be installed from your CDs along with Neverwinter Nights."
 		touch .metadata/orig || die "touch orig"
 		touch .metadata/sou || die "touch sou"
+		touch .metadata/hou || die "touching hou"
 		export CDROM_NAME_4="CD4" 
-		if use hou
-		then
-			einfo "You will also need the HoU CD for this installation."
-			export CDROM_NAME_5="HoU"
-			cdrom_get_cds ArcadeInstallNWNXP213f.EXE \
-				disk2.zip disk3.zip disk4.zip \
-				ArcadeInstallNWNXP213f.EXE
-		else
-			cdrom_get_cds ArcadeInstallNWNXP213f.EXE \
-				disk2.zip disk3.zip disk4.zip
-		fi
+		cdrom_get_cds ArcadeInstallNWNXP213f.EXE \
+			disk2.zip disk3.zip disk4.zip
 		;;
 	original_cd)
 		einfo "We will be installing the original Neverwinter Nights.  If"
@@ -245,21 +235,13 @@
 			cdrom_load_next_cd
 			einfo "Unpacking files..."
 			unzip -qo "${CDROM_ROOT}"/disk3.zip || die "unpacking"
+			unzip -qo "${CDROM_ROOT}"/Data_Linux.zip || die "unpacking"
+			unzip -qo "${CDROM_ROOT}"/language_data.zip || die "unpacking"
 			cdrom_load_next_cd
 			einfo "Unpacking files..."
 			unzip -qo "${CDROM_ROOT}"/disk4.zip || die "unpacking"
 			unzip -qo "${CDROM_ROOT}"/xp1.zip || die "unpacking"
 			unzip -qo "${CDROM_ROOT}"/xp1_data.zip || die "unpacking"
-			if use hou
-			then
-				cdrom_load_next_cd
-				rm -f xp1patch.key data/xp1patch.bif override/*
-				einfo "Unpacking files..."
-				unzip -qo "${CDROM_ROOT}"/Data_Shared.zip || die "unpacking"
-				unzip -qo "${CDROM_ROOT}"/Language_data.zip || die "unpacking"
-				unzip -qo "${CDROM_ROOT}"/Language_update.zip || die "unpacking"
-				touch .metadata/hou || die "touching hou"
-			fi
 			;;
 		original_cd)
 			# Now, we need to create our directories, since we know we'll end up