Added a ton of patches from Denis Dupeyron <calchan@gentoo.org>. This closes bug #152367.

Package-Manager: portage-2.1.2_rc3-r4

3 files changed, 80 insertions, 38 deletions

diff --git a/games-rpg/nwn-data/ChangeLog b/games-rpg/nwn-data/ChangeLog
index 88d0b525a5a6..4e41c2c8deaa 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.23 2006/11/29 21:38:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.24 2006/12/19 16:34:08 wolf31o2 Exp $
+
+  19 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  nwn-data-1.29-r1.ebuild:
+  Added a ton of patches from Denis Dupeyron <calchan@gentoo.org>. This closes
+  bug #152367.
 
   29 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   nwn-data-1.29-r1.ebuild:
diff --git a/games-rpg/nwn-data/Manifest b/games-rpg/nwn-data/Manifest
index 3003975ca4f9..040f36333fef 100644
--- a/games-rpg/nwn-data/Manifest
+++ b/games-rpg/nwn-data/Manifest
@@ -8,18 +8,18 @@ DIST nwitalian129.tar.gz 3926804 RMD160 62d6e3219a88636df60db2c8339337fa277c8467
 DIST nwn.png 4296 RMD160 958ed2051e91b0ab5f7ae8892c8ed3012cfe3900 SHA1 a4de1822df20ffaa18ff14060d00ea75eee56939 SHA256 9703cb47b32d6bf0202198ab490395046d2ef4ffdde22dca91748a966134e139
 DIST nwresources129.tar.gz 1212356127 RMD160 1a986d12bc3153ff7646053e60d610155944b5ac SHA1 6f399dbf876f357a57096996447d4b9fa68bcb58 SHA256 40e7bb8aebae931c2ce05f199ed15714845b403c4a6d9fab88092e784214bee2
 DIST nwspanish129.tar.gz 3912516 RMD160 8fd2592cfc92246c64be2930a5a4032fe8c07ed1 SHA1 6d60d168a232f845913b3bb41e91362faf29bcbe SHA256 100833e91e3f729a473de3372019e1086aac444f3c90c799af43d16833b7a1ed
-EBUILD nwn-data-1.29-r1.ebuild 15444 RMD160 50f52a5135da5a793728d0e94b43a0e8c72eebbd SHA1 ea2b3aefe90ab20e0509e38dfa391f24449811f8 SHA256 5b4504e1776286470d657fde0d7b48e43d0e3cef096d4aec412d6894941c1f13
-MD5 7e7d17c9f0bba61534d7fa8255e89b10 nwn-data-1.29-r1.ebuild 15444
-RMD160 50f52a5135da5a793728d0e94b43a0e8c72eebbd nwn-data-1.29-r1.ebuild 15444
-SHA256 5b4504e1776286470d657fde0d7b48e43d0e3cef096d4aec412d6894941c1f13 nwn-data-1.29-r1.ebuild 15444
+EBUILD nwn-data-1.29-r1.ebuild 16495 RMD160 70192a8368af083d044c7e375e25cb0793e4d396 SHA1 d3a9e1d0142037a0167e7340c8acd5d5aed4860e SHA256 2265751b6b6ea4ef11c412543eca676b1f781c880cd295d7047f5518458d22f3
+MD5 b4f824a538f5cf928b9b00478b55e7d9 nwn-data-1.29-r1.ebuild 16495
+RMD160 70192a8368af083d044c7e375e25cb0793e4d396 nwn-data-1.29-r1.ebuild 16495
+SHA256 2265751b6b6ea4ef11c412543eca676b1f781c880cd295d7047f5518458d22f3 nwn-data-1.29-r1.ebuild 16495
 EBUILD nwn-data-1.29.ebuild 6787 RMD160 8877e148c36136d3575ef167ca18561e9662fede SHA1 e6b036c2b6685ebb91bb3fcbc825df84677ddb68 SHA256 5a99b4755e8c1e14cc28d84dddf18536d45ad4eea9166111cd72eafd33f290b5
 MD5 729cd2162fe8daf038caf120da5e0878 nwn-data-1.29.ebuild 6787
 RMD160 8877e148c36136d3575ef167ca18561e9662fede nwn-data-1.29.ebuild 6787
 SHA256 5a99b4755e8c1e14cc28d84dddf18536d45ad4eea9166111cd72eafd33f290b5 nwn-data-1.29.ebuild 6787
