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, 79 insertions, 22 deletions

diff --git a/games-rpg/nwn/ChangeLog b/games-rpg/nwn/ChangeLog
index 6f751ed509d2..5ab3ca46f251 100644
--- a/games-rpg/nwn/ChangeLog
+++ b/games-rpg/nwn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/nwn
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.53 2006/11/29 15:50:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.54 2006/12/19 16:53:26 wolf31o2 Exp $
+
+  19 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> nwn-1.68-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-1.68-r1.ebuild:
   We don't want to touch our metadata files again, so I've cleaned that up.
diff --git a/games-rpg/nwn/Manifest b/games-rpg/nwn/Manifest
index 694bdb02665f..79cff8a50b1b 100644
--- a/games-rpg/nwn/Manifest
+++ b/games-rpg/nwn/Manifest
@@ -25,18 +25,18 @@ DIST NWNSpanish1.68dialog.zip 6705882 RMD160 fd205ec81119bb410705019871f40f222be
 DIST Spanish_linuxclient168_orig.tar.gz 132704890 RMD160 699c5bdf5b020a91f3f1b86f961ae3416a62bd0d SHA1 62fba8f04bda9690f1b6c561019abe9c428b43f9 SHA256 01bfd907735a69112fc1847e82269ed2a3d00760a9906dd24819269e53173f13
 DIST Spanish_linuxclient168_xp1.tar.gz 143415370 RMD160 897b862f8baa392e733413f847a5e2ebabd17bbf SHA1 e1a3e13a5cf05c742d004fd76bd14a3d6b17c541 SHA256 c74faed185b87a0f187f4e1bcf873ec3810a1fd8dba026b81bcf421e1ca121d9
 DIST Spanish_linuxclient168_xp2.tar.gz 133862305 RMD160 25d36239aa9bb3e685f24c3e031128bbcbd1d1d6 SHA1 b14f3229529618ddf12b497d17421f753898e279 SHA256 b4d4efb0eb5d3395e42e665b518f3cec19c690b0f7f57783ecaa2e6aa8b70a5e
-EBUILD nwn-1.68-r1.ebuild 6586 RMD160 f56a961210bc2d7efbcb9be6ce00b85712a6d799 SHA1 7f62823f529920d792bc4d6ad157994a46b5b394 SHA256 2ab2be2f53d2d7fdf4a47b3102059265b9416010f85c066fd4ef8c7c5d56045e
-MD5 5ea8b6065be47d15a8a82efabf6655dc nwn-1.68-r1.ebuild 6586
-RMD160 f56a961210bc2d7efbcb9be6ce00b85712a6d799 nwn-1.68-r1.ebuild 6586
-SHA256 2ab2be2f53d2d7fdf4a47b3102059265b9416010f85c066fd4ef8c7c5d56045e nwn-1.68-r1.ebuild 6586
+EBUILD nwn-1.68-r1.ebuild 7720 RMD160 22690655bcb34d6d39c612da1111d8de32fca6ac SHA1 8cadd6ec0e7e977f70b2d1f1afca0ae0f9c38c50 SHA256 e89639e14b161549dcebd50ec14c82e9f239cefc1532844e9b52a184fbb216e8
+MD5 d7f42070683adf18534813ad063d8144 nwn-1.68-r1.ebuild 7720
+RMD160 22690655bcb34d6d39c612da1111d8de32fca6ac nwn-1.68-r1.ebuild 7720
+SHA256 e89639e14b161549dcebd50ec14c82e9f239cefc1532844e9b52a184fbb216e8 nwn-1.68-r1.ebuild 7720
 EBUILD nwn-1.68.ebuild 4607 RMD160 239778b61cbc39d605426e7d3ec22ef744d4106f SHA1 6ccd8dc0743c4dc7d2299fddc6374396104aa45a SHA256 e67149af929caa516b737c0b3f63feb82826dfdcb698e2607af935e73a7a13da
 MD5 073bcc8eedc94fadc59373369e254603 nwn-1.68.ebuild 4607
 RMD160 239778b61cbc39d605426e7d3ec22ef744d4106f nwn-1.68.ebuild 4607
 SHA256 e67149af929caa516b737c0b3f63feb82826dfdcb698e2607af935e73a7a13da nwn-1.68.ebuild 4607
