unmask #20320

7 files changed, 30 insertions, 143 deletions

diff --git a/app-emulation/fceultra/ChangeLog b/app-emulation/fceultra/ChangeLog
index 4713655048f8..3bd3c7cac59b 100644
--- a/app-emulation/fceultra/ChangeLog
+++ b/app-emulation/fceultra/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for app-emulation/fceultra
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/fceultra/ChangeLog,v 1.11 2003/06/24 05:50:53 sunflare Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/fceultra/ChangeLog,v 1.12 2003/06/28 06:05:21 vapier Exp $
 
 *fceultra-096 (24 Jun 2003)
 
+  27 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Tweaked syntax and unmasked for #20320.
+
   24 Jun 2003; Phil Bordelon <sunflare@gentoo.org> fceultra-096.ebuild:
   Version bump. Note that this version seems to have a couple of issues with
   joystick control; only upgrade if necessary, until an upstream version with
diff --git a/app-emulation/fceultra/Manifest b/app-emulation/fceultra/Manifest
index 7cbcd927b47c..b92b97b49d67 100644
--- a/app-emulation/fceultra/Manifest
+++ b/app-emulation/fceultra/Manifest
@@ -1,7 +1,3 @@
-MD5 22f99610890abe50b0892fa7e7a5adc0 ChangeLog 1986
-MD5 7593f404289a3bb5d500fd18bfeab84d fceultra-081-r1.ebuild 1532
-MD5 17452b2c38c386117a6683d91762e364 fceultra-093.ebuild 1366
-MD5 2c1faf0b0d31fb311d3ec1f5bb7e15ce fceultra-096.ebuild 1366
-MD5 989c1ea4e153af3a92e18611f719f4aa files/digest-fceultra-081-r1 62
-MD5 c3258fd9a3fa0ee6c568f626c992d4eb files/digest-fceultra-093 62
 MD5 ec518d4868d947b4ce4ff1919933204a files/digest-fceultra-096 62
+MD5 50d30cab923e7af39ab31b06c00f326e ChangeLog 2079
+MD5 c335e6df42c021745a661d99e2bf7283 fceultra-096.ebuild 1396
diff --git a/app-emulation/fceultra/fceultra-081-r1.ebuild b/app-emulation/fceultra/fceultra-081-r1.ebuild
deleted file mode 100644
index 29d4ef36f799..000000000000
--- a/app-emulation/fceultra/fceultra-081-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/fceultra/fceultra-081-r1.ebuild,v 1.3 2003/02/13 07:13:32 vapier Exp $
-
-inherit gcc
-
-MY_P=fceu
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A portable NES/Famicom Emulator"
-SRC_URI="http://fceultra.sourceforge.net/dev/${MY_P}${PV}src.tar.gz"
-HOMEPAGE="http://fceultra.sourceforge.net/"
-
-SLOT="0"
-KEYWORDS="x86 -ppc"
-LICENSE="GPL-2"
-
-DEPEND="svga? ( media-libs/svgalib )
-	sdl? ( media-libs/libsdl )"
-
-pkg_setup() {
-	if [ `gcc-major-version` == 3 ] && [ `gcc-minor-version` == 2 ] && [ ${ARCH} == "x86" ] ; then
-		eerror "Do not use gcc 3.2.x to compile the source code"
-		eerror "on 80x86/IA32 platforms. It has a code generation"
-		eerror "bug in it that will cause FCE Ultra to not work."
-		die "cant compile on x86 with gcc-3.2.x"
-	fi
-
-	use sdl && return 0
-	use svga && return 0
-
-	eerror "You must have 'sdl' or 'svga' in your USE variable"
-	die "unable to build SVGA or SDL versions"
-}
-
-src_compile() {
-	mv Makefile.base Makefile.orig
-	sed -e "s:\${TFLAGS}:\${TFLAGS} ${CFLAGS}:" \
-		Makefile.orig > Makefile.base
-
-	if [ `use sdl` ] ; then
-		make -f Makefile.unixsdl || die "sdl make failed"
-		mv fceu fceu-sdl
-		make -f Makefile.unixsdl clean
-	fi
-	if [ `use svga` ] ; then
-		make -f Makefile.linuxvga || die "svga make failed"
-		mv fceu fceu-svga
-	fi
-}
-
-src_install() {
-	use sdl && dobin fceu-sdl
-	use svga && dobin fceu-svga
-	dodoc Documentation/{*,rel/readme-linux.txt}
-}
diff --git a/app-emulation/fceultra/fceultra-093.ebuild b/app-emulation/fceultra/fceultra-093.ebuild
deleted file mode 100644
index dcc3e1217649..000000000000
--- a/app-emulation/fceultra/fceultra-093.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/fceultra/fceultra-093.ebuild,v 1.1 2003/03/19 03:16:23 sunflare Exp $
-
-inherit gcc
-
-MY_P=fceu
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A portable NES/Famicom emulator"
-SRC_URI="http://fceultra.sourceforge.net/dev/${MY_P}${PV}src.tar.gz"
-HOMEPAGE="http://fceultra.sourceforge.net/"
-
-SLOT="0"
-KEYWORDS="~x86 -ppc"
-LICENSE="GPL-2"
-
-# Because of code generation bugs, FCEUltra now depends on a version
-# of gcc greater than or equal to GCC 3.2.2.
-
-DEPEND="svga? ( media-libs/svgalib )
-	sdl? ( media-libs/libsdl )
-	>=sys-devel/gcc-3.2.2"
-
-RDEPEND=${DEPEND}
-
-pkg_setup() {
-
-	use sdl && return 0
-	use svga && return 0
-
-	eerror "You must have 'sdl' or 'svga' in your USE variable"
-	die "unable to build SVGA or SDL versions"
-}
-
-src_compile() {
-	mv Makefile.base Makefile.orig
-	sed -e "s:\${TFLAGS}:\${TFLAGS} ${CFLAGS}:" \
-		Makefile.orig > Makefile.base
-
-	if [ `use sdl` ] ; then
-		make -f Makefile.unixsdl || die "sdl make failed"
-		mv fceu fceu-sdl
-		make -f Makefile.unixsdl clean
-	fi
-	if [ `use svga` ] ; then
-		make -f Makefile.linuxvga || die "svga make failed"
-		mv fceu fceu-svga
-	fi
-}
-
-src_install() {
-	use sdl && dobin fceu-sdl
-	use svga && dobin fceu-svga
-	dodoc Documentation/{*,rel/readme-linux.txt}
-}
diff --git a/app-emulation/fceultra/fceultra-096.ebuild b/app-emulation/fceultra/fceultra-096.ebuild
index acb1aa7163f0..2b86b138dad6 100644
--- a/app-emulation/fceultra/fceultra-096.ebuild
+++ b/app-emulation/fceultra/fceultra-096.ebuild
@@ -1,43 +1,41 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/fceultra/fceultra-096.ebuild,v 1.1 2003/06/24 05:50:54 sunflare Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/fceultra/fceultra-096.ebuild,v 1.2 2003/06/28 06:05:21 vapier Exp $
 
