stable for x86 and amd64; clean old

Package-Manager: portage-2.1.8.3/cvs/Linux i686

6 files changed, 12 insertions, 577 deletions

diff --git a/games-rpg/nwn/ChangeLog b/games-rpg/nwn/ChangeLog
index 1d8dc85eff31..185ce555be43 100644
--- a/games-rpg/nwn/ChangeLog
+++ b/games-rpg/nwn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/nwn
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.73 2010/03/25 04:50:18 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.74 2010/06/28 22:40:41 mr_bones_ Exp $
+
+  28 Jun 2010; Michael Sterrett <mr_bones_@gentoo.org> -nwn-1.68-r1.ebuild,
+  -nwn-1.68-r4.ebuild, nwn-1.68-r5.ebuild, nwn-1.69-r1.ebuild:
+  stable for x86 and amd64; clean old
 
   25 Mar 2010; <calchan@gentoo.org> nwn-1.69-r1.ebuild:
   Stable for amd64, bug #307365.
diff --git a/games-rpg/nwn/Manifest b/games-rpg/nwn/Manifest
index 040d073fc83e..0e7838f085f6 100644
--- a/games-rpg/nwn/Manifest
+++ b/games-rpg/nwn/Manifest
@@ -17,12 +17,8 @@ DIST Italian_linuxclient168_xp2.tar.gz 133867117 RMD160 8e0ca0e29c7b6ac5ed20fb64
 DIST Spanish_linuxclient168_orig.tar.gz 132704890 RMD160 699c5bdf5b020a91f3f1b86f961ae3416a62bd0d SHA1 62fba8f04bda9690f1b6c561019abe9c428b43f9 SHA256 01bfd907735a69112fc1847e82269ed2a3d00760a9906dd24819269e53173f13
 DIST Spanish_linuxclient168_xp1.tar.gz 143415370 RMD160 897b862f8baa392e733413f847a5e2ebabd17bbf SHA1 e1a3e13a5cf05c742d004fd76bd14a3d6b17c541 SHA256 c74faed185b87a0f187f4e1bcf873ec3810a1fd8dba026b81bcf421e1ca121d9
 DIST Spanish_linuxclient168_xp2.tar.gz 133862305 RMD160 25d36239aa9bb3e685f24c3e031128bbcbd1d1d6 SHA1 b14f3229529618ddf12b497d17421f753898e279 SHA256 b4d4efb0eb5d3395e42e665b518f3cec19c690b0f7f57783ecaa2e6aa8b70a5e
-DIST nwn-libelf-0.1.tar.bz2 35932 RMD160 8865c8b2b1915f85eade6ccd2835502519184b14 SHA1 d68b3d9d0d833a5c210c07c15747aabdbadf5446 SHA256 d397957b12120967d130893c2eb9abd3e6ca721aba04f94389358be4f7e897db
 DIST nwn-libs-1.tar.bz2 250395 RMD160 e1a9514be1c6ea57363327837f67a39ea4e7316e SHA1 609aa18298c9254502be4a7af6991a67be9f341e SHA256 8cf73b69f5c254125713b0bf8dcb89e3320eee5a3339df11d6d18d8381b36f31
