Version bump wrt bug #131198

Add use ao to use libao for audio (suggested)
Set me as zsnes-1.5.0+ maintainer (authorized by SpanKY)

Package-Manager: portage-2.1.2-r5

6 files changed, 174 insertions, 14 deletions

diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog
index 4fe1577cb3ce..e28f88197427 100644
--- a/games-emulation/zsnes/ChangeLog
+++ b/games-emulation/zsnes/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-emulation/zsnes
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.22 2006/08/15 17:41:03 mr_bones_ Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.23 2007/01/29 17:04:23 drizzt Exp $
+
+*zsnes-1.51 (29 Jan 2007)
+
+  29 Jan 2007; Timothy Redaelli <drizzt@gentoo.org>
+  +files/zsnes-1.51-gzdirect.patch, metadata.xml, +zsnes-1.51.ebuild:
+  Version bump wrt bug #131198
+  Add use ao to use libao for audio (suggested)
+  Set me as zsnes-1.5.0+ maintainer (authorized by SpanKY)
 
   15 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
   +files/zsnes-1.42-memfix.patch, zsnes-1.42.ebuild:
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
index 1a94f7d37e60..56de1eb8b58b 100644
--- a/games-emulation/zsnes/Manifest
+++ b/games-emulation/zsnes/Manifest
@@ -13,26 +13,38 @@ AUX zsnes-1.42-memfix.patch 565 RMD160 558c260bdca2a158c6f1c22bfc6dcc40c08c5ed7
 MD5 c5c57d18d06a3d2c2f808da29aa981d0 files/zsnes-1.42-memfix.patch 565
 RMD160 558c260bdca2a158c6f1c22bfc6dcc40c08c5ed7 files/zsnes-1.42-memfix.patch 565
 SHA256 f95812e735ea1500fb05025f787497ef8f0bc4c12cb6b7642d2072359387a6b4 files/zsnes-1.42-memfix.patch 565
+AUX zsnes-1.51-gzdirect.patch 2125 RMD160 34d20566d0239cc755e5d83213e069f7cddb5947 SHA1 39b7189146bcbadca5456c060c80f3fd30e577ee SHA256 752d52a2fc019c329d76e4f8fd6c0a3002ab75f82781ebec400f9b7d45fb87fa
+MD5 b67ada558af9164141ae505adcbf84d3 files/zsnes-1.51-gzdirect.patch 2125
+RMD160 34d20566d0239cc755e5d83213e069f7cddb5947 files/zsnes-1.51-gzdirect.patch 2125
+SHA256 752d52a2fc019c329d76e4f8fd6c0a3002ab75f82781ebec400f9b7d45fb87fa files/zsnes-1.51-gzdirect.patch 2125
 DIST zsnes142src.tar.gz 1102840 RMD160 d794c69e876265715e141c26ecb6ed1802ffc27d SHA1 d38ca8c1b4168edc5bb5815f504b52654100bc4b SHA256 f06ef14db8d3fdae9d7c12442a52e535a5feee1cb18c78b51a74ed282ed874be
+DIST zsnes151src.tar.bz2 1071712 RMD160 337407bf7e5516bcd7bf310c7b17d6d12a948750 SHA1 03df35490870c9950d7010747d0546c8525c0362 SHA256 eb013f824f5a9814a714cf0daaea3ea68a1c74fd741e5b0979fcb7964236a866
 EBUILD zsnes-1.42.ebuild 1506 RMD160 acfb4288a677b5bb41ad8392695b96506866e32a SHA1 c838f6277c5404aa267ce25ad498d7d965ac76ae SHA256 76ea0337597ce7b0cd921b24e626db5aa5938b632fabc1b0c52d03f1efe92fa2
 MD5 d2185588da42a9edd0f6ce9288ce33b6 zsnes-1.42.ebuild 1506
 RMD160 acfb4288a677b5bb41ad8392695b96506866e32a zsnes-1.42.ebuild 1506
 SHA256 76ea0337597ce7b0cd921b24e626db5aa5938b632fabc1b0c52d03f1efe92fa2 zsnes-1.42.ebuild 1506
