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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

4 files changed, 17 insertions, 107 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/Manifest b/games-server/nwn-ded/Manifest
index 0b29cf950722..ec3d2880e27e 100644
--- a/games-server/nwn-ded/Manifest
+++ b/games-server/nwn-ded/Manifest
@@ -1,23 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST NWNDedicatedServer1.68.zip 316032587 SHA256 7226892f85b644edc6dfb15290bd1037e7a143528f734d53400b196958fa1c6c
 DIST NWNDedicatedServer1.69.zip 606293816 SHA256 9df63ea1bf24b43be2c7568a1379cb7197fb591b0c0454ec2d20cec96234a45c SHA512 0f91ab8d03d040389d9ad7ccc7d50079057d62d542fecfb2164a726511718ba982f7b2f9878bc1143f2c61b3ef7ab8f92e5e4007b515ad6aff51216c5b602ffd WHIRLPOOL 2f309f42a01c4fc01f600cb3d23e2e2c82e5ad42462e695cc56a90a59ab220bb6324a4aef9714567d8fdc9393624d63b310ff2fe225c49151932aa16d26f110a
-DIST NWNEnglish1.68dialog.zip 3186122 SHA256 6f68f7472b9be078f6a5b57e77308310c914ab3a5fd91d265f903e9daf53d4bb
 DIST NWNEnglish1.69dialog.zip 3200987 SHA256 357fd4c312d7598e9f563c61918f78c2235bd19acff8ac1b2d19140972828d66 SHA512 8c3214a3bcf137ea3b4b59d89055b7e22d15b8ab8d6007d81a9e70e156f8af611a8032ce5cf5c42ecd8c5af7eebe95f012a3f91723f273efa42701fd036482be WHIRLPOOL 09724f2ea25814ea98fe865207d6d7a160abfe0e582c71d2b8c649855a16b3596722525c52037f76a1cf9194053edbb19627eb16c27975646cc7247478554a1f
-DIST NWNFrench1.68dialog.zip 6770835 SHA256 64f5fbb14cc8d0232eeaa36c452081bf5fdbc5ea81e58d8868c92ae86ee6a838
-DIST NWNGerman1.68dialog.zip 7229687 SHA256 063bff4857f5f70dad98312129d43e047470de6144f011890949731f2071073b
-DIST NWNItalian1.68dialog.zip 6731492 SHA256 95ab20460c2761602aaf94f2b021ce698e8e4f122f3c1fd1ea8ad349fb3b5842
-DIST NWNJapanese1.68dialog.zip 6343304 SHA256 c8cc42038fb8c326caa432ff035621b200a397aa30f89862c8ba167f13144734
-DIST NWNSpanish1.68dialog.zip 6705882 SHA256 c6bd32e2156cd424598c8771b4cc2ca6ec97ecaffb29850412345b8b1a70bf7f
-EBUILD nwn-ded-1.68-r1.ebuild 2543 SHA256 2b51e178427d5d5781264407e9e40a836dfc803e22fea719311e29474c546c44 SHA512 3733bd4976fef9d377e6e02f108025466c9554fe001d850dbfd928b2e8b8990832720adb8858a9ddbaaa32d0ba9f800207050a0b0fe4d32ff5db40b4c8c50482 WHIRLPOOL 456e13c128398b0e153ed2fce8700c60fbe885fb74a062107a68b403d7bc4e973646210dd9e63ceb0ede0e6e4e798404f68c51b961b9aa70928bfcdabbdda4c0
-EBUILD nwn-ded-1.69.ebuild 2167 SHA256 9451756f265ad9ab56e93b167d4e29ec9763e35e131a288d975bf449360fbdda SHA512 e7f662f13c26df29d033697c5764aab5e0221d454f374d4f128e1a908460be4095d81f9d52239fa1ba4b14ac5eb34e99246ac0aaaf1f538e0819af5fc003e133 WHIRLPOOL c1c8536518bf43d7f520fe3e258621a0458c7e30bc153ce84add24e42e905af54be2c1812d6b63e96b1b416adb64fbea480c6ca2577b3c28046dea89dcb37b38
-MISC ChangeLog 3560 SHA256 e8c80d1025cace31e4fb4305a634164dacb27786edd1ecff571e3360ad8d9a56 SHA512 8f904b2b966442b294c377500af780849be1a3ad798ef9f96d536b61b950b465388e15cbb1ba3fbe770dfd722ebccd56353d031357b337ec1d9873186968e95b WHIRLPOOL 79058e75c64fed880bf0fd5c50349153931166f7b47e9b480f8e41870e3c5d887e8737e7cafde5f99442d91215ee33004ec7c9327f600f56f91834952976d475
+EBUILD nwn-ded-1.69.ebuild 1928 SHA256 32a274c12d04622deae5213cbc49a394320b2fdc2878e67f23847781175566e4 SHA512 75c63efcfb093a8f5825fd252ac0c6e1e55f955a347f24ba2a496611acca589b4ea7085762659d0b3995331aab65cd8695569bbba7583e6010d43537eb6e2266 WHIRLPOOL fa119f2194e85db8aca8184127c99c3acc2c0417495c1780be737164bc742493badba6c7db6ae136a8eb05ea582ea43e32d6499dbb30dfdd6ddced11e27b33e7
+MISC ChangeLog 3712 SHA256 572a47c2c4ef0e6289818d48ad1fd71b8cb895e8a683e9e5cab387485049764d SHA512 9b92ba387f8a460114dd947055637d39a22b9b74378ef84a62e7d225012d8859e956e506ebad0199c487b46a58e8bb35a6b86f417a7b92544e067677ed9775fc WHIRLPOOL 30f4b24f5d43a6d6b1b479e77581d999f98176e812ad93067bc169a4b4c9d902015f3f6447d19f029c2c1be58f33350e35bc066e4f52f7a6f1c6fed28967d1a1
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlDd3S0ACgkQIY77eQFFFC1UIACePyfad1v8iQQuEyzKRZXHWDcM
-pN4AoJ615bRMzS/OTMWxKJR7BFXVtHwA
-=htnY
------END PGP SIGNATURE-----
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}"