more dep fixing (bug #122168); use games eclass

Package-Manager: portage-2.1_pre6-r6

3 files changed, 33 insertions, 20 deletions

diff --git a/games-emulation/tuxnes/ChangeLog b/games-emulation/tuxnes/ChangeLog
index e0ec74fde4cd..fd8c544ad9d7 100644
--- a/games-emulation/tuxnes/ChangeLog
+++ b/games-emulation/tuxnes/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/tuxnes
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/ChangeLog,v 1.6 2006/02/11 04:21:22 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/ChangeLog,v 1.7 2006/03/23 20:42:41 mr_bones_ Exp $
+
+  23 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org> tuxnes-0.75.ebuild:
+  more dep fixing (bug #122168); use games eclass
 
   11 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org> tuxnes-0.75.ebuild:
   Add modular X dependencies (bug #122168, Tupone Alfredo).
diff --git a/games-emulation/tuxnes/Manifest b/games-emulation/tuxnes/Manifest
index 93cd53b314e2..607bef47d19d 100644
--- a/games-emulation/tuxnes/Manifest
+++ b/games-emulation/tuxnes/Manifest
@@ -1,6 +1,6 @@
-MD5 212b0bf002e10a78cfb9a90c4aaf5e6b ChangeLog 888
-RMD160 2acf53724de777b839436145f0070a1184986b6f ChangeLog 888
-SHA256 ee9c5e4c34731620621a752341d08ba65f28956f0a10253da025a438292cc726 ChangeLog 888
+MD5 19667bee483d06630ac6488d7ea05888 ChangeLog 1010
+RMD160 0ab3fdf8381598ec099b0bc09b4265ad676c53b6 ChangeLog 1010
+SHA256 c785e583d3657ea0ce8a1ec14756c60d32aea37dda88b842447fef304a18a703 ChangeLog 1010
 MD5 55a5bee2cd9089545a3b10f1833f5a9a files/digest-tuxnes-0.75 63
 RMD160 d9796c43cd016c7643c5bd8a60ce116668939d5f files/digest-tuxnes-0.75 63
 SHA256 e9c85e4fd14e230e0a9062f9c05202b4250647a296d80bdf7167196074b5d76a files/digest-tuxnes-0.75 63
@@ -13,6 +13,6 @@ SHA256 15bd1c1a83cf143416d53676007957e4764930e02b25fd3da5b988ebb422e9c0 files/tu
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 d509dfb43c3aa3503babdc6279c18cc0 tuxnes-0.75.ebuild 1194
-RMD160 249f620e63e71b583874e7fd863ace16bb4d537a tuxnes-0.75.ebuild 1194
-SHA256 e56be6290b4fbf7db5794085e7f7e4a34712babb838a55951a456db373611504 tuxnes-0.75.ebuild 1194
+MD5 edd5e2648587b07226dd22169a5ae78c tuxnes-0.75.ebuild 1318
+RMD160 7ae83acb25c06bce587e99ccb9d22249a1a3e620 tuxnes-0.75.ebuild 1318
+SHA256 94e6ac2874e203046085ff5d74f254947c7a14fce2eb74882a51d994d1452e25 tuxnes-0.75.ebuild 1318
diff --git a/games-emulation/tuxnes/tuxnes-0.75.ebuild b/games-emulation/tuxnes/tuxnes-0.75.ebuild
index 2182b1c16eaf..b75f6ffc8ce7 100644
--- a/games-emulation/tuxnes/tuxnes-0.75.ebuild
+++ b/games-emulation/tuxnes/tuxnes-0.75.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/tuxnes-0.75.ebuild,v 1.7 2006/02/11 04:21:22 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/tuxnes-0.75.ebuild,v 1.8 2006/03/23 20:42:41 mr_bones_ Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils games
 
 DESCRIPTION="emulator for the 8-bit Nintendo Entertainment System"
 HOMEPAGE="http://tuxnes.sourceforge.net/"
@@ -13,36 +13,46 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="X ggi"
 
-RDEPEND=">=media-libs/netpbm-9.12
-	X? ( || ( ( x11-libs/libSM
-				x11-libs/libXpm )
+RDEPEND="sys-libs/zlib
+	X? ( || (
+			(
+				x11-libs/libXext
+				x11-libs/libICE
+				x11-libs/libX11
+				x11-libs/libXpm
+				x11-libs/libSM )
 			virtual/x11 ) )
 	ggi? ( >=media-libs/libggi-2.0.1 )"
 DEPEND="${RDEPEND}
-	X? ( || ( x11-proto/xextproto virtual/x11 ) )"
+	X? ( || (
+			(
+				x11-proto/xextproto
+				x11-proto/xproto )
+			virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-configure.in.patch
-	epatch "${FILESDIR}"/${P}-gcc34.patch
+	epatch \
+		"${FILESDIR}"/${P}-configure.in.patch \
+		"${FILESDIR}"/${P}-gcc34.patch
 	export WANT_AUTOCONF=2.5
 	aclocal && automake && autoconf || die "autoconf failed"
 }
 
 src_compile() {
 	replace-flags "-O?" "-O"
-	econf \
+	egamesconf \
 		--without-w \
 		$(use_with ggi) \
 		$(use_with X x) \
 		|| die
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	insinto /usr/share/pixmaps
-	doins tuxnes.xpm tuxnes2.xpm
+	make DESTDIR="${D}" install || die "make install failed"
+	doicon tuxnes.xpm tuxnes2.xpm
 	dodoc AUTHORS BUGS ChangeLog CHANGES NEWS README THANKS
+	prepgamesdirs
 }