-MISC ChangeLog 5775 RMD160 aacf9aecce1e2ebe5660dae7f58bf25c4a06bacb SHA1 1bd2c70eb32fc75b93d61b2df431dc024c1bd351 SHA256 15a56a98645b315f31e6d10929ec3d9dea6dc29830a99416c97ed5f204fd0bf7
-MD5 003c27605565b7f8144fc7898eb34bee ChangeLog 5775
-RMD160 aacf9aecce1e2ebe5660dae7f58bf25c4a06bacb ChangeLog 5775
-SHA256 15a56a98645b315f31e6d10929ec3d9dea6dc29830a99416c97ed5f204fd0bf7 ChangeLog 5775
-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
+EBUILD zsnes-1.51.ebuild 1850 RMD160 b17d86d76c8f089b059033f509fb1b36f748db51 SHA1 3e247dca2b8d25abfbed423ac85428015a09ac5f SHA256 35658d72a0a3723c23ce149974cb0277966e16063a3b59ae00568687149cfe43
+MD5 8eb732fe744ed6e8e69c9f1629e6f8b6 zsnes-1.51.ebuild 1850
+RMD160 b17d86d76c8f089b059033f509fb1b36f748db51 zsnes-1.51.ebuild 1850
+SHA256 35658d72a0a3723c23ce149974cb0277966e16063a3b59ae00568687149cfe43 zsnes-1.51.ebuild 1850
+MISC ChangeLog 6060 RMD160 f01caac9d5a6badcaab38d036920fc0e9c0b8877 SHA1 546813c8723bb96cfc50bb0d670331129831e068 SHA256 6b6f50cc8c3f778c23152d23bd523c265ff3e4f8f51c5180a260f726dbdcca42
+MD5 d9930e0afcddeaeb4d0d9a6012707444 ChangeLog 6060
+RMD160 f01caac9d5a6badcaab38d036920fc0e9c0b8877 ChangeLog 6060
+SHA256 6b6f50cc8c3f778c23152d23bd523c265ff3e4f8f51c5180a260f726dbdcca42 ChangeLog 6060
+MISC metadata.xml 372 RMD160 0d0b2eeec56fca840beec662062dfa3961537649 SHA1 41d62af5e7cd389224135e8385b22355f2c7f2ac SHA256 043dd4fd85df344c5a335c1f3bc1a0f9ce9b169337060367f767b3e4be217bdb
+MD5 67c743475aa0bdcc349144352575421c metadata.xml 372
+RMD160 0d0b2eeec56fca840beec662062dfa3961537649 metadata.xml 372
+SHA256 043dd4fd85df344c5a335c1f3bc1a0f9ce9b169337060367f767b3e4be217bdb metadata.xml 372
 MD5 f1839404902e2726c8c80f281d70a374 files/digest-zsnes-1.42 238
 RMD160 5ce1d73df1789189a02442aa36cfdf9cca9a2d46 files/digest-zsnes-1.42 238
 SHA256 99166dbdf5a05f01c2a3d54159672d0c9ab10a032f251a0d7e95e96b8ce107cf files/digest-zsnes-1.42 238
