From 90d6a3e73df48cbb964326a418837ee2ebea65dc Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 2 Feb 2007 16:42:01 +0000 Subject: [PATCH] Updated to (hopefully) properly support the Diamond DVD and the Platinum CD and DVD sets using information provided by Nicholas Doyle and Brian Jedsen . Closing bug #155831, bug #159486, and bug #163031. Package-Manager: portage-2.1.2-r5 --- games-rpg/nwn-data/ChangeLog | 11 ++- games-rpg/nwn-data/Manifest | 26 ++++-- games-rpg/nwn-data/nwn-data-1.29-r1.ebuild | 94 +++++++++++----------- 3 files changed, 73 insertions(+), 58 deletions(-) diff --git a/games-rpg/nwn-data/ChangeLog b/games-rpg/nwn-data/ChangeLog index 4e41c2c8deaa..b06d31202c4c 100644 --- a/games-rpg/nwn-data/ChangeLog +++ b/games-rpg/nwn-data/ChangeLog @@ -1,6 +1,13 @@ # 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.24 2006/12/19 16:34:08 wolf31o2 Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.25 2007/02/02 16:42:01 wolf31o2 Exp $ + + 02 Feb 2007; Chris Gianelloni + nwn-data-1.29-r1.ebuild: + Updated to (hopefully) properly support the Diamond DVD and the Platinum CD + and DVD sets using information provided by Nicholas Doyle + and Brian Jedsen . Closing bug + #155831, bug #159486, and bug #163031. 19 Dec 2006; Chris Gianelloni nwn-data-1.29-r1.ebuild: diff --git a/games-rpg/nwn-data/Manifest b/games-rpg/nwn-data/Manifest index c1ee7984c7ec..30e6a9d99efc 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 RMD160 d64a2e52691e9d7897fedb9faae038b1c88699f5 SHA1 08ce997118af131cdaac3e3b3c01124291cffe14 SHA256 9a5ddcbc8ca443cb5bbcacb76587b171d37441906a1319155bba35f1bfffa9e0 DIST nwgerman129.tar.gz 381832822 RMD160 02d5d76e9a59f07d5baea1bf7e29e3ed65466936 SHA1 995f4ac5fae0ea574d41692ce4e1efcae685b516 SHA256 950f730121a90fef2fd5a0810c329a04d1697a7b5f859e240e3307d31050e6e0 @@ -5,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 16462 RMD160 998662ae9d6e690dff94c830fe1f298b431d641b SHA1 06bb43802fd1f96a89e5f08ab62673e577156ef9 SHA256 0d2564cb70b7560c3585c494abd42875d4edd1b97cb14f3d2c46ce873644cfd7 -MD5 0d6d99a6afcb761cbdebae6bc6008e51 nwn-data-1.29-r1.ebuild 16462 -RMD160 998662ae9d6e690dff94c830fe1f298b431d641b nwn-data-1.29-r1.ebuild 16462 -SHA256 0d2564cb70b7560c3585c494abd42875d4edd1b97cb14f3d2c46ce873644cfd7 nwn-data-1.29-r1.ebuild 16462 +EBUILD nwn-data-1.29-r1.ebuild 16584 RMD160 d57948d22385255651fecdc5f8dbbf8b215f01b5 SHA1 cbd1289aafc8c5c058e6ed761c8d77ede9f1a741 SHA256 75c1c70a0af41b9358a3bc77c782dc599368ba88ad5f6e025e0dac7b8af032bd +MD5 b34e12689e30c0caabf156007fc222a6 nwn-data-1.29-r1.ebuild 16584 +RMD160 d57948d22385255651fecdc5f8dbbf8b215f01b5 nwn-data-1.29-r1.ebuild 16584 +SHA256 75c1c70a0af41b9358a3bc77c782dc599368ba88ad5f6e025e0dac7b8af032bd nwn-data-1.29-r1.ebuild 16584 EBUILD nwn-data-1.29.ebuild 6786 RMD160 f4646fbdb29b03237756cb6291488808a8a4a6af SHA1 3af135113a0e4b420aa0db2ea5bd92fe979b2f18 SHA256 8a60e32fa41ecd45e03e57ae1411b60368742cb6335c14a4ae3d170522067df4 MD5 e98696ea3bc14e35add7addecd6f8378 nwn-data-1.29.ebuild 6786 RMD160 f4646fbdb29b03237756cb6291488808a8a4a6af nwn-data-1.29.ebuild 6786 SHA256 8a60e32fa41ecd45e03e57ae1411b60368742cb6335c14a4ae3d170522067df4 nwn-data-1.29.ebuild 6786 -MISC ChangeLog 4393 RMD160 3706e8e3af4162f8c1ef3897ffc446258240b9a7 SHA1 51ee630333f01d76380250281924a7e47c0be31a SHA256 e22a71617b5a7f1b07376ef084df719d285fa3e62874ac99951d06dd2abc192f -MD5 c1f99df9bd7b56145c80327eb050a8ff ChangeLog 4393 -RMD160 3706e8e3af4162f8c1ef3897ffc446258240b9a7 ChangeLog 4393 -SHA256 e22a71617b5a7f1b07376ef084df719d285fa3e62874ac99951d06dd2abc192f ChangeLog 4393 +MISC ChangeLog 4730 RMD160 8c66bdae3a2a5be4e5cd581d5abe8391b04cc828 SHA1 caf9693d7675d04012f0b27fb38a0c226109a960 SHA256 a237e36887686ce56305315ecb6eaf92fea9ef3a4e0ca174f82d3d92f28571b5 +MD5 126b4e232119ac8f486443190d6cff41 ChangeLog 4730 +RMD160 8c66bdae3a2a5be4e5cd581d5abe8391b04cc828 ChangeLog 4730 +SHA256 a237e36887686ce56305315ecb6eaf92fea9ef3a4e0ca174f82d3d92f28571b5 ChangeLog 4730 MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254 @@ -27,3 +30,10 @@ SHA256 20aa5cd74dc16059279869c6299ecc66397bde28c0d315c913431d514a696ca2 files/di 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 v2.0.1 (GNU/Linux) + +iD8DBQFFw2qhkT4lNIS36YERAsuVAKCXg5bvcfXekUrGWGduLEQtOzTxlQCfc7R0 +NPsXiH3B/V0usJ/DFNchI8c= +=hKj8 +-----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 30b438855893..58cf50d90c27 100644 --- a/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild +++ b/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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.6 2007/01/26 19:58:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29-r1.ebuild,v 1.7 2007/02/02 16:42:01 wolf31o2 Exp $ inherit eutils games # Diamond DVD - NWN, SoU, HotU (1 disk) -# Platinum CD/DVD - NWN, SoU (4 disks/1 disk) +# Platinum CD/DVD - NWN, SoU, HotU (4 disks/1 disk) # Deluxe CD - NWN, SoU, HotU (5 disks) # Gold CD - NWN, SoU # Original CD - NWN (1 disk) @@ -50,7 +50,6 @@ DEPEND="${RDEPEND} 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 @@ get_cd_set() { 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" - 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 + touch .metadata/hou || die "touching hou" + export CDROM_NAME_4="CD4" + cdrom_get_cds ArcadeInstallNWNXP213f.EXE \ + disk2.zip disk3.zip disk4.zip ;; original_cd) einfo "We will be installing the original Neverwinter Nights. If" @@ -239,26 +229,34 @@ src_unpack() { 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" - cdrom_load_next_cd - einfo "Unpacking files..." - unzip -qo "${CDROM_ROOT}"/disk2.zip || die "unpacking" - cdrom_load_next_cd - einfo "Unpacking files..." - unzip -qo "${CDROM_ROOT}"/disk3.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 + unshield x "${CDROM_ROOT}"/data2.cab || die "unpacking" + # We have to adjust the files after unpacking the cab file. + rm -rf _* + mv -f NWN_Platinum/Miles/* miles/ + mv -f NWN_Platinum/ambient/*.wav ambient/ + mv -f NWN_Platinum/docs . + mv -f NWN_Platinum/modules . + mv -f NWN_Platinum/nwm . + mv -f NWN_Platinum/nwm . + mv -f NWN_Platinum/utils/nwupdateskins/*.bmp utils/nwupdateskins/ + rm -rf NWN_Platinum/ + # If we have the DVD, we're done. If not, we need to switch CDs and + # unpack the files on them. + if [ `du -b "${CDROM_ROOT}"/Data_Shared.zip` -lt 700000000 ] 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" + unzip -qo "${CDROM_ROOT}"/disk2.zip || die "unpacking" + 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" fi ;; original_cd) @@ -327,10 +325,11 @@ src_unpack() { unzip -qo "${CDROM_ROOT}"/Language_update.zip || die "unpacking" touch .metadata/hou || die "touching hou" fi - unpack nwclient${MY_PV}.tar.gz ;; esac fi + # We unpack this for all media sets. + unpack nwclient${MY_PV}.tar.gz if use nowin then if (use sou || use hou) && ! use cdinstall ; then @@ -338,7 +337,6 @@ src_unpack() { 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 \ || die "unpacking nwresources${MY_PV}.tar.gz" @@ -348,13 +346,13 @@ src_unpack() { rm -rf override/* for a in ${A} do - currentlocale="" - if [ -z ${a/*german*/} ] - then - currentlocale=de - elif [ -z ${a/*spanish*/} ] - then - currentlocale=es + currentlocale="" + if [ -z ${a/*german*/} ] + then + currentlocale=de + elif [ -z ${a/*spanish*/} ] + then + currentlocale=es elif [ -z ${a/*italian*/} ] then currentlocale=it @@ -423,7 +421,7 @@ then \ fi \ cd "${p}" || die "cd ${p}" \ if [[ ! -a nwn.ini ]]; then \ - cp nwn.ini.default nwn.ini \ + cp nwn.ini.default nwn.ini \ fi \ if [[ -r ./nwmovies.so ]]; then \ export LD_PRELOAD=./nwmovies.so:$LD_PRELOAD \ @@ -445,7 +443,7 @@ src_install() { if ! use videos then rm -rf "${S}"/movies/* - fi + fi mv "${S}"/* "${Ddir}" mv "${S}"/.metadata "${Ddir}" keepdir "${dir}"/servervault @@ -536,7 +534,7 @@ pkg_postinst() { ewarn "Some/all demo modules will be missing. You can copy them manually into :" ewarn "${dir}/modules" ewarn "or emerge with USE=nowin." - fi + fi if ! use cdinstall && use nowin && use videos then ewarn "Some/all movies will be missing. You can copy them manually into :" -- 2.26.2