summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2006-01-31 20:10:25 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2006-01-31 20:10:25 +0000
commit24faed2d583414f4a78656d489b418bb11ae1707 (patch)
tree730027c469cacc50257624381f41722a3f0e0808 /games-rpg
parentMark 0.4.7 stable on alpha (diff)
downloadgentoo-2-24faed2d583414f4a78656d489b418bb11ae1707.tar.gz
gentoo-2-24faed2d583414f4a78656d489b418bb11ae1707.tar.bz2
gentoo-2-24faed2d583414f4a78656d489b418bb11ae1707.zip
This revision resolves the broken installation that happened after moving nwn.png from FILESDIR to DISTFILES.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'games-rpg')
-rw-r--r--games-rpg/nwn-data/ChangeLog6
-rw-r--r--games-rpg/nwn-data/nwn-data-1.29.ebuild22
2 files changed, 19 insertions, 9 deletions
diff --git a/games-rpg/nwn-data/ChangeLog b/games-rpg/nwn-data/ChangeLog
index 4ca6ca120418..4ffe70bd85dc 100644
--- a/games-rpg/nwn-data/ChangeLog
+++ b/games-rpg/nwn-data/ChangeLog
@@ -1,6 +1,10 @@
# 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.10 2006/01/23 14:53:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.11 2006/01/31 20:10:25 wolf31o2 Exp $
+
+ 31 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
+ This revision resolves the broken installation that happened after moving
+ nwn.png from FILESDIR to DISTFILES.
23 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> -files/nwn.png,
nwn-data-1.29.ebuild:
diff --git a/games-rpg/nwn-data/nwn-data-1.29.ebuild b/games-rpg/nwn-data/nwn-data-1.29.ebuild
index 83c002f67ee9..5e5197712ab1 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.11 2006/01/23 14:53:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29.ebuild,v 1.12 2006/01/31 20:10:25 wolf31o2 Exp $
inherit eutils games
@@ -82,13 +82,16 @@ src_unpack() {
touch .metadata/linguas_en || die "touching en"
fi
unpack nwclient129.tar.gz
- cd "${WORKDIR}"
- use nowin && unpack nwresources129.tar.gz
- cd "${S}"
+ if use nowin
+ then
+ cd "${WORKDIR}"
+ unpack nwresources129.tar.gz || die "unpacking nwresources129.tar.gz"
+ cd "${S}"
+ fi
rm -rf override/*
# the following is so ugly, please pretend it doesnt exist
declare -a Aarray=(${A})
- use nowin && if [ "${#Aarray[*]}" == "3" ]
+ use nowin && if [ "${#Aarray[*]}" == "4" ]
then
unpack ${Aarray[1]}
fi
@@ -112,20 +115,22 @@ src_unpack() {
unzip -o ${CDROM_ROOT}/Data_Shared.zip
unzip -o ${CDROM_ROOT}/Language_data.zip
unzip -o ${CDROM_ROOT}/Language_update.zip
+ touch .metadata/hou || die "touching hou"
fi
- touch .metadata/hou || die "touching hou"
+
sed -i -e '\:^./nwmain .*:i \
if [[ -f ./nwmouse.so ]]; then \
export XCURSOR_PATH="$(pwd)" \
export XCURSOR_THEME=nwmouse \
export LD_PRELOAD=./nwmouse.so:$LD_PRELOAD \
fi \
- ' "${S}/nwn"
+ ' "${S}/nwn" || die "sed nwn"
}
src_install() {
dodir "${dir}"
- # Since the movies don't play anyway, we'll remove them
+ # Since the movies don't play anyway, we'll remove them. This should
+ # 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 \
@@ -158,6 +163,7 @@ src_install() {
chmod a-x ${Ddir}/data/patch.bif ${Ddir}/patch.key
fi
doicon "${DISTDIR}"/nwn.png
+
prepgamesdirs
chmod -R g+rwX ${Ddir}/saves ${Ddir}/localvault ${Ddir}/dmvault \
2>&1 > /dev/null || die "could not chmod"