Fixing package collisions with games-rpg/nwn and closing bug #145593.

Package-Manager: portage-2.1.1_rc1-r1

3 files changed, 28 insertions, 14 deletions

diff --git a/games-rpg/nwn-data/ChangeLog b/games-rpg/nwn-data/ChangeLog
index 9fff9c25042a..1d68e6bd3d1f 100644
--- a/games-rpg/nwn-data/ChangeLog
+++ b/games-rpg/nwn-data/ChangeLog
@@ -1,6 +1,9 @@
 # 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.17 2006/09/01 23:57:42 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.18 2006/09/05 20:59:26 wolf31o2 Exp $
+
+  05 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
+  Fixing package collisions with games-rpg/nwn and closing bug #145593.
 
   01 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
   Add some more error checking into the unpacking stage.
diff --git a/games-rpg/nwn-data/Manifest b/games-rpg/nwn-data/Manifest
index 27dae7fb6ae2..897d7973c4cd 100644
--- a/games-rpg/nwn-data/Manifest
+++ b/games-rpg/nwn-data/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST nwclient129.tar.gz 5504342 RMD160 3cffcec613ec8fdd8241d6f6b47fe891434d5024 SHA1 501c5ca495366993413fa3e7e6969aa82f096bde SHA256 3d75e07f4d44fde789481240d02c07a7a7e0599bc2300d8a73f98f4c752da80e
 DIST nwfrench129.tar.gz 357777520
 DIST nwgerman129.tar.gz 381832822
@@ -5,14 +8,14 @@ DIST nwitalian129.tar.gz 3926804
 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
-EBUILD nwn-data-1.29.ebuild 6755 RMD160 e9d6db11844efb77722ad915f0649b176f0c9082 SHA1 6dc79deaae1fc3d0529872fbee94026150de4d4b SHA256 1b15c2a6f6abb71a955da09b32c280ce139239a142464eabada002cdbbb282d4
-MD5 fcd30fe76967265eaff51a94bc043629 nwn-data-1.29.ebuild 6755
-RMD160 e9d6db11844efb77722ad915f0649b176f0c9082 nwn-data-1.29.ebuild 6755
-SHA256 1b15c2a6f6abb71a955da09b32c280ce139239a142464eabada002cdbbb282d4 nwn-data-1.29.ebuild 6755
-MISC ChangeLog 2773 RMD160 97abb475bb8075fcb126eb9b6b6c6809c58f317d SHA1 d67c217cd8b1947d4d3cbc5cd8b4b4e59630133b SHA256 535f5932e29b3f7968984b0b2cf2bbdfcc0e19d5976689ee9d1fc75bc2c8ab15
-MD5 71f47b63d98c00aef5486a385f3e5ce7 ChangeLog 2773
-RMD160 97abb475bb8075fcb126eb9b6b6c6809c58f317d ChangeLog 2773
-SHA256 535f5932e29b3f7968984b0b2cf2bbdfcc0e19d5976689ee9d1fc75bc2c8ab15 ChangeLog 2773
+EBUILD nwn-data-1.29.ebuild 6815 RMD160 0e6472d446b5be2f43414d8be17f78d82d8a076e SHA1 a3a484a5b087e06aae2cb6b3b902acd536fca8e0 SHA256 3addde01968a6a006664052ea76cc4898d8468ba1253d6d0f658b351e47a227b
+MD5 c281e8fe62e31faea63f89228225d7a0 nwn-data-1.29.ebuild 6815
+RMD160 0e6472d446b5be2f43414d8be17f78d82d8a076e nwn-data-1.29.ebuild 6815
+SHA256 3addde01968a6a006664052ea76cc4898d8468ba1253d6d0f658b351e47a227b nwn-data-1.29.ebuild 6815
+MISC ChangeLog 2922 RMD160 1ccd82408fe83e2570df35e398a00315e373dc98 SHA1 090e808644df07e734735b83e988d2cf12af52ce SHA256 476c6f039ff2ba2e6fbd9fa7bf51b02d8b221cc00e396109260eb05207ec08f9
+MD5 107ef9c0b5963853a121d9229e9669ef ChangeLog 2922
+RMD160 1ccd82408fe83e2570df35e398a00315e373dc98 ChangeLog 2922
+SHA256 476c6f039ff2ba2e6fbd9fa7bf51b02d8b221cc00e396109260eb05207ec08f9 ChangeLog 2922
 MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
@@ -20,3 +23,10 @@ SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535 metadata
 MD5 69803d36920d170ca06356a7255d28b1 files/digest-nwn-data-1.29 952
 RMD160 094188d65bc3e1b6e5eb255ce372857652655b87 files/digest-nwn-data-1.29 952
 SHA256 b20b913dad2a788b10c54d2ac9c4589f6ce45088e04abda93fab1ecfa8e976de files/digest-nwn-data-1.29 952
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE/eWykT4lNIS36YERAtkOAJ9kOa5jnKFnvE5gFy7HEh8a1vo6PgCePf6B
+ujOn8nSlFkb7JasX1H5e8a8=
+=oA2K
+-----END PGP SIGNATURE-----
diff --git a/games-rpg/nwn-data/nwn-data-1.29.ebuild b/games-rpg/nwn-data/nwn-data-1.29.ebuild
index f039f7a4a5d1..68a4d406e79e 100644
--- a/games-rpg/nwn-data/nwn-data-1.29.ebuild
+++ b/games-rpg/nwn-data/nwn-data-1.29.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.ebuild,v 1.18 2006/09/01 23:57:42 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29.ebuild,v 1.19 2006/09/05 20:59:26 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -106,7 +106,6 @@ src_unpack() {
 		unzip -o "${CDROM_ROOT}"/Language_data.zip || die "unpacking"
 		unzip -o "${CDROM_ROOT}"/Language_update.zip || die "unpacking"
 		unzip -o "${CDROM_ROOT}"/Data_Linux.zip || die "unpacking"
-		rm -f data/patch.bif patch.key
 		touch .metadata/sou || die "touching sou"
 	fi
 	if use hou
@@ -116,12 +115,13 @@ src_unpack() {
 			rm -f xp1patch.key data/xp1patch.bif override/*
 			cdrom_load_next_cd
 		fi
-		rm -f data/patch.bif patch.key
 		unzip -o "${CDROM_ROOT}"/Data_Shared.zip || die "unpacking"
 		unzip -o "${CDROM_ROOT}"/Language_data.zip || die "unpacking"
 		unzip -o "${CDROM_ROOT}"/Language_update.zip || die "unpacking"
 		touch .metadata/hou || die "touching hou"
 	fi
+	# These files aren't needed and come from the patches (games-rpg/nwn)
+	rm -f data/patch.bif patch.key
 
 	sed -i -e '\:^./nwmain .*:i \
 if [[ -f ./nwmouse.so ]]; then \
@@ -138,8 +138,9 @@ src_install() {
 	# eventually be removed to allow for nwmovies to work.
 	rm -rf "${S}"/movies
 	mkdir -p "${S}"/dmvault "${S}"/hak "${S}"/portraits "${S}"/localvault
-	rm -rf "${S}"/dialog.tlk "${S}"/dialog.TLK "${S}"/dmclient "${S}"/nwmain \
-		"${S}"/nwserver  "${S}"/nwm/* "${S}"/SDL-1.2.5 "${S}"/fixinstall
+	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
 	mv "${S}"/* "${Ddir}"
 	mv "${S}"/.metadata "${Ddir}"
 	keepdir "${dir}"/servervault