Fix dependencies, bug #168179

Package-Manager: portage-2.1.2-r10

diff --git a/games-emulation/epsxe/ChangeLog b/games-emulation/epsxe/ChangeLog
index 2135f83a1044a6a333b36d703167c9b998680898..618ff2682ac49eb32c9b0e11e38b2ba52fea338f 100644 (file)
--- 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/Manifest b/games-emulation/epsxe/Manifest
index f57bb0ebbe6c028223b3d38bd8ad02f260daf26e..e12559bfaeb72590b93ca75f81829c417a40babb 100644 (file)
--- a/games-emulation/epsxe/Manifest
+++ b/games-emulation/epsxe/Manifest
@@ -1,28 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX epsxe 2003 RMD160 873c87ea18ee9e3a781d36d916e3d4564603769a SHA1 21f8458f339e3f17f001528e95d8be92e5153edf SHA256 325a79298d01b5ca40636637bfe9c74ddaeb572219858073af262f3805fa0099
 MD5 34dec247fba33a0ee73c2a7f92132d0e files/epsxe 2003
 RMD160 873c87ea18ee9e3a781d36d916e3d4564603769a files/epsxe 2003
 SHA256 325a79298d01b5ca40636637bfe9c74ddaeb572219858073af262f3805fa0099 files/epsxe 2003
-DIST epsxe152lin.zip 166559 RMD160 54f3b921c5f75ee982545dd55d6b6b23398a51fa SHA1 c938b736a25aefddd831a72ecf6291b5c15c2819 SHA256 e5c533e23d7693d910f03dae1e48c5f8d77684eff7010038e50f7c0426bea456
 DIST epsxe160lin.zip 180407 RMD160 410b1a509bb2767927d46b6a97e2b0a3c7d80fc5 SHA1 4201537ee9fe12f313af81fb3b0882b61b1d65b4 SHA256 a15f92c54b4d5813ac5257282efdbeeddbdbbf08dd45655770e5d5b268735fdd
-EBUILD epsxe-1.5.2-r1.ebuild 1218 RMD160 bafe814ada3ee900e62b64184af29481c8d55c6f SHA1 bea75d2d5e65d6ff3ba3482f54423599cbff0313 SHA256 fd8c0a7b81d27b939c06ce8ac6bbbb8ffc74167008f56aaaf91b21c8bf68c438
-MD5 6bb3735b81b2a643b79e01b599355bce epsxe-1.5.2-r1.ebuild 1218
-RMD160 bafe814ada3ee900e62b64184af29481c8d55c6f epsxe-1.5.2-r1.ebuild 1218
-SHA256 fd8c0a7b81d27b939c06ce8ac6bbbb8ffc74167008f56aaaf91b21c8bf68c438 epsxe-1.5.2-r1.ebuild 1218
-EBUILD epsxe-1.6.0-r3.ebuild 1259 RMD160 93116a6e7ce8dd46db7b5c0a1d18b0adc1372163 SHA1 af00a7671319f7556faa4f46ea86ab8f0aec5a9d SHA256 4627d6896ae6bb900bee2233f1842820e092e88e8184aece836ea47442786caa
-MD5 eeac94aa09a96e7898809f6292e08c86 epsxe-1.6.0-r3.ebuild 1259
-RMD160 93116a6e7ce8dd46db7b5c0a1d18b0adc1372163 epsxe-1.6.0-r3.ebuild 1259
-SHA256 4627d6896ae6bb900bee2233f1842820e092e88e8184aece836ea47442786caa epsxe-1.6.0-r3.ebuild 1259
-MISC ChangeLog 2872 RMD160 e17a5a0a28d5d6c5723e7b3dc2dbc920eff6ff93 SHA1 841cc532be89da60239684ec1cf9c46735ab96ee SHA256 5fc84669044b2bab3dde1fbe6ce3699e05f7e47e60f944ee79e2d5c36a32b3d1
-MD5 56ed5463b527750ce9a872f68938e5fe ChangeLog 2872
-RMD160 e17a5a0a28d5d6c5723e7b3dc2dbc920eff6ff93 ChangeLog 2872
-SHA256 5fc84669044b2bab3dde1fbe6ce3699e05f7e47e60f944ee79e2d5c36a32b3d1 ChangeLog 2872
+EBUILD epsxe-1.6.0-r3.ebuild 1160 RMD160 a3d24329eeb8e6c89541a82e95f906c28e99d9ae SHA1 8755ba37dfe70c28884bc1d737256a6dd78bcc15 SHA256 5dbcc269511415de489ae5d600f074d06ec3d67d73df4c99546399ed266fa1db
+MD5 ed73e34bd3b0edba9998c9d1cde509d5 epsxe-1.6.0-r3.ebuild 1160
+RMD160 a3d24329eeb8e6c89541a82e95f906c28e99d9ae epsxe-1.6.0-r3.ebuild 1160
+SHA256 5dbcc269511415de489ae5d600f074d06ec3d67d73df4c99546399ed266fa1db epsxe-1.6.0-r3.ebuild 1160
+MISC ChangeLog 2975 RMD160 eb6be5a6b69ea4cc61ca9ecfa09e00fcb9b3149b SHA1 254e1085e3e3f5e0a9b9e1e57babf33f323ef572 SHA256 91141751e45a4a36faa65e7faff4821b41d33acf0ed13b73d61d0632a06785c6
+MD5 7b17f7d380f33c96c7a670ec813c8bbe ChangeLog 2975
+RMD160 eb6be5a6b69ea4cc61ca9ecfa09e00fcb9b3149b ChangeLog 2975
+SHA256 91141751e45a4a36faa65e7faff4821b41d33acf0ed13b73d61d0632a06785c6 ChangeLog 2975
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 c28699e2ca7d241a7b8081ee012b72d0 files/digest-epsxe-1.5.2-r1 226
-RMD160 fdcb77c47cc9f1c91dbc79d51a0899fca26971f0 files/digest-epsxe-1.5.2-r1 226
-SHA256 b1905bcd77847f18c6853e3e9bde15f7f97ea771e278bfce9d3110dbb19fb5c6 files/digest-epsxe-1.5.2-r1 226
 MD5 348b27d9de88ade20b72c4ccdecf9716 files/digest-epsxe-1.6.0-r3 226
 RMD160 41333dce3ecbe9a95db1439312ac5c229bdfc755 files/digest-epsxe-1.6.0-r3 226
 SHA256 16e668cf7c89c7d1265be0fec996fbcb7793edf4fce9d04eaf877a37e10208b5 files/digest-epsxe-1.6.0-r3 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF34PTdz7hIScOURERAv59AKCjzXbgQykjPnrN2/tfh+CcwObFXQCg65aI
+QRzbVtQN/IHwxcvSRC+N4zc=
+=J8Vb
+-----END PGP SIGNATURE-----

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 (file)
index a5e513a..0000000
--- 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 75ab6f4f6217910edc58bc2b3d6e6c92d79bd45b..86a9ecc2cdbbf914fc0dfb2ef8fda1bf9d69c8f4 100644 (file)
--- 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 (file)
index 7947cb4..0000000
--- 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