Internal libSDL update. Cosmetic fixes.

Package-Manager: portage-2.1.4.2

4 files changed, 266 insertions, 6 deletions

diff --git a/games-rpg/nwn/ChangeLog b/games-rpg/nwn/ChangeLog
index 4a3b268fde74..4b3d80b94224 100644
--- a/games-rpg/nwn/ChangeLog
+++ b/games-rpg/nwn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-rpg/nwn
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.61 2007/09/07 13:19:50 calchan Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.62 2008/02/16 23:10:01 calchan Exp $
+
+*nwn-1.68-r3 (16 Feb 2008)
+
+  16 Feb 2008; Denis Dupeyron <calchan@gentoo.org> +nwn-1.68-r3.ebuild:
+  Internal libSDL update. Cosmetic fixes.
 
   07 Sep 2007; Denis Dupeyron <calchan@gentoo.org> nwn-1.68-r2.ebuild:
   Less annoying iconification. Fixed fullscreen toggling for international
diff --git a/games-rpg/nwn/Manifest b/games-rpg/nwn/Manifest
index 61cd27e6bd7a..515c96de57b7 100644
--- a/games-rpg/nwn/Manifest
+++ b/games-rpg/nwn/Manifest
@@ -15,7 +15,9 @@ DIST Spanish_linuxclient168_orig.tar.gz 132704890 RMD160 699c5bdf5b020a91f3f1b86
 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-libsdl-1.2.12-r1.tar.bz2 148279 RMD160 ef81a12bff000b125bb6036415fd3ba52f57444b SHA1 3a43eb6885f89806bd0626bf3d8c8f334bdb5e7c SHA256 191882693811643eaa025f9ce5d678b455a2941f01f3ffe2d2a55f16685bc4a9
+DIST nwn-libsdl-1.2.13.tar.bz2 151293 RMD160 6e001bff0182867e633c00307d8c84b6b668f4eb SHA1 07c79dc2d852ead0fdc96a2626c00b19edbe6fbc SHA256 c8c0ccb382f99b0203ff284e19459d0b03ebd342e0e41410b55393de59e0dd8c
 EBUILD nwn-1.68-r1.ebuild 7495 RMD160 95f4e557f65f417941f702b090c6ff2f04be4096 SHA1 ccc7b7519f9f5370d5cb4279e539678c71ac1503 SHA256 fd38cdaa194493e32a2641dffc16ae6c1696bae8900cced2798e1175007d6342
-EBUILD nwn-1.68-r2.ebuild 6678 RMD160 cf9d4db156a02d641c84addafcb05a1f354e8f2b SHA1 b49792e14b518c657bce96fbd1ce916fc93a0136 SHA256 5b2252a6abddc3ebdf4a7049c78604ef40c8b1822e084f9bddb431614d391f39
-MISC ChangeLog 11390 RMD160 e95de4dafd6fe72513f5c1856f7bb0bf49c61ecf SHA1 5387cdf8aee4fed88074a120546eb1c07bc3bb38 SHA256 8210cbaa1c17db8a90acc99081bd7ff43d6316ec8cdd3a001dbda436196a0e3c
+EBUILD nwn-1.68-r2.ebuild 6678 RMD160 48817287e9ab9a2385e8b87ee5fb61d7ff7586a6 SHA1 8cd659b76e6296029900e7305a74ff2898b89d8f SHA256 25f8c736a4be89b16b6c285e9b5a36fa4dea9f52288ad2730774022715a7653b
+EBUILD nwn-1.68-r3.ebuild 6666 RMD160 ceafa519dede54225d84394627c5ce15ba5908ed SHA1 9852c25e7e64b51d329f355337fdbdff36d33810 SHA256 bbddd75b7c2cfc65b92e9bb89344f7bc0dea25650b4137964cc923f66cb11ddd
+MISC ChangeLog 11533 RMD160 5a748072c6aecb194ea827d737302b3aec43e3c1 SHA1 6d3723e3dd9dad4008d7f9dc875123e63a4e8ea4 SHA256 35c63bedf9240df7edf7d70debc2aaed0246ddc47f4106cfdd1d136082afc71c
 MISC metadata.xml 445 RMD160 0892e7f62b1ec5cad54aad9d801220a15b75a36c SHA1 b80ca4fea62102ac70b1718212307f41b1ce5592 SHA256 5b0e7eee6bdce75f183e0d1fdce5c32736dcee7bdd3e1ea2c7218ae619a320e5
diff --git a/games-rpg/nwn/nwn-1.68-r2.ebuild b/games-rpg/nwn/nwn-1.68-r2.ebuild
index 35b55eeccb0d..2f6d42b5eb9c 100644
--- a/games-rpg/nwn/nwn-1.68-r2.ebuild
+++ b/games-rpg/nwn/nwn-1.68-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-r2.ebuild,v 1.3 2007/09/07 13:19:50 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.68-r2.ebuild,v 1.4 2008/02/16 23:10:01 calchan Exp $
 
 inherit eutils games
 
diff --git a/games-rpg/nwn/nwn-1.68-r3.ebuild b/games-rpg/nwn/nwn-1.68-r3.ebuild
new file mode 100644
index 000000000000..868d5b8650b8
--- /dev/null
+++ b/games-rpg/nwn/nwn-1.68-r3.ebuild
@@ -0,0 +1,253 @@
+# 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-r3.ebuild,v 1.1 2008/02/16 23:10:01 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
+	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
+	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
+	done
+	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 )
+}
+
+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"
+}