Removing older version and adding modular X dependencies.

(Portage version: 2.1_pre3-r1)

6 files changed, 27 insertions, 144 deletions

diff --git a/games-rpg/nwn/ChangeLog b/games-rpg/nwn/ChangeLog
index 8d556515dc02..71d015ade095 100644
--- a/games-rpg/nwn/ChangeLog
+++ b/games-rpg/nwn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/nwn
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.32 2005/12/19 16:12:57 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.33 2006/01/05 00:12:05 wolf31o2 Exp $
+
+  04 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> -files/nwn,
+  -nwn-1.65-r1.ebuild, nwn-1.66.ebuild, nwn-1.66-r1.ebuild:
+  Removing older version and adding modular X dependencies.
 
   19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/fixinstall,
   nwn-1.66-r1.ebuild:
diff --git a/games-rpg/nwn/files/digest-nwn-1.65-r1 b/games-rpg/nwn/files/digest-nwn-1.65-r1
deleted file mode 100644
index 9f3d2e136bce..000000000000
--- a/games-rpg/nwn/files/digest-nwn-1.65-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 73c6515fd6aa5f860802098a55000ae8 nwclient129.tar.gz 5504342
-MD5 8222401efe25235b56d01b38ae880b5b nwresources129.tar.gz 1212356127
-MD5 957f1c9f398f08395328f62fa339ecfc linuxclientupdate1xxto165fre.tar.gz 79503385
-MD5 fec754c4608d468a73b394d66a32b6d5 NWNFrench1.65dialog.zip 6757948
-MD5 23ccde07c5adf2edee4a536b86e2923b linuxclientupdate1xxto165ger.tar.gz 80206618
-MD5 6843db125f8ade9a7127ee2cc8415719 NWNGerman1.65dialog.zip 7216305
-MD5 cf206a6c12fc2e7fcbe029c6b0e8dbee linuxclientupdate1xxto165ita.tar.gz 81141592
-MD5 1430da71d0956166ad97c11c17916961 NWNItalian1.65dialog.zip 6718387
-MD5 a693d5cc2447201a8d3320f057aa9328 linuxclientupdate1xxto165spa.tar.gz 81122706
-MD5 40d296f0f24c742c96735142f13065d6 NWNSpanish1.65dialog.zip 6692674
-MD5 920e498efc0763b6a4f03d22ad689db7 linuxclientupdate1xxto165eng.tar.gz 80623755
-MD5 7564b803aad04595058f3351e8606139 NWNEnglish1.65dialog.zip 3180152
diff --git a/games-rpg/nwn/files/nwn b/games-rpg/nwn/files/nwn
deleted file mode 100644
index c57e1a4c73c8..000000000000
--- a/games-rpg/nwn/files/nwn
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR/nwn
-exec ./nwn ${@}
diff --git a/games-rpg/nwn/nwn-1.65-r1.ebuild b/games-rpg/nwn/nwn-1.65-r1.ebuild
deleted file mode 100644
index 2ba15fc97844..000000000000
--- a/games-rpg/nwn/nwn-1.65-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.65-r1.ebuild,v 1.6 2005/11/28 23:10:00 wolf31o2 Exp $
-
-inherit eutils games
-
-UPDATEVER=${PV//.}
-PATCH_URL_BASE=http://content.bioware.com/neverwinternights/linux/${UPDATEVER}/linuxclientupdate1xxto${UPDATEVER}
-DIALOG_URL_BASE=http://nwdownloads.bioware.com/neverwinternights/patch/dialog/
-
-DESCRIPTION="Neverwinter Nights"
-HOMEPAGE="http://nwn.bioware.com/downloads/linuxclient.html"
-SRC_URI="http://nwdownloads.bioware.com/neverwinternights/linux/129/nwclient129.tar.gz
-	linguas_fr? ( ${PATCH_URL_BASE}fre.tar.gz ${DIALOG_URL_BASE}/french/NWNFrench${PV}dialog.zip )
-	linguas_de? ( ${PATCH_URL_BASE}ger.tar.gz ${DIALOG_URL_BASE}/german/NWNGerman${PV}dialog.zip )
-	linguas_it? ( ${PATCH_URL_BASE}ita.tar.gz ${DIALOG_URL_BASE}/italian/NWNItalian${PV}dialog.zip )
-	linguas_es? ( ${PATCH_URL_BASE}spa.tar.gz ${DIALOG_URL_BASE}/spanish/NWNSpanish${PV}dialog.zip )
-	!linguas_de? ( !linguas_fr? ( !linguas_es? ( !linguas_it? (
-		${PATCH_URL_BASE}eng.tar.gz ${DIALOG_URL_BASE}/english/NWNEnglish${PV}dialog.zip
-	) ) ) )
-	nowin? ( ftp://jeuxlinux.com/bioware/Neverwinter_Nights/nwresources129.tar.gz )"
-
-LICENSE="NWN-EULA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nowin"
-RESTRICT="nostrip nomirror"
-
-RDEPEND="virtual/x11
-	virtual/opengl
-	>=media-libs/libsdl-1.2.5
-	x86? (
-		|| (
-			=sys-devel/gcc-3.3*
-			sys-libs/libstdc++-v3 ) )
-	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"
-
-pkg_setup() {
-#	use nocd && \
-#	cdrom_get_cds \
-#		Data_Shared.zip \
-#		disk2.zip \
-#		disk3.zip \
-#		disk4.zip
-	games_pkg_setup
-}
-
-src_unpack() {
-	mkdir ${S}
-	cd ${S}
-	unpack nwclient129.tar.gz
-	cd ${WORKDIR}
-	use nowin && unpack nwresources129.tar.gz
-	cd ${S}
-	rm -rf override/*
-	# the following is so ugly, please pretend it doesnt exist
-	declare -a Aarray=(${A})
-	unpack ${Aarray[1]}
-	unpack ${Aarray[2]}
-}
-
-src_install() {
-	dodir ${GAMES_PREFIX_OPT}
-	sed \
-		-e "s:GENTOO_USER:${GAMES_USER}:" \
-		-e "s:GENTOO_GROUP:${GAMES_GROUP}:" \
-		-e "s:GENTOO_DIR:${GAMES_PREFIX_OPT}:" \
-		${FILESDIR}/fixinstall > ${WORKDIR}/nwn/fixinstall
-	mv ${S} ${D}/${GAMES_PREFIX_OPT}
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/nwn.png
-	dogamesbin ${FILESDIR}/nwn
-	dosed "s:GENTOO_DIR:${GAMES_PREFIX_OPT}:" ${GAMES_BINDIR}/nwn
-	make_desktop_entry nwn "Neverwinter Nights" nwn.png
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if ! use nowin ; then
-		einfo "The NWN linux client 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 "    ambient/"
-		einfo "    data/ (all files except for patch.bif)"
-		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 "    chown -R ${GAMES_USER}:${GAMES_GROUP} ${GAMES_PREFIX_OPT}/nwn"
-		einfo "    chmod -R g+rwX ${GAMES_PREFIX_OPT}/nwn"
-		einfo "3) Run ${GAMES_PREFIX_OPT}/nwn/fixinstall as root"
-		einfo "4) Make sure that you are in group ${GAMES_GROUP}"
-		einfo "5) Use ${GAMES_PREFIX_OPT}/nwn/nwn to run the game"
-		echo
-		einfo "Or try emerging with USE=nowin"
-	else
-		einfo "The NWN linux client is now installed."
-		einfo "Proceed with the following step in order to get it working:"
-		einfo "Run ${GAMES_PREFIX_OPT}/nwn/fixinstall as root"
-	fi
-}
diff --git a/games-rpg/nwn/nwn-1.66-r1.ebuild b/games-rpg/nwn/nwn-1.66-r1.ebuild
index 759418abb8d2..f37636adc4f3 100644
--- a/games-rpg/nwn/nwn-1.66-r1.ebuild
+++ b/games-rpg/nwn/nwn-1.66-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.66-r1.ebuild,v 1.8 2005/12/19 16:12:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.66-r1.ebuild,v 1.9 2006/01/05 00:12:05 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -46,14 +46,19 @@ IUSE="sou hou"
 RESTRICT="nostrip nomirror"
 
 RDEPEND="games-rpg/nwn-data
-	virtual/x11
 	virtual/opengl
 	>=media-libs/libsdl-1.2.5
 	x86? (
 		|| (
 			=sys-devel/gcc-3.3*
-			sys-libs/libstdc++-v3 ) )
-	amd64? ( app-emulation/emul-linux-x86-baselibs
+			sys-libs/libstdc++-v3 )
+		|| (
+			(
+				x11-libs/libXext
+				x11-libs/libX11 )
+			virtual/x11 ) )
+	amd64? (
+		app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-compat
 		app-emulation/emul-linux-x86-xlibs )"
 
diff --git a/games-rpg/nwn/nwn-1.66.ebuild b/games-rpg/nwn/nwn-1.66.ebuild
index e6d94898d3fa..b5467bc2bb09 100644
--- a/games-rpg/nwn/nwn-1.66.ebuild
+++ b/games-rpg/nwn/nwn-1.66.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.66.ebuild,v 1.7 2005/11/28 23:10:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.66.ebuild,v 1.8 2006/01/05 00:12:05 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -29,14 +29,19 @@ KEYWORDS="amd64 x86"
 IUSE="nowin"
 RESTRICT="nostrip nomirror"
 
-RDEPEND="virtual/x11
-	virtual/opengl
+RDEPEND="virtual/opengl
 	>=media-libs/libsdl-1.2.5
 	x86? (
 		|| (
 			=sys-devel/gcc-3.3*
-			sys-libs/libstdc++-v3 ) )
-	amd64? ( app-emulation/emul-linux-x86-baselibs
+			sys-libs/libstdc++-v3 )
+		|| (
+			(
+				x11-libs/libXext
+				x11-libs/libX11 )
+			virtual/x11 ) )
+	amd64? (
+		app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-compat
 		app-emulation/emul-linux-x86-xlibs )"