Fixed installation when not using USE=nowin.

Package-Manager: portage-2.0.53_rc6

diff --git a/games-rpg/nwn-data/ChangeLog b/games-rpg/nwn-data/ChangeLog
index 42330e5492abf24d0749fcb26c87ccf8216f98e4..6f2a8dacf7495da67d332df3d716481d0fe95264 100644 (file)
--- a/games-rpg/nwn-data/ChangeLog
+++ b/games-rpg/nwn-data/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-rpg/nwn-data
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.4 2005/10/17 21:24:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.5 2005/11/01 20:04:30 wolf31o2 Exp $
+
+  01 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
+  Fixed installation when not using USE=nowin.
 
   17 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
   Added nwmouse check from bug #106789 for bug #109619.

diff --git a/games-rpg/nwn-data/Manifest b/games-rpg/nwn-data/Manifest
index 89ba6521bc4d1799fb5a5c4952d16b3829dc15cb..3021d928bb2e463acb38ce315773ab5a3c8fe8e6 100644 (file)
--- a/games-rpg/nwn-data/Manifest
+++ b/games-rpg/nwn-data/Manifest
@@ -1,5 +1,5 @@
-MD5 63470a42064e9bf172f720a22b8f9763 ChangeLog 1014
+MD5 ee63872d4738fa7fe84d089810772c12 ChangeLog 1138
 MD5 a1f70c52e9c1098e5bd13153dce5b63d files/digest-nwn-data-1.29 396
 MD5 d05b3b73edd2b4beadbce95837e2ab20 files/nwn.png 4296
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
-MD5 9ff557db0f245ee2d120e078696e781a nwn-data-1.29.ebuild 5092
+MD5 f804081bddb98548323ed90bae03db2f nwn-data-1.29.ebuild 5334

diff --git a/games-rpg/nwn-data/nwn-data-1.29.ebuild b/games-rpg/nwn-data/nwn-data-1.29.ebuild
index 9f9416a0f8ac6c5674903ff509379f3c72080adb..28109f20f6ba3d46b81a55c6517995f391b6dae2 100644 (file)
--- 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-2005 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.4 2005/10/17 21:24:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29.ebuild,v 1.5 2005/11/01 20:04:30 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -100,7 +100,7 @@ src_install() {
        dodir "${dir}"
        # Since the movies don't play anyway, we'll remove them
        rm -rf "${S}"/movies
-       mkdir -p "${S}"/dmvault "${S}"/hak "${S}"/portraits
+       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
        mv "${S}"/* "${Ddir}"
@@ -125,9 +125,9 @@ src_install() {
                        cd ${Ddir}
                fi
        done
-       if ! use sou && ! use hou
+       if ! use sou && ! use hou && use nowin
        then
-               chmod a-x ${Ddir}/data/patch.bif chmod a-x${Ddir}/patch.key
+               chmod a-x ${Ddir}/data/patch.bif ${Ddir}/patch.key
        fi
        doicon "${FILESDIR}"/nwn.png
        prepgamesdirs
@@ -142,25 +142,34 @@ pkg_postinst() {
                einfo "The NWN linux client data is now installed."
                einfo "Proceed with the following steps in order to get it working:"
                einfo "1) Copy the following directories/files from your installed and"
-               einfo "   patched (${PV}) Neverwinter Nights to ${GAMES_PREFIX_OPT}/nwn:"
+               einfo "   patched (1.66) Neverwinter Nights to ${dir}:"
                einfo "    ambient/"
-               einfo "    data/ (all files except for patch.bif)"
+               einfo "    data/"
                einfo "    dmvault/"
                einfo "    hak/"
                einfo "    localvault/"
                einfo "    modules/"
                einfo "    music/"
-               einfo "    override/"
                einfo "    portraits/"
                einfo "    saves/"
                einfo "    servervault/"
                einfo "    texturepacks/"
                einfo "    chitin.key"
-               einfo "2) Chown and chmod the files with the following commands"
+               einfo "2) Remove some files to make way for the patch"
+               einfo "    rm ${dir}/music/mus_dd_{kingmaker,shadowgua,witchwake}.bmu"
+               einfo "    rm ${dir}/override/iit_medkit_001.tga"
+               einfo "    rm ${dir}/data/patch.bif"
+               if use sou 
+               then
+                       einfo "    rm ${dir}/xp1patch.key ${dir}/data/xp1patch.bif"
+               fi
+               if use hou
+               then
+                       einfo "    rm ${dir}/xp2patch.key ${dir}/data/xp2patch.bif"
+               fi
+               einfo "3) Chown and chmod the files with the following commands"
                einfo "    chown -R ${GAMES_USER}:${GAMES_GROUP} ${dir}"
                einfo "    chmod -R g+rwX ${dir}"
-               einfo "3) Run ${dir}/fixinstall as root"
-               einfo "4) Make sure that you are in group ${GAMES_GROUP}"
                echo
                einfo "Or try emerging with USE=nowin"
        else

diff --git a/games-rpg/nwn/Manifest b/games-rpg/nwn/Manifest
index f155cbbb7b0678c354f0082584bddeb9ee849c19..39d30ce4fd3a0725358cd44b65d2ca4cbf78cada 100644 (file)
--- a/games-rpg/nwn/Manifest
+++ b/games-rpg/nwn/Manifest
@@ -1,4 +1,4 @@
-MD5 89296d655a5274209137f848b22c647e ChangeLog 5581
+MD5 2c7b0ffe9825ec6b1f2888d93a6fe4ed ChangeLog 5690
 MD5 3952e8e76ebdde92fe0bf84facaaea38 files/digest-nwn-1.65-r1 892
 MD5 a15f98043e8a4c08555ef8384a1e848c files/digest-nwn-1.66 1147
 MD5 25cad5bc0f76382b0577ef11b5d5aeef files/digest-nwn-1.66-r1 1551
@@ -7,5 +7,5 @@ MD5 3eddaf5e88a92951762058756003c855 files/nwn 44
 MD5 d05b3b73edd2b4beadbce95837e2ab20 files/nwn.png 4296
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 MD5 b09157145a832f02eb5ccbdff5244310 nwn-1.65-r1.ebuild 3688
-MD5 c5d586f33f317fa732d6bbd20bf3a802 nwn-1.66-r1.ebuild 3992
+MD5 06e970b4b1f0bf1b494be93184fb1000 nwn-1.66-r1.ebuild 3993
 MD5 69d62e623dfb29a0ca928233044220c7 nwn-1.66.ebuild 4228