-DIST nwn-libsdl-1.2.13.tar.bz2 151293 RMD160 6e001bff0182867e633c00307d8c84b6b668f4eb SHA1 07c79dc2d852ead0fdc96a2626c00b19edbe6fbc SHA256 c8c0ccb382f99b0203ff284e19459d0b03ebd342e0e41410b55393de59e0dd8c
-EBUILD nwn-1.68-r1.ebuild 7498 RMD160 e5be0ec7ad59ab08b43d7a013a96c05e8aeee89c SHA1 299bf4d69fbe86d06c5dafb90978ed3fdb240e5b SHA256 3c9730ca57d2ae73ccf92bf17a735563cda27a3d383c0e08cae218ec252acda6
-EBUILD nwn-1.68-r4.ebuild 6815 RMD160 f06ad12238df99d7c52264d060180edae6a58efd SHA1 47b7e4e7401a5ed2e73ab9ececeb80e71cfdd08b SHA256 dd6415b53e33a4a4a58a97c4b84af0f02732616c239eb7a0b1b16837d243f276
-EBUILD nwn-1.68-r5.ebuild 6668 RMD160 e8420419d89db44c0d02fcf21fa83ec17edbe6ea SHA1 ced9667c5ac1c52b3828073a34168d8962a8ea00 SHA256 7de87bba8e27da2b47aee8bd8b995649c7b2eb2b72268c1614cd67459dd6ea26
-EBUILD nwn-1.69-r1.ebuild 3299 RMD160 59ff71fac917ad41d79c62c73b2f98284b51b1e6 SHA1 c9439dca99f4dce9e0fdd5081f7655dbcd45f222 SHA256 6808f56b4c6f6956c8b652b3ad85e0f058e2d965ed7cde150ebc18e6352c0d8d
-MISC ChangeLog 13002 RMD160 a984fcad6a66785e67c64281f7eee302604cd72f SHA1 0504bff3b097461ae7d2faabdc454a6649c0eac0 SHA256 3f584953ffb1c977dfd5b702322d5f7360c8c52acbfd5edcea7d001a3f6e6639
+EBUILD nwn-1.68-r5.ebuild 6668 RMD160 c955749fc84cc4c3a59bb269329d74f55b43bb79 SHA1 a5b8cbbe39bbc1388b70b30163d7ddb23d0fb503 SHA256 4d1e439e84ec5962de10bd131d37d5b8f047dd01aab2d21d2938f4b1baae58c6
+EBUILD nwn-1.69-r1.ebuild 3300 RMD160 3d66b169a4637f6a8bd7a3cee2f972e600eeee4e SHA1 b3bbf507a334ae351c986c5c4ad6ceccb3b5269c SHA256 7b7a740dac7bcb58ffe52c63f9c2248e22804eb8662c8552199dad8c924546a7
+MISC ChangeLog 13182 RMD160 899f2bb21a99076523c4ee98ce5d556f060aa9a7 SHA1 4849ad6b039a3250c12406e205948373c6fa5c38 SHA256 725aa5b8fef23a5043c15bb1602c897e040e918f98228c01d4c9155b43821e1d
 MISC metadata.xml 435 RMD160 57ca0a3136e9c0edf3c1cc5e13f0661f38d4879c SHA1 3e0e513cd5b6910cc4c1bb2bc8556753c4dda722 SHA256 1548515a46157153d708117cfe4fb01d2ba73a5f32a49967d2b70b4702b95604
