Added unpack for nwclient when not using a CD and made the dependencies on biounzip/unshield dependent on USE=cdinstall.

Package-Manager: portage-2.1.2_rc2-r1

3 files changed, 23 insertions, 16 deletions

diff --git a/games-rpg/nwn-data/ChangeLog b/games-rpg/nwn-data/ChangeLog
index 708b2301cdc5..47f6ad124f24 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.21 2006/11/21 17:20:33 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.22 2006/11/29 15:36:58 wolf31o2 Exp $
+
+  29 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  nwn-data-1.29-r1.ebuild:
+  Added unpack for nwclient when not using a CD and made the dependencies on
+  biounzip/unshield dependent on USE=cdinstall.
 
   21 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 901879e396af..02fe80dbbe9b 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 15414 RMD160 c1182f0201b9eb5d168775fc34eb224bcc546ec4 SHA1 4a53e175a617edc2906135761e1694038473b903 SHA256 85efccbaa8ac10a15f4578d7ffa046f02c0a7a6d3f4b780bd958c51502d8fa9a
-MD5 46ae776572c6d0cd29c6575c9f1b5266 nwn-data-1.29-r1.ebuild 15414
-RMD160 c1182f0201b9eb5d168775fc34eb224bcc546ec4 nwn-data-1.29-r1.ebuild 15414
-SHA256 85efccbaa8ac10a15f4578d7ffa046f02c0a7a6d3f4b780bd958c51502d8fa9a nwn-data-1.29-r1.ebuild 15414
+EBUILD nwn-data-1.29-r1.ebuild 15480 RMD160 c3ea7e31ed88a9cf2f4e86424714da5db2e726ca SHA1 72ab0793858a3e8cb361242913af24af2a11488c SHA256 05763b1e1520c44e152f993126e8c683f85adb5c7892703913d49c71bede990a
+MD5 e07dd99ae4122b7ba5fe7c325bcdc164 nwn-data-1.29-r1.ebuild 15480
+RMD160 c3ea7e31ed88a9cf2f4e86424714da5db2e726ca nwn-data-1.29-r1.ebuild 15480
+SHA256 05763b1e1520c44e152f993126e8c683f85adb5c7892703913d49c71bede990a nwn-data-1.29-r1.ebuild 15480
 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 3807 RMD160 4d7e08ae1da87e45bb1f88f9da01efc081f2d38f SHA1 ab54842886185c892546684f1809a867294760bd SHA256 96aaa4601a7b3fa01f60562200e77b2242eb23d4f02d9679100f04501c0dba27
-MD5 1c4aa97399e02ca0c24e34e3effb1c30 ChangeLog 3807
-RMD160 4d7e08ae1da87e45bb1f88f9da01efc081f2d38f ChangeLog 3807
-SHA256 96aaa4601a7b3fa01f60562200e77b2242eb23d4f02d9679100f04501c0dba27 ChangeLog 3807
+MISC ChangeLog 4014 RMD160 0f05faab3d460992813426b43ce0a23c0cd5f2df SHA1 cb58f28dc0b3e894968023d19e10c5e40bb09ebc SHA256 37acf5243594361e90d9d8412943c22d2148f56e3624ecc1cc3778b1a8ed6f98
+MD5 7d6470791530c3ededb7be42dc2bdc45 ChangeLog 4014
+RMD160 0f05faab3d460992813426b43ce0a23c0cd5f2df ChangeLog 4014
+SHA256 37acf5243594361e90d9d8412943c22d2148f56e3624ecc1cc3778b1a8ed6f98 ChangeLog 4014
 MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
@@ -33,7 +33,7 @@ SHA256 20aa5cd74dc16059279869c6299ecc66397bde28c0d315c913431d514a696ca2 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFYzjZkT4lNIS36YERAvWrAJ9FU2SyMPHtN+pmyRVMxKGgCQ8Q6gCfeVdW
-Zb1DjoxFumjZSZ+XMtWWByA=
-=WFBD
+iD8DBQFFbahekT4lNIS36YERAiSlAKCo5HotBuWFdz94eLJQZCa38wj9uQCfQ1ar
+OHOvY4aV4cjI2s5h2hnN8K4=
+=lhWu
 -----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 a2ca7225f5e7..d4a7e5a48192 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.2 2006/11/21 17:20:33 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild,v 1.3 2006/11/29 15:36:58 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -47,9 +47,10 @@ RDEPEND="virtual/opengl
 	amd64? (
 		app-emulation/emul-linux-x86-baselibs )"
 DEPEND="${RDEPEND}
-	games-util/biounzip
-	app-arch/unshield
-	amd64? ( ~app-arch/unshield-0.2 )
+	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
@@ -329,6 +330,7 @@ src_unpack() {
 		esac
 	elif use nowin
 	then
+		unpack nwclient${MY_PV}.tar.gz
 		cd "${WORKDIR}"
 		unpack nwresources${MY_PV}.tar.gz \
 			|| die "unpacking nwresources${MY_PV}.tar.gz"