EAPI=5; tidy deps (bug #522120); clean old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 15 insertions, 87 deletions

diff --git a/games-server/nwn-ded/ChangeLog b/games-server/nwn-ded/ChangeLog
index c76b0b711f7f..4b73f96fc582 100644
--- a/games-server/nwn-ded/ChangeLog
+++ b/games-server/nwn-ded/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-server/nwn-ded
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/nwn-ded/ChangeLog,v 1.26 2012/12/28 17:55:51 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/nwn-ded/ChangeLog,v 1.27 2014/09/04 07:41:03 mr_bones_ Exp $
+
+  04 Sep 2014; Michael Sterrett <mr_bones_@gentoo.org> -nwn-ded-1.68-r1.ebuild,
+  nwn-ded-1.69.ebuild:
+  EAPI=5; tidy deps (bug #522120); clean old
 
   28 Dec 2012; Tupone Alfredo <tupone@gentoo.org> nwn-ded-1.69.ebuild:
   Use QA_PREBUILT. Bug #448540 by Diego Elio Pettenò
diff --git a/games-server/nwn-ded/nwn-ded-1.68-r1.ebuild b/games-server/nwn-ded/nwn-ded-1.68-r1.ebuild
deleted file mode 100644
index 7239fd44ffac..000000000000
--- a/games-server/nwn-ded/nwn-ded-1.68-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/nwn-ded/nwn-ded-1.68-r1.ebuild,v 1.3 2010/06/28 22:35:18 mr_bones_ Exp $
-
-inherit games
-
-LANGUAGES="linguas_en linguas_fr linguas_it linguas_es linguas_de linguas_ja"
-DIALOG_URL_BASE=http://files.bioware.com/neverwinternights/dialog/
-
-DESCRIPTION="Neverwinter Nights Dedicated server"
-HOMEPAGE="http://nwn.bioware.com/downloads/standaloneserver.html"
-SRC_URI="http://files.bioware.com/neverwinternights/updates/windows/server/NWNDedicatedServer${PV}.zip
-	linguas_en? ( ${DIALOG_URL_BASE}/english/NWNEnglish${PV}dialog.zip )
-	linguas_fr? ( ${DIALOG_URL_BASE}/french/NWNFrench${PV}dialog.zip )
-	linguas_de? ( ${DIALOG_URL_BASE}/german/NWNGerman${PV}dialog.zip )
-	linguas_it? ( ${DIALOG_URL_BASE}/italian/NWNItalian${PV}dialog.zip )
-	linguas_es? ( ${DIALOG_URL_BASE}/spanish/NWNSpanish${PV}dialog.zip )
-	linguas_ja? ( ${DIALOG_URL_BASE}/japanese/NWNJapanese${PV}dialog.zip )"
-
-LICENSE="NWN-EULA"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="${LANGUAGES}"
-RESTRICT="mirror strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-compat )"
-
-S=${WORKDIR}
-
-src_unpack() {
-	mkdir common || die "Failed creating directory"
-	cd common
-	unpack NWNDedicatedServer${PV}.zip
-	tar -zxf linuxdedserver${PV/./}.tar.gz || die "Failed unpacking linuxdedserver"
-	rm -f *dedserver*.{tar.gz,sit,zip} *.exe *.dll
-	cd ..
-	local currentlocale=""
-	local a
-	for a in ${A}
-	do
-		if [ -z "${a/*dialog*/}" ] ; then
-			if [ -z "${a/*English*/}" ]; then currentlocale="en"; fi
-			if [ -z "${a/*French*/}" ]; then currentlocale="fr"; fi
-			if [ -z "${a/*German*/}" ]; then currentlocale="de"; fi
-			if [ -z "${a/*Italian*/}" ]; then currentlocale="it"; fi
-			if [ -z "${a/*Spanish*/}" ]; then currentlocale="es"; fi
-			if [ -z "${a/*Japanese*/}" ]; then currentlocale="ja"; fi
-			mkdir ${currentlocale} || die "Failed creating directory"
-			cd ${currentlocale}
-			cp -rfl ../common/* . || die "Failed hard-linking to common directory"
-			unpack "${a}"
-			cd ..
-		fi
-	done
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-	dodir ${dir}
-
-	local currentlocale
-	for currentlocale in * ; do
-		if [[ ${currentlocale} != "common" ]]
-		then
-			games_make_wrapper nwserver-${currentlocale} ./nwserver "${dir}/${currentlocale}" "${dir}/${currentlocale}"
-		fi
-	done
-
-	mv * "${D}/${dir}"/ || die "Failed installing server"
-
-	prepgamesdirs
-	chmod -R g+w "${D}/${dir}"
-}
diff --git a/games-server/nwn-ded/nwn-ded-1.69.ebuild b/games-server/nwn-ded/nwn-ded-1.69.ebuild
index ce6cd5aa88b1..2a5c7d1bf23a 100644
--- a/games-server/nwn-ded/nwn-ded-1.69.ebuild
+++ b/games-server/nwn-ded/nwn-ded-1.69.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/nwn-ded/nwn-ded-1.69.ebuild,v 1.4 2012/12/28 17:55:51 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/nwn-ded/nwn-ded-1.69.ebuild,v 1.5 2014/09/04 07:41:03 mr_bones_ Exp $
 
+EAPI=5
 inherit games
 
 LANGUAGES="linguas_en"
@@ -19,8 +20,6 @@ IUSE="${LANGUAGES}"
 RESTRICT="mirror strip"
 
 DEPEND="app-arch/unzip"
-RDEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-compat )"
 
 S=${WORKDIR}
 
@@ -28,10 +27,10 @@ dir=${GAMES_PREFIX_OPT}/${PN}
 QA_PREBUILT="${dir:1}/common/nwserver"
 
 src_unpack() {
-	mkdir common || die "Failed creating directory"
-	cd common
+	mkdir common || die
+	cd common || die
 	unpack NWNDedicatedServer${PV}.zip
-	tar -zxf linuxdedserver${PV/./}.tar.gz || die "Failed unpacking linuxdedserver"
+	tar -zxf linuxdedserver${PV/./}.tar.gz || die
 	rm -f *dedserver*.{tar.gz,sit,zip} *.exe *.dll
 	cd ..
 	local currentlocale=""
@@ -45,9 +44,9 @@ src_unpack() {
 			if [ -z "${a/*Italian*/}" ]; then currentlocale="it"; fi
 			if [ -z "${a/*Spanish*/}" ]; then currentlocale="es"; fi
 			if [ -z "${a/*Japanese*/}" ]; then currentlocale="ja"; fi
-			mkdir ${currentlocale} || die "Failed creating directory"
+			mkdir ${currentlocale} || die
 			cd ${currentlocale}
-			cp -rfl ../common/* . || die "Failed hard-linking to common directory"
+			cp -rfl ../common/* . || die
 			unpack "${a}"
 			cd ..
 		fi
@@ -65,7 +64,7 @@ src_install() {
 		fi
 	done
 
-	mv * "${D}/${dir}"/ || die "Failed installing server"
+	mv * "${D}/${dir}"/ || die
 
 	prepgamesdirs
 	chmod -R g+w "${D}/${dir}"