address issues laid out by John Ratliff in bug #51173; tidy

3 files changed, 34 insertions, 35 deletions

diff --git a/games-emulation/fceultra/ChangeLog b/games-emulation/fceultra/ChangeLog
index edca89a86de5..13b25143b5c2 100644
--- a/games-emulation/fceultra/ChangeLog
+++ b/games-emulation/fceultra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/fceultra
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceultra/ChangeLog,v 1.6 2004/05/29 22:25:59 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceultra/ChangeLog,v 1.7 2004/06/05 07:34:28 mr_bones_ Exp $
+
+  05 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  fceultra-0.98.10.ebuild:
+  address issues laid out by John Ratliff in bug #51173; tidy
 
 *fceultra-0.98.10 (30 May 2004)
 
diff --git a/games-emulation/fceultra/Manifest b/games-emulation/fceultra/Manifest
index 8f986eed3798..1d311640f32b 100644
--- a/games-emulation/fceultra/Manifest
+++ b/games-emulation/fceultra/Manifest
@@ -1,15 +1,15 @@
-MD5 d56c6e2bfa4d1f8a39c4d173024deb5a ChangeLog 2808
-MD5 40e022cd01b6de0f50f634d7f9dd696f fceultra-0.81-r1.ebuild 1541
-MD5 e241307d347f8e9370c6d1a98842e3b9 fceultra-0.93.ebuild 1335
-MD5 7b9aff92295c764c856299d4db1761c7 fceultra-0.97.4.ebuild 1558
+MD5 7224b887d73e1a6a9fa690abc9ece66f ChangeLog 2956
 MD5 51cabd92be991a8f808008240ab8cd03 fceultra-0.97.5.ebuild 2102
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 13097b40ab77966ed325470db73b65e0 fceultra-0.98.10.ebuild 1421
-MD5 637fe6dcdb2eddde6cc6d155954d6254 files/0.97.4-joystick.patch 2858
-MD5 59fb294c28c810a13330d1039fe654f0 files/0.97.4-stereo.patch 2228
-MD5 637fe6dcdb2eddde6cc6d155954d6254 files/0.97.5-joystick.patch 2858
+MD5 4b030bdd0138eff8fc7ab7ddc1ef7e62 fceultra-0.98.10.ebuild 1190
+MD5 7b9aff92295c764c856299d4db1761c7 fceultra-0.97.4.ebuild 1558
+MD5 40e022cd01b6de0f50f634d7f9dd696f fceultra-0.81-r1.ebuild 1541
+MD5 e241307d347f8e9370c6d1a98842e3b9 fceultra-0.93.ebuild 1335
 MD5 989c1ea4e153af3a92e18611f719f4aa files/digest-fceultra-0.81-r1 62
-MD5 c3258fd9a3fa0ee6c568f626c992d4eb files/digest-fceultra-0.93 62
-MD5 da6ce0bfb1f581e29d8a78077da1aafc files/digest-fceultra-0.97.4 67
 MD5 ef07ca0ea89b4e4911e5d579502d2fa4 files/digest-fceultra-0.97.5 67
+MD5 637fe6dcdb2eddde6cc6d155954d6254 files/0.97.5-joystick.patch 2858
 MD5 597c9ec9c749aa9556e2385062f94e40 files/digest-fceultra-0.98.10 69
+MD5 637fe6dcdb2eddde6cc6d155954d6254 files/0.97.4-joystick.patch 2858
+MD5 59fb294c28c810a13330d1039fe654f0 files/0.97.4-stereo.patch 2228
+MD5 da6ce0bfb1f581e29d8a78077da1aafc files/digest-fceultra-0.97.4 67
+MD5 c3258fd9a3fa0ee6c568f626c992d4eb files/digest-fceultra-0.93 62
diff --git a/games-emulation/fceultra/fceultra-0.98.10.ebuild b/games-emulation/fceultra/fceultra-0.98.10.ebuild
index 7d0b9b95d31a..6fd56c904374 100644
--- a/games-emulation/fceultra/fceultra-0.98.10.ebuild
+++ b/games-emulation/fceultra/fceultra-0.98.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceultra/fceultra-0.98.10.ebuild,v 1.1 2004/05/29 22:25:59 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceultra/fceultra-0.98.10.ebuild,v 1.2 2004/06/05 07:34:28 mr_bones_ Exp $
 
-inherit games gcc eutils
+inherit eutils games
 
 DESCRIPTION="A portable NES/Famicom emulator"
 HOMEPAGE="http://fceultra.sourceforge.net/"
@@ -11,38 +11,33 @@ SRC_URI="http://fceultra.sourceforge.net/releases/fceu-${PV}.src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
+IUSE="opengl"
 
-IUSE="sdl gtk opengl"
-
+RDEPEND="virtual/glibc
+	>=media-libs/libsdl-1.2.0
+	opengl? ( virtual/opengl )
+	sys-libs/zlib"
 # Because of code generation bugs, FCEUltra now depends on a version
 # of gcc greater than or equal to GCC 3.2.2.
-RDEPEND="|| (
-		gtk? ( >=x11-libs/gtk+-2.2.0 )
-		sdl? ( >=media-libs/libsdl-1.2.0 )
-		opengl? ( virtual/opengl )
-	)
-	>=sys-devel/gcc-3.2.2
-	sys-libs/zlib"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+	>=sys-devel/gcc-3.2.2"
 
-S=${WORKDIR}/fceu
+S="${WORKDIR}/fceu"
 
 src_compile() {
-	local myconf
-	use sdl && myconf="${myconf} --with-sdl"
-	use gtk && myconf="${myconf} --with-gtk"
-	use opengl && myconf="${myconf} --with-opengl"
-	egamesconf ${myconf} || die "egamesconf failed"
+	egamesconf \
+		--disable-dependency-tracking \
+		--without-gtk \
+		--disable-gtktest \
+		$(use_with opengl) || die
 	emake || die "emake failed"
 }
 
 src_install() {
-	egamesinstall || die "install failed"
-	dodoc Documentation/*.txt AUTHORS README NEWS COPYING TODO ChangeLog
-	cp -r Documentation/tech "${D}/usr/share/doc/${P}/" || die "cp failed"
-	find ${D}/usr/share/doc/${P}/tech -type f -exec gzip -9 \{\} \; || \
-		die "find failed"
-	dohtml Documentation/* || die "dohtml failed"
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc Documentation/*.txt AUTHORS README NEWS TODO ChangeLog
+	cp -r Documentation/tech "${D}/usr/share/doc/${PF}/" || die "cp failed"
+	prepalldocs
+	dohtml Documentation/*
 	prepgamesdirs
 }