8 files changed, 146 insertions, 20 deletions
diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index 32c25aabc43a..34a39f67d48c 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/zsnes
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.12 2004/12/26 22:22:37 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.13 2005/01/24 04:59:30 mr_bones_ Exp $
+
+*zsnes-1.42 (23 Jan 2005)
+
+  23 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org> +zsnes-1.42.ebuild:
+  version bump (bug #78873)
+  add support for png use flag
+  add desktop and icon (bug #73316)
 
 *zsnes-1.40 (26 Dec 2004)
 
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 71cd7a4f4c81..9e611c7c729f 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3f8c1a64ad1b7d7ee8fba4645ad6204c ChangeLog 4415
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 8c1a379dff1b3df750bf69ef17f339a2 zsnes-1.36.ebuild 883
 MD5 c16c5d8354eea7ee7719a64d14e6d8fb zsnes-1.37_pre20041024.ebuild 1623
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 df9ec5c9e52d84d4e545e454d30f4a9c zsnes-1.40.ebuild 1627
+MD5 df9ec5c9e52d84d4e545e454d30f4a9c zsnes-1.42.ebuild 1627
 MD5 4309f61426978735396c10fa6e1fd1ea files/digest-zsnes-1.40 64
 MD5 b828464647d2d51e3a08b60e05795f1d files/digest-zsnes-1.36 63
-MD5 46cccb6864144319a93aa5d953fadb0c files/command-line.patch 717
+MD5 59162d5cc203f681f780f51b4b9697ee files/digest-zsnes-1.42 64
 MD5 63565a81de9b21332b2c3950d280589a files/digest-zsnes-1.37_pre20041024 64
 MD5 1df55f6002b96e19b6a3e98b6a6ae042 files/1.40-LDFLAGS.patch 708
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBzzm9roRuSHgZdywRAguCAJ49ku4cXEsgL5ZGfy/2nbReEmal5QCdEAr4
-Ui/dYI1O1FBgygzKrlpq6B4=
-=KhHD
------END PGP SIGNATURE-----
+MD5 46cccb6864144319a93aa5d953fadb0c files/command-line.patch 717
+MD5 1df55f6002b96e19b6a3e98b6a6ae042 files/1.42-LDFLAGS.patch 708
diff --git a/games-emulation/zsnes/files/1.42-configure.patch b/games-emulation/zsnes/files/1.42-configure.patch
new file mode 100644
index 000000000000..b19194dace67
--- /dev/null
+++ b/games-emulation/zsnes/files/1.42-configure.patch
@@ -0,0 +1,58 @@
+--- configure.in.orig	2005-01-23 17:17:21.000000000 -0500
++++ configure.in	2005-01-23 17:17:38.000000000 -0500
+@@ -15,8 +15,6 @@
+ dnl Mingw, because it doesnt have a standard file tree. Maybe if ming do this
+ dnl else do -I/usr/include. Or some shit. You figure it out.
+ 
+-LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"
+-
+ dnl -- Same thing here.
+ 
+ AC_CANONICAL_SYSTEM
+@@ -84,7 +82,9 @@
+ CFLAGS="$CFLAGS -I$opengl_prefix/include"
+ LDFLAGS-"$LDFLAGS -L$opengl_prefix/lib"
+ fi
++if test x$x_libraries != x; then
+ LDFLAGS="$LDFLAGS -L$x_libraries"
++fi
+ AC_CHECK_LIB(GL, glGetError,found_opengl="yes",,)
+ if test x$found_opengl = xyes; then
+         echo checking for OpenGL... yes
+@@ -118,36 +118,10 @@
+ else
+ 	AC_MSG_RESULT(no)
+ 	
+-	CFLAGS="$CFLAGS -O3 -ffast-math -fomit-frame-pointer -fexpensive-optimizations -s"
+ 	NFLAGS="$NFLAGS -O1"
+ 	ZSNESEXE="zsnes"
+ fi
+ 
+-AC_MSG_CHECKING(which processor class to optimize for)
+-if test x$debug != xyes; then
+-	case "$target" in
+-		i486-*-*)
+-			CFLAGS="$CFLAGS -march=i486"
+-			AC_MSG_RESULT(486)
+-			;;
+-		i586-*-*)
+-			CFLAGS="$CFLAGS -march=pentium"
+-			AC_MSG_RESULT(586)
+-			;;
+-		i686-*-*)
+-			CFLAGS="$CFLAGS -march=pentiumpro"
+-			dnl CFLAGS="$CFLAGS -march=pentium3 -mmmx -msse -mfpmath=sse,387"
+-			AC_MSG_RESULT(686)
+-			;;
+-		*)
+-			AC_MSG_RESULT(386)
+-			AC_MSG_WARN(*** This is probably not what you want use --target)
+-			;;
+-	esac
+-else
+-	AC_MSG_RESULT(no optimization because debug enabled)
+-fi
+-
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_HEADER_MAJOR
diff --git a/games-emulation/zsnes/files/digest-zsnes-1.42 b/games-emulation/zsnes/files/digest-zsnes-1.42
new file mode 100644
index 000000000000..092ef083ed24
--- /dev/null
+++ b/games-emulation/zsnes/files/digest-zsnes-1.42
@@ -0,0 +1 @@
+MD5 e3fcc13061e169194ec31c27ace1b6e7 zsnes142src.tar.gz 1102840
diff --git a/games-emulation/zsnes/zsnes-1.36.ebuild b/games-emulation/zsnes/zsnes-1.36.ebuild
index dc0b56504640..ed6b0f46aa00 100644
--- a/games-emulation/zsnes/zsnes-1.36.ebuild
+++ b/games-emulation/zsnes/zsnes-1.36.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.36.ebuild,v 1.6 2004/06/24 22:38:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.36.ebuild,v 1.7 2005/01/24 04:59:30 mr_bones_ Exp $
 
 inherit games
 