-inherit gcc
+inherit games gcc
 
-MY_P=fceu
-S=${WORKDIR}/${MY_P}
+MY_PN=fceu
 DESCRIPTION="A portable NES/Famicom emulator"
-SRC_URI="http://fceultra.sourceforge.net/dev/${MY_P}${PV}src.tar.gz"
+SRC_URI="http://fceultra.sourceforge.net/files/${MY_PN}${PV}src.tar.gz"
 HOMEPAGE="http://fceultra.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~x86 -ppc"
+KEYWORDS="x86 -ppc"
 LICENSE="GPL-2"
+IUSE="sdl svga"
 
 # Because of code generation bugs, FCEUltra now depends on a version
 # of gcc greater than or equal to GCC 3.2.2.
+DEPEND="|| (
+		svga? ( media-libs/svgalib )
+		sdl? ( media-libs/libsdl )
+		media-libs/libsdl
+	)
+	>=sys-devel/gcc-3.2.2
+	sys-libs/zlib"
 
-DEPEND="svga? ( media-libs/svgalib )
-	sdl? ( media-libs/libsdl )
-	>=sys-devel/gcc-3.2.2"
+S=${WORKDIR}/${MY_PN}
 
-RDEPEND=${DEPEND}
+src_unpack() {
+	unpack ${A}
 
-pkg_setup() {
-
-	use sdl && return 0
-	use svga && return 0
-
-	eerror "You must have 'sdl' or 'svga' in your USE variable"
-	die "unable to build SVGA or SDL versions"
+	cp ${S}/Makefile.base{,.orig}
+	sed -e "s:\${TFLAGS}:\${TFLAGS} ${CFLAGS}:" \
+		${S}/Makefile.base.orig > ${S}/Makefile.base
 }
 
 src_compile() {
-	mv Makefile.base Makefile.orig
-	sed -e "s:\${TFLAGS}:\${TFLAGS} ${CFLAGS}:" \
-		Makefile.orig > Makefile.base
-
-	if [ `use sdl` ] ; then
+	if [ `use sdl` ] || [ -z "`use sdl``use svga`" ] ; then
 		make -f Makefile.unixsdl || die "sdl make failed"
 		mv fceu fceu-sdl
 		make -f Makefile.unixsdl clean
@@ -49,7 +47,9 @@ src_compile() {
 }
 
 src_install() {
-	use sdl && dobin fceu-sdl
-	use svga && dobin fceu-svga
+	use sdl && dogamesbin fceu-sdl
+	use svga && dogamesbin fceu-svga
+	use sdl || use svga || dogamesbin fceu-sdl
 	dodoc Documentation/{*,rel/readme-linux.txt}
+	prepgamesdirs
 }
diff --git a/app-emulation/fceultra/files/digest-fceultra-081-r1 b/app-emulation/fceultra/files/digest-fceultra-081-r1
deleted file mode 100644
index 8722963963cc..000000000000
--- a/app-emulation/fceultra/files/digest-fceultra-081-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1dcfc1199a2dad906ddb771f89f50ddf fceu081src.tar.gz 424700
diff --git a/app-emulation/fceultra/files/digest-fceultra-093 b/app-emulation/fceultra/files/digest-fceultra-093
deleted file mode 100644
index 5f20e5cb2ae7..000000000000
--- a/app-emulation/fceultra/files/digest-fceultra-093
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c2fea068f1db62ec51f6fc77f1c5da82 fceu093src.tar.gz 450883