-MISC ChangeLog 9732 RMD160 1a75554ac77650b987539c1826d49d35360ac80e SHA1 988316a5971285e3e46455ee1a8f3622df533f3a SHA256 c81244a529adfc6b6abd4bc3aaa44e41c8c0cbd3ff0cdf91867acc9f6a1c2d28
-MD5 9913e552c1d767f65ea5987c1f0ed0fb ChangeLog 9732
-RMD160 1a75554ac77650b987539c1826d49d35360ac80e ChangeLog 9732
-SHA256 c81244a529adfc6b6abd4bc3aaa44e41c8c0cbd3ff0cdf91867acc9f6a1c2d28 ChangeLog 9732
+MISC ChangeLog 9901 RMD160 91dfc72d6a84d7d5c87efcf839ff3fdae8af5793 SHA1 99c47c09ad61fa0ddd51a50d1a75fb2ee5b5e542 SHA256 309adc0288f0bac575158eb8f195cbdd82d09b30e4ba86d87c0b1a5901ed06ee
+MD5 e7334ef60970191635ac6821ab0769e9 ChangeLog 9901
+RMD160 91dfc72d6a84d7d5c87efcf839ff3fdae8af5793 ChangeLog 9901
+SHA256 309adc0288f0bac575158eb8f195cbdd82d09b30e4ba86d87c0b1a5901ed06ee ChangeLog 9901
 MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
@@ -48,9 +48,9 @@ MD5 9211d1a5cc17dcf4b30635146cebfbc4 files/digest-nwn-1.68-r1 5606
 RMD160 d478e62b610cd4eba39363516af13e5cd9b34476 files/digest-nwn-1.68-r1 5606
 SHA256 5f4c8b741774085ebea85e52f9df3f98e3bb55b1f26510b4f18d6c4de7dae994 files/digest-nwn-1.68-r1 5606
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFbarckT4lNIS36YERAt/fAKCt08A77FKCq/2dgE8AXYMumtFBcwCeL28D
-16+yuNb/zw3t647rokjFCSs=
-=8z+N
+iD8DBQFFiBnIkT4lNIS36YERAvMhAJ9YGgRmWXQksmMncYNjVtnWQioCywCglEYx
+pkkB/4g8ofOYyIbzuxbDefs=
+=HUMD
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/nwn/nwn-1.68-r1.ebuild b/games-rpg/nwn/nwn-1.68-r1.ebuild
index 678d8eced05d..a75da5fa472d 100644
--- a/games-rpg/nwn/nwn-1.68-r1.ebuild
+++ b/games-rpg/nwn/nwn-1.68-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.68-r1.ebuild,v 1.2 2006/11/29 15:50:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.68-r1.ebuild,v 1.3 2006/12/19 16:53:26 wolf31o2 Exp $
 
 inherit eutils games
 
+LANGUAGES="linguas_fr linguas_it linguas_es linguas_de linguas_en"
+
 MY_PV=${PV//.}
 PATCH_URL_BASE=http://files.bioware.com/neverwinternights/updates/linux/${MY_PV}
 DIALOG_URL_BASE=http://nwdownloads.bioware.com/neverwinternights/patch/dialog
@@ -52,7 +54,8 @@ SRC_URI="linguas_fr? (
 LICENSE="NWN-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="sou hou nowin"
+IUSE="sou hou ${LANGUAGES}"
+# nowin USE flag not used anymore by pkg_setup()
 RESTRICT="mirror strip"
 
 RDEPEND=">=games-rpg/nwn-data-1.29-r1
@@ -154,11 +157,10 @@ pkg_setup() {
 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 +184,7 @@ src_unpack() {
 				mkdir -p "${currentlocale}"
 				cd "${currentlocale}"
 				unpack "${a}" || die "unpack ${a}"
+				cd ..
 			fi
 		fi
 	done
@@ -190,7 +193,30 @@ src_unpack() {
 	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 +224,32 @@ src_unpack() {
 	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 +275,7 @@ src_unpack() {
 			fi
 			if [ -n "$currentlocale" ]
 			then
-				(cd "${currentlocale}" ; unpack ${a} )
+				(cd "${currentlocale}" ; unpack ${a} ; cd .. )
 			fi
 		fi
 	done
@@ -239,11 +289,14 @@ src_install() {
 		-e "s:GENTOO_USER:${GAMES_USER}:" \
 		-e "s:GENTOO_GROUP:${GAMES_GROUP}:" \
 		-e "s:GENTOO_DIR:${GAMES_PREFIX_OPT}:" \
+		-e "s:override miles nwm:miles:" \
+		-e "s:chitin.key dialog.tlk nwmain:chitin.key:" \
+		-e "s:^chmod a-x:#chmod a-x:" \
 		"${Ddir}"/fixinstall || die "sed"
 	if use hou || use sou
 	then
 		sed -i \
-			-e "s:nwmain patch.key:nwmain:" \
+			-e "s:chitin.key patch.key:chitin.key:" \
 			"${Ddir}"/fixinstall || die "sed"
 	fi
 	fperms ug+x "${dir}"/fixinstall || die "perms"