Added nwmouse check from bug #106789 for bug #109619.

Package-Manager: portage-2.0.53_rc5

3 files changed, 30 insertions, 20 deletions

diff --git a/games-rpg/nwn-data/ChangeLog b/games-rpg/nwn-data/ChangeLog
index 76f8de8d445f..42330e5492ab 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.3 2005/09/30 01:24:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.4 2005/10/17 21:24:04 wolf31o2 Exp $
+
+  17 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
+  Added nwmouse check from bug #106789 for bug #109619.
 
   30 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
   Fixed cosmetic errors on USE=-nowin.
diff --git a/games-rpg/nwn-data/Manifest b/games-rpg/nwn-data/Manifest
index af1e8eebd382..89ba6521bc4d 100644
--- a/games-rpg/nwn-data/Manifest
+++ b/games-rpg/nwn-data/Manifest
@@ -1,5 +1,5 @@
-MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
-MD5 7974243b20910b8c01dd5eadb10507dd nwn-data-1.29.ebuild 4873
-MD5 415dab4b98f403752e1603bc1653d6f9 ChangeLog 881
-MD5 d05b3b73edd2b4beadbce95837e2ab20 files/nwn.png 4296
+MD5 63470a42064e9bf172f720a22b8f9763 ChangeLog 1014
 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
diff --git a/games-rpg/nwn-data/nwn-data-1.29.ebuild b/games-rpg/nwn-data/nwn-data-1.29.ebuild
index 51a2ae6724fd..9f9416a0f8ac 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-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.3 2005/09/30 01:24:29 wolf31o2 Exp $
+# $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 $
 
 inherit eutils games
 
@@ -33,9 +33,9 @@ RDEPEND="virtual/x11
 	>=media-libs/libsdl-1.2.5
 	amd64? ( app-emulation/emul-linux-x86-baselibs )"
 
-S="${WORKDIR}/nwn"
-dir="${GAMES_PREFIX_OPT}/${PN/-data}"
-Ddir="${D}/${dir}"
+S=${WORKDIR}/nwn
+dir=${GAMES_PREFIX_OPT}/nwn
+Ddir=${D}/${dir}
 
 pkg_setup() {
 	if use sou && use hou
@@ -55,12 +55,12 @@ pkg_setup() {
 }
 
 src_unpack() {
-	mkdir ${S}
-	cd ${S}
+	mkdir "${S}"
+	cd "${S}"
 	unpack nwclient129.tar.gz
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 	use nowin && unpack nwresources129.tar.gz
-	cd ${S}
+	cd "${S}"
 	rm -rf override/*
 	# the following is so ugly, please pretend it doesnt exist
 	declare -a Aarray=(${A})
@@ -87,16 +87,23 @@ src_unpack() {
 		unzip -o ${CDROM_ROOT}/Language_data.zip
 		unzip -o ${CDROM_ROOT}/Language_update.zip
 	fi
+	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"
 }
 
 src_install() {
-	dodir ${dir}
+	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
-	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}
+	rm -rf "${S}"/movies
+	mkdir -p "${S}"/dmvault "${S}"/hak "${S}"/portraits
+	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}"
 	keepdir ${dir}/servervault
 	keepdir ${dir}/scripttemplates
 	keepdir ${dir}/saves
@@ -122,7 +129,7 @@ src_install() {
 	then
 		chmod a-x ${Ddir}/data/patch.bif chmod a-x${Ddir}/patch.key
 	fi
-	doicon ${FILESDIR}/nwn.png
+	doicon "${FILESDIR}"/nwn.png
 	prepgamesdirs
 	chmod -R g+rwX ${Ddir}/saves ${Ddir}/localvault ${Ddir}/dmvault \
 		2>&1 > /dev/null || die "could not chmod"