+MD5 98d517360d380f58da5b1ed8cc6d3dfd files/digest-zsnes-1.51 241
+RMD160 fc4e7b29b0fd5e0fadab0336a35126baeea23a6a files/digest-zsnes-1.51 241
+SHA256 f9ba651da95dcbc8a7c53b572bc4ecd38f552891b26c351b8ab719177399e6c1 files/digest-zsnes-1.51 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFVRzRamhnQswr0vIRAr3OAJ45JEQyvICvOF4k2l04J/v65Ni/bwCdFDyh
-aEi8DudK9+2OvG4J0wrVC2E=
-=gSIG
+iD8DBQFFvikfGDyatLGpTbYRAkIzAJsHGyJp5elEHuJvSrX60gN0bSepBQCfTe7Z
+u4SU3ocFWfZWKTP56jK6q1M=
+=Nkxu
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/zsnes/files/digest-zsnes-1.51 b/games-emulation/zsnes/files/digest-zsnes-1.51
new file mode 100644
index 000000000000..018d3f063974
--- /dev/null
+++ b/games-emulation/zsnes/files/digest-zsnes-1.51
@@ -0,0 +1,3 @@
+MD5 328071775f88f7c3b9fdb94176e5e417 zsnes151src.tar.bz2 1071712
+RMD160 337407bf7e5516bcd7bf310c7b17d6d12a948750 zsnes151src.tar.bz2 1071712
+SHA256 eb013f824f5a9814a714cf0daaea3ea68a1c74fd741e5b0979fcb7964236a866 zsnes151src.tar.bz2 1071712
diff --git a/games-emulation/zsnes/files/zsnes-1.51-gzdirect.patch b/games-emulation/zsnes/files/zsnes-1.51-gzdirect.patch
new file mode 100644
index 000000000000..f076ffd7f5c1
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.51-gzdirect.patch
@@ -0,0 +1,60 @@
+Only in zsnes_1_50/src: aclocal.m4
+Only in zsnes_1_50/src: autom4te.cache
+Only in zsnes_1_50/src: config.h
+Only in zsnes_1_50/src: config.log
+Only in zsnes_1_50/src: config.status
+Only in zsnes_1_50.orig/src: configure
+diff -ur zsnes_1_50.orig/src/configure.in zsnes_1_50/src/configure.in
+--- zsnes_1_50.orig/src/configure.in	2007-01-13 00:24:30.000000000 +0100
++++ zsnes_1_50/src/configure.in	2007-01-13 00:27:50.000000000 +0100
+@@ -76,6 +76,7 @@
+ AM_PATH_ZLIB(1.2.3,,[AC_MSG_ERROR(zlib >= 1.2.3 is required)])
+ CFLAGS="$CFLAGS $ZLIB_CFLAGS"
+ LDFLAGS="$LDFLAGS $ZLIB_LIBS"
++AC_CHECK_FUNCS(gzdirect)
+ 
+ dnl - libpng stuff
+ AM_PATH_LIBPNG(1.2.0,,)
+diff -ur zsnes_1_50.orig/src/initc.c zsnes_1_50/src/initc.c
+--- zsnes_1_50.orig/src/initc.c	2007-01-13 00:24:30.000000000 +0100
++++ zsnes_1_50/src/initc.c	2007-01-13 00:38:25.000000000 +0100
+@@ -831,6 +831,35 @@
+   }
+ }
+ 
++#ifndef HAVE_GZDIRECT
++typedef struct gz_stream {
++  z_stream stream;
++  int      z_err;   /* error code for last stream operation */
++  int      z_eof;   /* set if end of input file */
++  FILE     *file;   /* .gz file */
++  Byte     *inbuf;  /* input buffer */
++  Byte     *outbuf; /* output buffer */
++  uLong    crc;     /* crc32 of uncompressed data */
++  char     *msg;    /* error message */
++  char     *path;   /* path name for debugging only */
++  int      transparent; /* 1 if input file is not a .gz file */
++  char     mode;    /* 'w' or 'r' */
++  z_off_t  start;   /* start of compressed data in file (header skipped) */
++  z_off_t  in;      /* bytes into deflate or inflate */
++  z_off_t  out;     /* bytes out of deflate or inflate */
++  int      back;    /* one character push-back */
++  int      last;    /* true if push-back is last character */
++} gz_stream;
++
++int gzdirect (gzFile file)
++{
++  gz_stream *s = (gz_stream*)file;
++
++  if (s == NULL || s->mode != 'r') return 0;
++  return s->transparent;
++}
++#endif
++
+ void loadGZipFile(char *filename)
+ {
+   //Open file for size reading
+Only in zsnes_1_50/src: Makefile
+Only in zsnes_1_50/src: makefile.dep
+Only in zsnes_1_50/src/tools: fileutil.o
+Only in zsnes_1_50/src/tools: strutil.o
diff --git a/games-emulation/zsnes/metadata.xml b/games-emulation/zsnes/metadata.xml
index d3c2cc926f0b..afad9349611e 100644
--- a/games-emulation/zsnes/metadata.xml
+++ b/games-emulation/zsnes/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
+<maintainer restrict="&gt;=games-emulation/zsnes-1.5.0">
+	<email>drizzt@gentoo.org</email>
+	<name>Timothy Redaelli</name>
+	<description>Please assign bugs to games@gentoo.org and CC me.</description>
+</maintainer>
 </pkgmetadata>
diff --git a/games-emulation/zsnes/zsnes-1.51.ebuild b/games-emulation/zsnes/zsnes-1.51.ebuild
new file mode 100644
index 000000000000..c04965474792
--- /dev/null
+++ b/games-emulation/zsnes/zsnes-1.51.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51.ebuild,v 1.1 2007/01/29 17:04:23 drizzt Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils autotools games toolchain-funcs
+
+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.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="ao opengl png"
+
+RDEPEND=">=media-libs/libsdl-1.2.0
+	>=sys-libs/zlib-1.2.3-r1
+	amd64? ( app-emulation/emul-linux-x86-sdl )
+	ao? ( media-libs/libao )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng )"
+DEPEND="${RDEPEND}
+	>=dev-lang/nasm-0.98"
+
+S="${WORKDIR}/${PN}_${PV//./_}/src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp "icons/48x48x32.png" "${T}/${PN}.png"
+
+	# Workaround for old libz
+	[[ "${ARCH}" = amd64 ]] && epatch "${FILESDIR}"/${P}-gzdirect.patch
+
+	# Remove hardcoded CFLAGS and LDFLAGS
+	sed -i \
+		-e '/^\s*CFLAGS=.* -fomit-frame-pointer /d'		\
+		-e 's:^\s*CFLAGS=.* -I\/usr\/local\/include .*$:CFLAGS="${CFLAGS} -I.":'	\
+		-e '/^\s*LDFLAGS=.* -L\/usr\/local\/lib /d'		\
+		configure.in || die
+
+	eautoreconf
+}
+
+src_compile() {
+	tc-export CC
+	use amd64 && multilib_toolchain_setup x86
+	egamesconf \
+		$(use_enable ao libao) \
+		$(use_enable png libpng) \
+		$(use_enable opengl) \
+		--disable-debug \
+		--disable-debugger \
+		--disable-cpucheck \
+		--enable-release \
+		force_arch=no \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	dogamesbin zsnes || die "dogamesbin failed"
+	newman linux/zsnes.1 zsnes.6
+	dodoc ../docs/{*.txt,README.LINUX}
+	dohtml -r ../docs/Linux/*
+	make_desktop_entry zsnes ZSNES zsnes.png
+	doicon "${T}/${PN}.png"
+	prepgamesdirs
+}