clean up app-emulation/emul-linux which has been removed

(Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 14 insertions, 19 deletions

diff --git a/games-arcade/jardinains/ChangeLog b/games-arcade/jardinains/ChangeLog
index 94a542a9b956..408d7851950a 100644
--- a/games-arcade/jardinains/ChangeLog
+++ b/games-arcade/jardinains/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/jardinains
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/jardinains/ChangeLog,v 1.13 2015/03/12 18:44:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/jardinains/ChangeLog,v 1.14 2015/06/01 21:40:34 mr_bones_ Exp $
+
+  01 Jun 2015; Michael Sterrett <mr_bones_@gentoo.org> jardinains-2.0-r1.ebuild:
+  clean up app-emulation/emul-linux which has been removed
 
   12 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> -jardinains-2.0.ebuild:
   old
diff --git a/games-arcade/jardinains/jardinains-2.0-r1.ebuild b/games-arcade/jardinains/jardinains-2.0-r1.ebuild
index 6fb1f612c231..befd3f8fdf32 100644
--- a/games-arcade/jardinains/jardinains-2.0-r1.ebuild
+++ b/games-arcade/jardinains/jardinains-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/jardinains/jardinains-2.0-r1.ebuild,v 1.5 2015/02/25 15:57:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/jardinains/jardinains-2.0-r1.ebuild,v 1.6 2015/06/01 21:40:34 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils games
@@ -19,26 +19,18 @@ QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/jardinains/jardinains"
 DEPEND=""
 RDEPEND="sys-libs/libstdc++-v3:5
 	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
-	|| (
-		(
-			>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-			>=virtual/glu-9.0-r1[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-			>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-		)
-		amd64? (
-			>=app-emulation/emul-linux-x86-xlibs-1.0-r1[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		)
-	)"
+	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+	>=virtual/glu-9.0-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]"
 
 dir=${GAMES_PREFIX_OPT}/${PN}
 QA_PREBUILT="${dir:1}/${PN}"
 
 src_unpack() {
 	unpack JN2_1_FREE_LIN.tar.gz
-	cd "${WORKDIR}"
-	mv "Jardinains 2!" ${P}
+	cd "${WORKDIR}" || die
+	mv "Jardinains 2!" ${P} || die
 }
 
 src_prepare() {
@@ -49,9 +41,9 @@ src_prepare() {
 
 src_install() {
 	exeinto "${dir}"
-	doexe jardinains || die
+	doexe jardinains
 	insinto "${dir}"
-	doins -r LICENSE.txt data help || die "doins failed"
+	doins -r LICENSE.txt data help
 
 	games_make_wrapper jardinains ./jardinains "${dir}" "${dir}"
 
@@ -66,6 +58,6 @@ pkg_postinst() {
 	games_pkg_postinst
 	elog "Due to the way this software is designed all user preferences for"
 	elog "graphics, audio and other in game data are shared among all users"
-	elog "of the computer. For that reason some files in the instalation   "
+	elog "of the computer. For that reason some files in the installation"
 	elog "folder are writable by any user in the games group."
 }