diff --git a/games-emulation/zsnes/zsnes-1.37_pre20041024.ebuild b/games-emulation/zsnes/zsnes-1.37_pre20041024.ebuild
index fc6898330db8..743568489dc2 100644
--- a/games-emulation/zsnes/zsnes-1.37_pre20041024.ebuild
+++ b/games-emulation/zsnes/zsnes-1.37_pre20041024.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.37_pre20041024.ebuild,v 1.1 2004/11/20 12:24:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.37_pre20041024.ebuild,v 1.2 2005/01/24 04:59:30 mr_bones_ Exp $
 
 inherit eutils flag-o-matic games
 
diff --git a/games-emulation/zsnes/zsnes-1.40.ebuild b/games-emulation/zsnes/zsnes-1.40.ebuild
index 02faeda3d5fa..469bc403df09 100644
--- a/games-emulation/zsnes/zsnes-1.40.ebuild
+++ b/games-emulation/zsnes/zsnes-1.40.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.40.ebuild,v 1.1 2004/12/26 22:22:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.40.ebuild,v 1.2 2005/01/24 04:59:30 mr_bones_ Exp $
 
 inherit eutils flag-o-matic games
 
diff --git a/games-emulation/zsnes/zsnes-1.42.ebuild b/games-emulation/zsnes/zsnes-1.42.ebuild
new file mode 100644
index 000000000000..5cdcbbadb3aa
--- /dev/null
+++ b/games-emulation/zsnes/zsnes-1.42.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.42.ebuild,v 1.1 2005/01/24 04:59:30 mr_bones_ Exp $
+
+inherit eutils flag-o-matic games
+
+DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
+HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
+SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//.}src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="opengl png"
+
+# we need libsdl for headers on amd64, even though we'll technically be using
+# the 32bit sdl from emul-linux-x86-sdl.
+RDEPEND="virtual/libc
+	>=media-libs/libsdl-1.2.0
+	>=sys-libs/zlib-1.1
+	amd64? ( app-emulation/emul-linux-x86-sdl )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng )"
+DEPEND="${RDEPEND}
+	>=dev-lang/nasm-0.98
+	sys-devel/automake
+	>=sys-devel/autoconf-2.58"
+
+S="${WORKDIR}/${PN}_${PV//./_}"
+
+multilib_check() {
+	if has_m32 ; then
+		einfo "multilib detected, adding -m32 to CFLAGS. note that opengl"
+		einfo "support probably wont work quite right."
+		append-flags -m32
+	else
+		die "zsnes requires multilib support in gcc. please re-emerge gcc with multilib in USE and try again"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/src
+	cp "icons/48x48x32.png" "${T}/zsnes.png"
+	epatch "${FILESDIR}"/${PV}-configure.patch
+	aclocal && autoconf || die "autotools failed"
+}
+
+src_compile() {
+	use amd64 && multilib_check
+	cd src
+	egamesconf \
+		$(use_enable png libpng) \
+		$(use_enable opengl) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	dogamesbin src/zsnes || die "dogamesbin failed"
+	newman src/linux/zsnes.1 zsnes.6
+	dodoc docs/{*.txt,README.LINUX}
+	dohtml -r docs/Linux/*
+	make_desktop_entry zsnes ZSNES zsnes.png
+	doicon "${T}/zsnes.png"
+	prepgamesdirs
+}