Fix dependencies, bug #168179

(Portage version: 2.1.2-r10)

4 files changed, 17 insertions, 68 deletions

diff --git a/games-emulation/epsxe/ChangeLog b/games-emulation/epsxe/ChangeLog
index 2135f83a1044..618ff2682ac4 100644
--- a/games-emulation/epsxe/ChangeLog
+++ b/games-emulation/epsxe/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/epsxe
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/epsxe/ChangeLog,v 1.10 2007/02/21 23:19:45 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/epsxe/ChangeLog,v 1.11 2007/02/24 00:16:13 nyhm Exp $
+
+  24 Feb 2007; Tristan Heaven <nyhm@gentoo.org> epsxe-1.6.0-r3.ebuild:
+  Fix dependencies, bug #168179
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-emulation/epsxe/epsxe-1.5.2-r1.ebuild b/games-emulation/epsxe/epsxe-1.5.2-r1.ebuild
deleted file mode 100644
index a5e513af5ba6..000000000000
--- a/games-emulation/epsxe/epsxe-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/epsxe/epsxe-1.5.2-r1.ebuild,v 1.7 2006/09/15 20:02:50 wolf31o2 Exp $
-
-inherit games
-
-DESCRIPTION="ePSXe Playstation Emulator"
-HOMEPAGE="http://www.epsxe.com/"
-SRC_URI="http://download.epsxe.com/files/epsxe${PV//.}lin.zip"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="opengl"
-RESTRICT="strip" # For some strange reason, strip truncates the whole file
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=dev-libs/glib-1.2
-	=x11-libs/gtk+-1.2*
-	=sys-libs/ncurses-5*
-	=sys-libs/zlib-1*
-	net-misc/wget
-	games-emulation/psemu-peopsspu
-	|| (
-		opengl? ( games-emulation/psemu-gpupetemesagl )
-		games-emulation/psemu-peopssoftgpu
-	)"
-
-S=${WORKDIR}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-	dogamesbin ${FILESDIR}/epsxe
-	dosed \
-		-e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
-		-e "s:GAMES_LIBDIR:${GAMES_LIBDIR}:" \
-		${GAMES_BINDIR}/epsxe || die "sed"
-	exeinto "${dir}"
-	insinto "${dir}"
-	doexe epsxe
-	doins keycodes.lst
-	insinto "${GAMES_LIBDIR}"/psemu/cheats
-	doins cheats/*
-	dodoc docs/*
-	games_make_wrapper epsxe ./epsxe "${dir}" "${dir}"
-	prepgamesdirs
-}
diff --git a/games-emulation/epsxe/epsxe-1.6.0-r3.ebuild b/games-emulation/epsxe/epsxe-1.6.0-r3.ebuild
index 75ab6f4f6217..86a9ecc2cdbb 100644
--- a/games-emulation/epsxe/epsxe-1.6.0-r3.ebuild
+++ b/games-emulation/epsxe/epsxe-1.6.0-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/epsxe/epsxe-1.6.0-r3.ebuild,v 1.9 2006/11/28 18:36:58 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/epsxe/epsxe-1.6.0-r3.ebuild,v 1.10 2007/02/24 00:16:13 nyhm Exp $
 
 inherit games
 
-DESCRIPTION="ePSXe Playstation Emulator"
+DESCRIPTION="ePSXe PlayStation Emulator"
 HOMEPAGE="http://www.epsxe.com/"
 SRC_URI="http://www.epsxe.com/files/epsxe${PV//.}lin.zip"
 
@@ -12,20 +12,16 @@ LICENSE="freedist"
 SLOT="0"
 KEYWORDS="-* x86"
 IUSE="opengl"
-RESTRICT="strip" # For some strange reason, strip truncates the whole file
+RESTRICT="strip"
 
-DEPEND="app-arch/unzip"
-RDEPEND=">=dev-libs/glib-1.2
-	=x11-libs/gtk+-1.2*
-	=sys-libs/ncurses-5*
-	=sys-libs/zlib-1*
-	net-misc/wget
+RDEPEND="=x11-libs/gtk+-1.2*"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+RDEPEND="${RDEPEND}
 	x11-misc/imake
 	games-emulation/psemu-peopsspu
-	|| (
-		opengl? ( games-emulation/psemu-gpupetemesagl )
-		games-emulation/psemu-peopssoftgpu
-	)"
+	opengl? ( games-emulation/psemu-gpupetemesagl )
+	!opengl? ( games-emulation/psemu-peopssoftgpu )"
 
 S=${WORKDIR}
 
@@ -35,13 +31,13 @@ src_install() {
 	sed -i \
 		-e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
 		-e "s:GAMES_LIBDIR:${GAMES_LIBDIR}:" \
-		"${D}${GAMES_BINDIR}/epsxe" \
+		"${D}${GAMES_BINDIR}"/epsxe \
 		|| die "sed failed"
 	exeinto "${dir}"
-	insinto "${dir}"
 	doexe epsxe || die "doexe failed"
+	insinto "${dir}"
 	doins keycodes.lst || die "doins failed"
-	insinto "${GAMES_LIBDIR}/psemu/cheats"
+	insinto "${GAMES_LIBDIR}"/psemu/cheats
 	doins cheats/* || die "doins failed"
 	dodoc docs/*
 	prepgamesdirs
diff --git a/games-emulation/epsxe/files/digest-epsxe-1.5.2-r1 b/games-emulation/epsxe/files/digest-epsxe-1.5.2-r1
deleted file mode 100644
index 7947cb439cf3..000000000000
--- a/games-emulation/epsxe/files/digest-epsxe-1.5.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5834f34cb904b08d95abda057eff3981 epsxe152lin.zip 166559
-RMD160 54f3b921c5f75ee982545dd55d6b6b23398a51fa epsxe152lin.zip 166559
-SHA256 e5c533e23d7693d910f03dae1e48c5f8d77684eff7010038e50f7c0426bea456 epsxe152lin.zip 166559