diff --git a/games-rpg/nwn/nwn-1.68-r1.ebuild b/games-rpg/nwn/nwn-1.68-r1.ebuild
deleted file mode 100644
index 6bba5ebbe1ad..000000000000
--- a/games-rpg/nwn/nwn-1.68-r1.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.68-r1.ebuild,v 1.10 2008/08/01 18:52:28 calchan Exp $
-
-inherit eutils games
-
-LANGUAGES="linguas_fr linguas_it linguas_es linguas_de linguas_en"
-
-MY_PV=${PV//.}
-PATCH_URL_BASE=http://files.bioware.com/neverwinternights/updates/linux/${MY_PV}
-PACKAGE_NAME=_linuxclient${MY_PV}_orig.tar.gz
-SOU_NAME=_linuxclient${MY_PV}_xp1.tar.gz
-HOU_NAME=_linuxclient${MY_PV}_xp2.tar.gz
-
-DESCRIPTION="role-playing game set in a huge medieval fantasy world of Dungeons and Dragons"
-HOMEPAGE="http://nwn.bioware.com/downloads/linuxclient.html"
-SRC_URI="linguas_fr? (
-		!sou? ( !hou? ( ${PATCH_URL_BASE}/French${PACKAGE_NAME} ) )
-		sou? ( ${PATCH_URL_BASE}/French${SOU_NAME} )
-		hou? ( ${PATCH_URL_BASE}/French${HOU_NAME} ) )
-	linguas_it? (
-		!sou? ( !hou? ( ${PATCH_URL_BASE}/Italian${PACKAGE_NAME} ) )
-		sou? ( ${PATCH_URL_BASE}/Italian${SOU_NAME} )
-		hou? ( ${PATCH_URL_BASE}/Italian${HOU_NAME} ) )
-	linguas_en? (
-		!sou? ( !hou? ( ${PATCH_URL_BASE}/English${PACKAGE_NAME} ) )
-		sou? ( ${PATCH_URL_BASE}/English${SOU_NAME} )
-		hou? ( ${PATCH_URL_BASE}/English${HOU_NAME} ) )
-	linguas_es? (
-		!sou? ( !hou? ( ${PATCH_URL_BASE}/Spanish${PACKAGE_NAME} ) )
-		sou? ( ${PATCH_URL_BASE}/Spanish${SOU_NAME} )
-		hou? ( ${PATCH_URL_BASE}/Spanish${HOU_NAME} ) )
-	linguas_de? (
-		!sou? ( !hou? ( ${PATCH_URL_BASE}/German${PACKAGE_NAME} ) )
-		sou? ( ${PATCH_URL_BASE}/German${SOU_NAME} )
-		hou? ( ${PATCH_URL_BASE}/German${HOU_NAME} ) )
-	!linguas_en? (
-		!linguas_es? (
-			!linguas_de? (
-				!linguas_fr? (
-					!linguas_it? (
-		!sou? ( !hou? ( ${PATCH_URL_BASE}/English${PACKAGE_NAME} ) )
-		sou? ( ${PATCH_URL_BASE}/English${SOU_NAME} )
-		hou? ( ${PATCH_URL_BASE}/English${HOU_NAME} ) ) ) ) ) )"
-
-LICENSE="NWN-EULA"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="sou hou ${LANGUAGES}"
-# nowin USE flag not used anymore by pkg_setup()
-RESTRICT="mirror strip"
-
-RDEPEND=">=games-rpg/nwn-data-1.29-r1
-	virtual/opengl
-	>=media-libs/libsdl-1.2.5
-	x86? (
-		=virtual/libstdc++-3.3
-		x11-libs/libXext
-		x11-libs/libX11 )
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-compat
-		app-emulation/emul-linux-x86-xlibs )"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/nwn
-
-GAMES_LICENSE_CHECK="yes"
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-die_from_busted_nwn-data() {
-	local use=$*
-	ewarn "You must emerge games-rpg/nwn-data with USE=$use.  You can fix this"
-	ewarn "by doing the following:"
-	echo
-	elog "mkdir -p /etc/portage"
-	elog "echo 'games-rpg/nwn-data $use' >> /etc/portage/package.use"
-	elog "emerge --oneshot games-rpg/nwn-data"
-	die "nwn-data requires USE=$use"
-}
-
-die_from_busted_linguas_nwn-data() {
-	local use=$*
-	ewarn "You must emerge games-rpg/nwn-data with LINGUAS=${use/linguas_/}."
-	ewarn "You can fix this by doing the following:"
-	echo
-	elog "mkdir -p /etc/portage"
-	elog "echo 'games-rpg/nwn-data $use' >> /etc/portage/package.use"
-	elog "emerge --oneshot games-rpg/nwn-data"
-	die "nwn-data requires LINGUAS='$use'"
-}
-
-pkg_setup() {
-	games_pkg_setup
-	if use sou
-	then
-		built_with_use games-rpg/nwn-data sou || die_from_busted_nwn-data sou
-	fi
-	if use hou
-	then
-		built_with_use games-rpg/nwn-data hou || die_from_busted_nwn-data hou
-	fi
-
-	strip-linguas de en es fr it
-#	currentlocale=""
-#	for i in ${LINGUAS}
-#	do
-#		case ${i} in
-#			de)
-#				if [ ! -e "${dir}"/.metadata/linguas_de ]
-#				then
-#					use nowin && die_from_busted_linguas_nwn-data linguas_de
-#				fi
-#				currentlocale=de
-#				;;
-#			en)
-#				if [ ! -e "${dir}"/.metadata/linguas_en ]
-#				then
-#					use nowin && die_from_busted_linguas_nwn-data linguas_en
-#				fi
-#				currentlocale=en
-#				;;
-#			es)
-#				if [ ! -e "${dir}"/.metadata/linguas_es ]
-#				then
-#					use nowin && die_from_busted_linguas_nwn-data linguas_es
-#				fi
-#				currentlocale=es
-#				;;
-#			fr)
-#				if [ ! -e "${dir}"/.metadata/linguas_fr ]
-#				then
-#					use nowin && die_from_busted_linguas_nwn-data linguas_fr
-#				fi
-#				currentlocale=fr
-#				;;
-#			it)
-#				if [ ! -e "${dir}"/.metadata/linguas_it ]
-#				then
-#					use nowin && die_from_busted_linguas_nwn-data linguas_it
-#				fi
-#				currentlocale=it
-#				;;
-#		esac
-#	done
-}
-
-src_unpack() {
-	mkdir -p "${S}"
-	cd "${S}"
-	mkdir -p .metadata
-	for a in ${A}
-	do
-		if [ -z "${a/*orig*}" ]
-		then
-			currentlocale=""
-			if [ -z "${a/*German*/}" ]
-			then
-				currentlocale=de
-			elif [ -z "${a/*English*/}" ]
-			then
-				currentlocale=en
-			elif [ -z "${a/*Spanish*/}" ]
-			then
-				currentlocale=es
-			elif [ -z "${a/*Italian*/}" ]
-			then
-				currentlocale=it
-			elif [ -z "${a/*French*/}" ]
-			then
-				currentlocale=fr
-			fi
-			if [ -n "$currentlocale" ]
-			then
-				mkdir -p "${currentlocale}"
-				cd "${currentlocale}"
-				unpack "${a}" || die "unpack ${a}"
-				cd ..
-			fi
-		fi
-	done
-	use sou && (
-	for a in ${A}
-	do
-		if [ -z "${a/*$SOU_NAME}" ]
-		then
-			currentlocale=""
-			if [ -z "${a/*German*/}" ]
-			then
-				currentlocale=de
-			elif [ -z "${a/*English*/}" ]
-			then
-				currentlocale=en
-			elif [ -z "${a/*Spanish*/}" ]
-			then
-				currentlocale=es
-			elif [ -z "${a/*Italian*/}" ]
-			then
-				currentlocale=it
-			elif [ -z "${a/*French*/}" ]
-			then
-				currentlocale=fr
-			fi
-			if [ -n "$currentlocale" ]
-			then
-				mkdir -p "${currentlocale}"
-				cd "${currentlocale}"
-				rm -f data/patch.bif patch.key
-				unpack "${a}" || die "unpack ${a}"
-				cd ..
-			fi
-		fi
-	done )
-	use hou && (
-	for a in ${A}
-	do
-		if [ -z "${a/*$HOU_NAME}" ]
-		then
-			currentlocale=""
-			if [ -z "${a/*German*/}" ]
-			then
-				currentlocale=de
-			elif [ -z "${a/*English*/}" ]
-			then
-				currentlocale=en
-			elif [ -z "${a/*Spanish*/}" ]
-			then
-				currentlocale=es
-			elif [ -z "${a/*Italian*/}" ]
-			then
-				currentlocale=it
-			elif [ -z "${a/*French*/}" ]
-			then
-				currentlocale=fr
-			fi
-			if [ -n "$currentlocale" ]
-			then
-				mkdir -p "${currentlocale}"
-				cd "${currentlocale}"
-				rm -f data/patch.bif patch.key data/xp1patch.bif xp1patch.key override/*
-				unpack "${a}" || die "unpack ${a}"
-				cd ..
-			fi
-		fi
-	done )
-	for a in ${A}
-	do
-		if [ -z "${a/*dialog*}" ]
-		then
-			currentlocale=""
-			if [ -z "${a/*German*/}" ]
-			then
-				currentlocale=de
-			elif [ -z "${a/*English*/}" ]
-			then
-				currentlocale=en
-			elif [ -z "${a/*Spanish*/}" ]
-			then
-				currentlocale=es
-			elif [ -z "${a/*Italian*/}" ]
-			then
-				currentlocale=it
-			elif [ -z "${a/*French*/}" ]
-			then
-				currentlocale=fr
-			fi
-			if [ -n "$currentlocale" ]
-			then
-				(cd "${currentlocale}" ; unpack ${a} ; cd .. )
-			fi
-		fi
-	done
-}
-
-src_install() {
-	dodir "${dir}"
-	exeinto "${dir}"
-	doexe "${FILESDIR}"/fixinstall
-	sed -i \
-		-e "s:GENTOO_USER:${GAMES_USER}:" \
-		-e "s:GENTOO_GROUP:${GAMES_GROUP}:" \
-		-e "s:GENTOO_DIR:${GAMES_PREFIX_OPT}:" \
-		-e "s:override miles nwm:miles:" \
-		-e "s:chitin.key dialog.tlk nwmain:chitin.key:" \
-		-e "s:^chmod a-x:#chmod a-x:" \
-		"${Ddir}"/fixinstall || die "sed"
-	if use hou || use sou
-	then
-		sed -i \
-			-e "s:chitin.key patch.key:chitin.key:" \
-			"${Ddir}"/fixinstall || die "sed"
-	fi
-	fperms ug+x "${dir}"/fixinstall || die "perms"
-	mv "${S}"/* "${Ddir}"
-	mv "${S}"/.metadata "${Ddir}"
-	games_make_wrapper nwn ./nwn "${dir}" "${dir}"
-	make_desktop_entry nwn "Neverwinter Nights"
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	einfo "The NWN linux client is now installed."
-	einfo "Proceed with the following step in order to get it working:"
-	einfo "Run ${dir}/fixinstall as root"
-}
diff --git a/games-rpg/nwn/nwn-1.68-r4.ebuild b/games-rpg/nwn/nwn-1.68-r4.ebuild
deleted file mode 100644
index 9ff0ae5526d3..000000000000
--- a/games-rpg/nwn/nwn-1.68-r4.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.68-r4.ebuild,v 1.3 2008/08/01 18:52:28 calchan Exp $
-
-inherit eutils games
-
-LANGUAGES="linguas_fr linguas_it linguas_es linguas_de linguas_en"
-
-MY_PV=${PV//.}
-PATCH_URL_BASE=http://files.bioware.com/neverwinternights/updates/linux/${MY_PV}
-PACKAGE_NAME=_linuxclient${MY_PV}_orig.tar.gz
-SOU_NAME=_linuxclient${MY_PV}_xp1.tar.gz
-HOU_NAME=_linuxclient${MY_PV}_xp2.tar.gz
-
-DESCRIPTION="role-playing game set in a huge medieval fantasy world of Dungeons and Dragons"
-HOMEPAGE="http://nwn.bioware.com/downloads/linuxclient.html"
-SRC_URI="http://dev.gentoo.org/~calchan/distfiles/nwn-libsdl-1.2.13.tar.bz2
-	http://dev.gentoo.org/~calchan/distfiles/nwn-libelf-0.1.tar.bz2
-	linguas_fr? (
-		!sou? ( !hou? ( ${PATCH_URL_BASE}/French${PACKAGE_NAME} ) )
-		sou? ( ${PATCH_URL_BASE}/French${SOU_NAME} )
-		hou? ( ${PATCH_URL_BASE}/French${HOU_NAME} ) )
-	linguas_it? (
-		!sou? ( !hou? ( ${PATCH_URL_BASE}/Italian${PACKAGE_NAME} ) )
-		sou? ( ${PATCH_URL_BASE}/Italian${SOU_NAME} )
-		hou? ( ${PATCH_URL_BASE}/Italian${HOU_NAME} ) )
-	linguas_en? (
-		!sou? ( !hou? ( ${PATCH_URL_BASE}/English${PACKAGE_NAME} ) )
-		sou? ( ${PATCH_URL_BASE}/English${SOU_NAME} )
-		hou? ( ${PATCH_URL_BASE}/English${HOU_NAME} ) )
-	linguas_es? (
-		!sou? ( !hou? ( ${PATCH_URL_BASE}/Spanish${PACKAGE_NAME} ) )
-		sou? ( ${PATCH_URL_BASE}/Spanish${SOU_NAME} )
-		hou? ( ${PATCH_URL_BASE}/Spanish${HOU_NAME} ) )
-	linguas_de? (
-		!sou? ( !hou? ( ${PATCH_URL_BASE}/German${PACKAGE_NAME} ) )
-		sou? ( ${PATCH_URL_BASE}/German${SOU_NAME} )
-		hou? ( ${PATCH_URL_BASE}/German${HOU_NAME} ) )
-	!linguas_en? (
-		!linguas_es? (
-			!linguas_de? (
-				!linguas_fr? (
-					!linguas_it? (
-		!sou? ( !hou? ( ${PATCH_URL_BASE}/English${PACKAGE_NAME} ) )
-		sou? ( ${PATCH_URL_BASE}/English${SOU_NAME} )
-		hou? ( ${PATCH_URL_BASE}/English${HOU_NAME} ) ) ) ) ) )"
-
-LICENSE="NWN-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 x86"
-IUSE="sou hou ${LANGUAGES}"
-# nowin USE flag not used anymore by pkg_setup()
-RESTRICT="mirror strip"
-
-RDEPEND=">=games-rpg/nwn-data-1.29-r3
-	virtual/opengl
-	>=media-libs/libsdl-1.2.5
-	!<games-rpg/nwmouse-0.1-r1
-	x86? (
-		=virtual/libstdc++-3.3
-		x11-libs/libXext
-		x11-libs/libX11 )
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-compat
-		app-emulation/emul-linux-x86-xlibs )"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/nwn
-
-GAMES_LICENSE_CHECK="yes"
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-die_from_busted_nwn-data() {
-	local use=$*
-	ewarn "You must emerge games-rpg/nwn-data with USE=$use.  You can fix this"
-	ewarn "by doing the following:"
-	echo
-	elog "mkdir -p /etc/portage"
-	elog "echo 'games-rpg/nwn-data $use' >> /etc/portage/package.use"
-	elog "emerge --oneshot games-rpg/nwn-data"
-	die "nwn-data requires USE=$use"
-}
-
-die_from_busted_linguas_nwn-data() {
-	local use=$*
-	ewarn "You must emerge games-rpg/nwn-data with LINGUAS=${use/linguas_/}."
-	ewarn "You can fix this by doing the following:"
-	echo
-	elog "mkdir -p /etc/portage"
-	elog "echo 'games-rpg/nwn-data $use' >> /etc/portage/package.use"
-	elog "emerge --oneshot games-rpg/nwn-data"
-	die "nwn-data requires LINGUAS='$use'"
-}
-
-pkg_setup() {
-	games_pkg_setup
-	if use sou
-	then
-		built_with_use games-rpg/nwn-data sou || die_from_busted_nwn-data sou
-	fi
-	if use hou
-	then
-		built_with_use games-rpg/nwn-data hou || die_from_busted_nwn-data hou
-	fi
-
-	strip-linguas de en es fr it
-}
-
-src_unpack() {
-	mkdir -p "${S}"
-	cd "${S}"
-	mkdir -p .metadata
-	for a in ${A}
-	do
-		if [ -z "${a/*libsdl*}" ]
-		then
-			unpack "${a}" || die "unpack ${a}"
-		fi
-
-		if [ -z "${a/*libelf*}" ]
-		then
-			unpack "${a}" || die "unpack ${a}"
-		fi
-
-		if [ -z "${a/*orig*}" ]
-		then
-			currentlocale=""
-			if [ -z "${a/*German*/}" ]
-			then
-				currentlocale=de
-			elif [ -z "${a/*English*/}" ]
-			then
-				currentlocale=en
-			elif [ -z "${a/*Spanish*/}" ]
-			then
-				currentlocale=es
-			elif [ -z "${a/*Italian*/}" ]
-			then
-				currentlocale=it
-			elif [ -z "${a/*French*/}" ]
-			then
-				currentlocale=fr
-			fi
-			if [ -n "$currentlocale" ]
-			then
-				mkdir -p "${currentlocale}"
-				cd "${currentlocale}"
-				unpack "${a}" || die "unpack ${a}"
-				cd ..
-			fi
-		fi
-	done
-	use sou && (
-	for a in ${A}
-	do
-		if [ -z "${a/*$SOU_NAME}" ]
-		then
-			currentlocale=""
-			if [ -z "${a/*German*/}" ]
-			then
-				currentlocale=de
-			elif [ -z "${a/*English*/}" ]
-			then
-				currentlocale=en
-			elif [ -z "${a/*Spanish*/}" ]
-			then
-				currentlocale=es
-			elif [ -z "${a/*Italian*/}" ]
-			then
-				currentlocale=it
-			elif [ -z "${a/*French*/}" ]
-			then
-				currentlocale=fr
-			fi
-			if [ -n "$currentlocale" ]
-			then
-				mkdir -p "${currentlocale}"
-				cd "${currentlocale}"
-				rm -f data/patch.bif patch.key
-				unpack "${a}" || die "unpack ${a}"
-				cd ..
-			fi
-		fi
-	done )
-	use hou && (
-	for a in ${A}
-	do
-		if [ -z "${a/*$HOU_NAME}" ]
-		then
-			currentlocale=""
-			if [ -z "${a/*German*/}" ]
-			then
-				currentlocale=de
-			elif [ -z "${a/*English*/}" ]
-			then
-				currentlocale=en
-			elif [ -z "${a/*Spanish*/}" ]
-			then
-				currentlocale=es
-			elif [ -z "${a/*Italian*/}" ]
-			then
-				currentlocale=it
-			elif [ -z "${a/*French*/}" ]
-			then
-				currentlocale=fr
-			fi
-			if [ -n "$currentlocale" ]
-			then
-				mkdir -p "${currentlocale}"
-				cd "${currentlocale}"
-				rm -f data/patch.bif patch.key data/xp1patch.bif xp1patch.key override/*
-				unpack "${a}" || die "unpack ${a}"
-				cd ..
-			fi
-		fi
-	done )
-}
-
-src_install() {
-	dodir "${dir}"
-	exeinto "${dir}"
-	doexe "${FILESDIR}"/fixinstall
-	sed -i \
-		-e "s:GENTOO_USER:${GAMES_USER}:" \
-		-e "s:GENTOO_GROUP:${GAMES_GROUP}:" \
-		-e "s:GENTOO_DIR:${GAMES_PREFIX_OPT}:" \
-		-e "s:override miles nwm:miles:" \
-		-e "s:chitin.key dialog.tlk nwmain:chitin.key:" \
-		-e "s:^chmod a-x:#chmod a-x:" \
-		"${Ddir}"/fixinstall || die "sed"
-	if use hou || use sou
-	then
-		sed -i \
-			-e "s:chitin.key patch.key:chitin.key:" \
-			"${Ddir}"/fixinstall || die "sed"
-	fi
-	fperms ug+x "${dir}"/fixinstall || die "perms"
-	mv "${S}"/* "${Ddir}"
-	mv "${S}"/.metadata "${Ddir}"
-	games_make_wrapper nwn ./nwn "${dir}" "${dir}"
-	make_desktop_entry nwn "Neverwinter Nights"
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "The included custom libSDL is patched to enable the following key sequences:"
-	elog "  * Left-Alt & Enter - Iconify Window"
-	elog "  * Right-Alt & Enter - Toggle between FullScreen/Windowed"
-	elog "  * Left-Control & G - Disable the mouse grab that keeps the cursor inside the NWN window"
-	elog "  * Right-Control & G - Re-enable the mouse grab to keep the cursor inside the NWN window"
-	elog
-	elog "The NWN linux client is now installed."
-	elog "Proceed with the following step in order to get it working:"
-	elog "Run ${dir}/fixinstall as root"
-}
diff --git a/games-rpg/nwn/nwn-1.68-r5.ebuild b/games-rpg/nwn/nwn-1.68-r5.ebuild
index e3dd48d02ee8..cab9d239da95 100644
--- a/games-rpg/nwn/nwn-1.68-r5.ebuild
+++ b/games-rpg/nwn/nwn-1.68-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.68-r5.ebuild,v 1.1 2010/01/25 01:24:52 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.68-r5.ebuild,v 1.2 2010/06/28 22:40:41 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -46,7 +46,7 @@ SRC_URI="http://dev.gentoo.org/~calchan/distfiles/nwn-libs-1.tar.bz2
 
 LICENSE="NWN-EULA"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="sou hou ${LANGUAGES}"
 # nowin USE flag not used anymore by pkg_setup()
 RESTRICT="mirror strip"
diff --git a/games-rpg/nwn/nwn-1.69-r1.ebuild b/games-rpg/nwn/nwn-1.69-r1.ebuild
index eb91dba7ff4d..144d9c917a7c 100644
--- a/games-rpg/nwn/nwn-1.69-r1.ebuild
+++ b/games-rpg/nwn/nwn-1.69-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.69-r1.ebuild,v 1.2 2010/03/25 04:50:18 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.69-r1.ebuild,v 1.3 2010/06/28 22:40:41 mr_bones_ Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ SRC_URI="http://dev.gentoo.org/~calchan/distfiles/nwn-libs-1.tar.bz2
 
 LICENSE="NWN-EULA"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="sou hou"
 RESTRICT="mirror strip"