-MISC ChangeLog 4217 RMD160 b245190997aac2688e87441b257b755be91b1c16 SHA1 2bc0067684ce77730da2aad052d573f5daf09c61 SHA256 141fbb0bb89189f9b3a4b4075d5eb56144b03b0409cb845f2f8e27d8b35b9e90
-MD5 4bdabb929ad9ece6023e9bd2f2a11b96 ChangeLog 4217
-RMD160 b245190997aac2688e87441b257b755be91b1c16 ChangeLog 4217
-SHA256 141fbb0bb89189f9b3a4b4075d5eb56144b03b0409cb845f2f8e27d8b35b9e90 ChangeLog 4217
+MISC ChangeLog 4393 RMD160 3706e8e3af4162f8c1ef3897ffc446258240b9a7 SHA1 51ee630333f01d76380250281924a7e47c0be31a SHA256 e22a71617b5a7f1b07376ef084df719d285fa3e62874ac99951d06dd2abc192f
+MD5 c1f99df9bd7b56145c80327eb050a8ff ChangeLog 4393
+RMD160 3706e8e3af4162f8c1ef3897ffc446258240b9a7 ChangeLog 4393
+SHA256 e22a71617b5a7f1b07376ef084df719d285fa3e62874ac99951d06dd2abc192f ChangeLog 4393
 MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
@@ -31,9 +31,9 @@ MD5 897a21d522d5ad2f4ebf1f515b525733 files/digest-nwn-data-1.29-r1 1660
 RMD160 23a3ffbb3b4e708030b0bee0520d7e3c41f52687 files/digest-nwn-data-1.29-r1 1660
 SHA256 20aa5cd74dc16059279869c6299ecc66397bde28c0d315c913431d514a696ca2 files/digest-nwn-data-1.29-r1 1660
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFbfzxkT4lNIS36YERArpuAJ0YD/WNU8o1ipVVvwvk9VLTrpFAiQCfRsaa
-YjBzZstNSr1zxL44a++XFKY=
-=f/Wv
+iD8DBQFFiBVOkT4lNIS36YERAiUWAJ0VeWowRu2fZRnFRYz/x582dwVWKgCeNemb
+3moymx1FbGY8n1K12UEB/yM=
+=TKz1
 -----END PGP SIGNATURE-----
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 8763fa0611cd..1a0b4dae2f6e 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-2006 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.4 2006/11/29 21:38:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild,v 1.5 2006/12/19 16:34:08 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -32,14 +32,14 @@ LINGUAS_SRC_URI="linguas_fr? (
 DESCRIPTION="Neverwinter Nights Data Files"
 HOMEPAGE="http://nwn.bioware.com/downloads/linuxclient.html"
 SRC_URI="${CLIENT_BASEURL}/${MY_PV}/nwclient${MY_PV}.tar.gz
-	cdinstall? ( ${LINGUAS_SRC_URI} )
 	nowin? ( ${NOWIN_SRC_URI} ${LINGUAS_SRC_URI} )
+	!nowin? ( cdinstall? ( ${LINGUAS_SRC_URI} ) )
 	mirror://gentoo/nwn.png"
 
 LICENSE="NWN-EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall hou nowin sou ${LANGUAGES}"
+IUSE="cdinstall hou nowin sou videos ${LANGUAGES}"
 RESTRICT="strip mirror"
 
 RDEPEND="virtual/opengl
@@ -131,12 +131,13 @@ get_nwn_set() {
 get_cd_set() {
 	while `[ -z "${NWN_SET}" ]`
 	do
-		echo "Please insert your Neverwinter Nights CD/DVD into your drive and"
+		echo "Please insert your first Neverwinter Nights CD/DVD into your drive and"
 		echo "press any key to continue"
-		read -n
+		read -n 1
 		get_nwn_set
 	done
 	# 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
 	diamond_dvd)
 		einfo "Both Shadows of Undrentide and Hordes of the Underdark will"
@@ -152,9 +153,11 @@ get_cd_set() {
 		einfo "Underdark, it will be installed afterwards."
 		touch .metadata/orig || die "touch orig"
 		touch .metadata/sou || die "touch sou"
+		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
@@ -171,17 +174,20 @@ get_cd_set() {
 		if use sou && use hou
 		then
 			einfo "You will also need the SoU and HoU CDs for this installation."
+			export CDROM_NAME_4="SoU" CDROM_NAME_5="HoU"
 			cdrom_get_cds ArcadeInstallNWN109.exe disk2.bzf \
 				movies/NWNintro.bik NWNSoUInstallGuide.rtf \
 				ArcadeInstallNWNXP213f.EXE
 		elif use sou
 		then
 			einfo "You will also need the SoU CD for this installation."
+			export CDROM_NAME_4="SoU"
 			cdrom_get_cds ArcadeInstallNWN109.exe disk2.bzf \
 				movies/NWNintro.bik NWNSoUInstallGuide.rtf
 		elif use hou
 		then
 			einfo "You will also need the HoU CD for this installation."
+			export CDROM_NAME_4="HoU"
 			cdrom_get_cds ArcadeInstallNWN109.exe disk2.bzf \
 				movies/NWNintro.bik ArcadeInstallNWNXP213f.EXE
 		else
@@ -226,22 +232,19 @@ src_unpack() {
 			unzip -qo "${CDROM_ROOT}"/data/XP2.zip
 			;;
 		platinum_cd)
-			# This one isn't too bad, either.  Luckily, everything in in a ZIP.
+			# This one isn't too bad, either.  Luckily, everything is in a ZIP.
 			mkdir -p "${S}"
 			cd "${S}"
 			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"
-			einfo "Please insert disk 2"
 			cdrom_load_next_cd
 			einfo "Unpacking files..."
 			unzip -qo "${CDROM_ROOT}"/disk2.zip || die "unpacking"
-			einfo "Please insert disk 3"
 			cdrom_load_next_cd
 			einfo "Unpacking files..."
 			unzip -qo "${CDROM_ROOT}"/disk3.zip || die "unpacking"
-			einfo "Please inert disk 4"
 			cdrom_load_next_cd
 			einfo "Unpacking files..."
 			unzip -qo "${CDROM_ROOT}"/disk4.zip || die "unpacking"
@@ -249,7 +252,6 @@ src_unpack() {
 			unzip -qo "${CDROM_ROOT}"/xp1_data.zip || die "unpacking"
 			if use hou
 			then
-				einfo "Please insert the HoU disk"
 				cdrom_load_next_cd
 				rm -f xp1patch.key data/xp1patch.bif override/*
 				einfo "Unpacking files..."
@@ -263,7 +265,7 @@ src_unpack() {
 			# Now, we need to create our directories, since we know we'll end up
 			# needing them for our install.
 			mkdir -p ambient data dmvault docs lib localvault miles modules \
-				music nwm override texturepacks scripttemplates movies
+				music nwm override texturepacks scripttemplates
 
 			# Handle NWN CD1
 			mkdir "${S}"/disc1_tmp
@@ -279,26 +281,31 @@ src_unpack() {
 			mv -f disc1_tmp/*.bic localvault
 			mv -f disc1_tmp/*.{pdf,txt} docs
 			mv -f disc1_tmp/*.erf texturepacks
+			mv -f disc1_tmp/chitin.key .
 			rm -rf disc1_tmp
 
 			# NWN CD2
-			einfo "Please insert disk 2"
 			cdrom_load_next_cd
 			biounzip ${CDROM_ROOT}/disk2.bzf . || die "unpacking files"
 
 			# NWN CD3
-			einfo "Please insert disk 3"
 			cdrom_load_next_cd
 			einfo "Copying files from cd..."
-			for i in ambient data movies music
+			for i in ambient data music
 			do
 				cp ${CDROM_ROOT}/${i}/* "${S}"/${i} || die "error copying data"
+				chmod -x "${S}"/${i}/*
 			done
+			if use videos
+			then
+				mkdir -p "${S}"/movies
+				cp ${CDROM_ROOT}/movies/* "${S}"/movies || die "error copying data"
+				chmod -x "${S}"/movies/*
+			fi
 
 			# Now, we install HoU and SoU, if necessary
 			if use sou
 			then
-				einfo "Please insert the SoU disk"
 				cdrom_load_next_cd
 				einfo "Unpacking files..."
 				unzip -qo "${CDROM_ROOT}"/Data_Shared.zip || die "unpacking"
@@ -309,7 +316,6 @@ src_unpack() {
 			fi
 			if use hou
 			then
-				einfo "Please insert the HoU disk"
 				cdrom_load_next_cd
 				if use sou && use hou
 				then
@@ -322,14 +328,16 @@ src_unpack() {
 				touch .metadata/hou || die "touching hou"
 			fi
 			unpack nwclient${MY_PV}.tar.gz
-			cd "${WORKDIR}"
-			unpack nwresources${MY_PV}.tar.gz \
-				|| die "unpacking nwresources${MY_PV}.tar.gz"
-			cd "${S}"
 			;;
 		esac
-	elif use nowin
+	fi
+	if use nowin
 	then
+		if (use sou || use hou) && ! use cdinstall ; then
+			ewarn "If you really want to install SoU and/or HoU, you must"
+			ewarn "emerge with USE=cdinstall."
+			die "SoU and/or HoU require USE=cdinstall."
+		fi
 		unpack nwclient${MY_PV}.tar.gz
 		cd "${WORKDIR}"
 		unpack nwresources${MY_PV}.tar.gz \
@@ -368,6 +376,10 @@ src_unpack() {
 	fi
 	# These files aren't needed and come from the patches (games-rpg/nwn)
 	rm -f data/patch.bif patch.key
+
+	# Rename nwn.ini to avoid overwriting it every time
+	mv nwn.ini nwn.ini.default
+
 	sed -i -e 's,/bin/sh,/bin/bash,g' -e '\:^./nwmain .*:i \
 '"dir='${dir}';LINGUAS='${LINGUAS}'"' \
 die() { \
@@ -410,6 +422,12 @@ then \
 	done \
 fi \
 cd "${p}" || die "cd ${p}" \
+if [[ ! -a nwn.ini ]]; then \
+        cp nwn.ini.default nwn.ini \
+fi \
+if [[ -r ./nwmovies.so ]]; then \
+	export LD_PRELOAD=./nwmovies.so:$LD_PRELOAD \
+fi \
 if [[ -r ./nwmouse.so ]]; then \
 	export XCURSOR_PATH="$(pwd)" \
 	export XCURSOR_THEME=nwmouse \
@@ -424,6 +442,10 @@ src_install() {
 	rm -rf "${S}"/dialog.tlk "${S}"/dialog.TLK "${S}"/dialogf.tlk \
 		"${S}"/dmclient "${S}"/nwmain "${S}"/nwserver  "${S}"/nwm/* \
 		"${S}"/SDL-1.2.5 "${S}"/fixinstall
+	if ! use videos
+	then
+		rm -rf "${S}"/movies/*
+	fi	
 	mv "${S}"/* "${Ddir}"
 	mv "${S}"/.metadata "${Ddir}"
 	keepdir "${dir}"/servervault
@@ -432,7 +454,7 @@ src_install() {
 	keepdir "${dir}"/portraits
 	keepdir "${dir}"/hak
 	cd "${Ddir}"
-	for d in ambient data dmvault hak localvault music override portraits
+	for d in ambient data dmvault hak localvault movies music override portraits
 	do
 		if [ -d ${d} ]
 		then
@@ -467,7 +489,7 @@ src_install() {
 
 pkg_postinst() {
 	games_pkg_postinst
-	if ! use cdinstall || ! use nowin ; then
+	if ! use cdinstall && ! use nowin ; then
 		elog "The NWN linux client data is now installed."
 		elog "Proceed with the following steps in order to get it working:"
 		elog "1) Copy the following directories/files from your installed and"
@@ -478,9 +500,13 @@ pkg_postinst() {
 		elog "    hak/"
 		elog "    localvault/"
 		elog "    modules/"
+		if use videos
+		then
+			elog "    movies/"
+		fi
 		elog "    music/"
 		elog "    portraits/"
-		elgo "    saves/"
+		elog "    saves/"
 		elog "    servervault/"
 		elog "    texturepacks/"
 		elog "    chitin.key"
@@ -500,12 +526,23 @@ pkg_postinst() {
 		elog "    chown -R ${GAMES_USER}:${GAMES_GROUP} ${dir}"
 		elog "    chmod -R g+rwX ${dir}"
 		echo
-		elog "Or try emerging with USE=nowin"
+		elog "Or try emerging with USE=nowin and/or USE=cdinstall."
 		echo
 	else
 		einfo "The NWN linux client data is now installed."
 		echo
 	fi
+	if use cdinstall && ! use nowin ; then
+		ewarn "Some/all demo modules will be missing. You can copy them manually into :"
+		ewarn "${dir}/modules"
+		ewarn "or emerge with USE=nowin."
+ 	fi
+	if ! use cdinstall && use nowin && use videos
+	then
+		ewarn "Some/all movies will be missing. You can copy them manually into :"
+		ewarn "${dir}/movies"
+		ewarn "or emerge with USE=cdinstall and/or USE=-nowin."
+	fi
 	elog "This is only the data portion, you will also need games-rpg/nwn to"
 	elog "play Neverwinter Nights."
 	echo