version bump (bug #380809); also builds against newer zlib (bug #384547)

(Portage version: 2.1.10.11/cvs/Linux i686)

3 files changed, 198 insertions, 2 deletions

diff --git a/games-emulation/snes9x/ChangeLog b/games-emulation/snes9x/ChangeLog
index 2d97213d6182..a49ba9d1d2ce 100644
--- a/games-emulation/snes9x/ChangeLog
+++ b/games-emulation/snes9x/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/snes9x
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.51 2010/11/15 09:49:52 tupone Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.52 2011/09/26 22:23:28 mr_bones_ Exp $
+
+*snes9x-1.53 (26 Sep 2011)
+
+  26 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org> +snes9x-1.53.ebuild,
+  +files/snes9x-1.53-build.patch:
+  version bump (bug #380809); also builds against newer zlib (bug #384547)
 
   15 Nov 2010; Alfredo Tupone <tupone@gentoo.org> snes9x-1.52-r1.ebuild:
   Require app-emulation/emul-linux-x86-soundlibs when needed. Bug #345099 by
diff --git a/games-emulation/snes9x/files/snes9x-1.53-build.patch b/games-emulation/snes9x/files/snes9x-1.53-build.patch
new file mode 100644
index 000000000000..c46e5f238549
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.53-build.patch
@@ -0,0 +1,70 @@
+diff -ru snes9x-1.53-src.orig/gtk/configure.ac snes9x-1.53-src/gtk/configure.ac
+--- snes9x-1.53-src.orig/gtk/configure.ac	2011-04-24 09:38:10.000000000 -0400
++++ snes9x-1.53-src/gtk/configure.ac	2011-09-26 16:06:46.746352405 -0400
+@@ -29,7 +29,7 @@
+ 
+ AM_GLIB_GNU_GETTEXT
+ 
+-snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
++snes9xlocaledir='/usr/share/locale'
+ AC_SUBST(snes9xlocaledir)
+ 
+ AC_ARG_WITH(debug,
+diff -ru snes9x-1.53-src.orig/gtk/po/Makefile.in.in snes9x-1.53-src/gtk/po/Makefile.in.in
+--- snes9x-1.53-src.orig/gtk/po/Makefile.in.in	2011-04-24 16:12:50.000000000 -0400
++++ snes9x-1.53-src/gtk/po/Makefile.in.in	2011-09-26 16:07:05.844485532 -0400
+@@ -34,7 +34,7 @@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++itlocaledir = /usr/share/locale
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+diff -ru snes9x-1.53-src.orig/unix/Makefile.in snes9x-1.53-src/unix/Makefile.in
+--- snes9x-1.53-src.orig/unix/Makefile.in	2011-04-24 09:38:10.000000000 -0400
++++ snes9x-1.53-src/unix/Makefile.in	2011-09-26 16:06:46.746352405 -0400
+@@ -47,7 +47,7 @@
+ 	exit 1
+ 
+ snes9x: $(OBJECTS)
+-	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
++	$(CCC) $(LDFLAGS) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
+ 
+ ../jma/s9x-jma.o: ../jma/s9x-jma.cpp
+ 	$(CCC) $(INCLUDES) -c $(CCFLAGS) -fexceptions $*.cpp -o $@
+diff -ru snes9x-1.53-src.orig/unix/configure.ac snes9x-1.53-src/unix/configure.ac
+--- snes9x-1.53-src.orig/unix/configure.ac	2011-04-24 09:38:10.000000000 -0400
++++ snes9x-1.53-src/unix/configure.ac	2011-09-26 16:06:46.747352203 -0400
+@@ -56,20 +56,6 @@
+ # *** Execution begins here ***
+ # *****************************
+ 
+-# Remove -g and -O2 flags manually.
+-
+-if test "x$CFLAGS" != "x"; then
+-	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
+-	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
+-fi
+-
+-if test "x$CXXFLAGS" != "x"; then
+-	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
+-	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
+-fi
+-
+-# Test what compiler flags we should use.
+-
+ AC_ARG_ENABLE([debug],
+ 	[AS_HELP_STRING([--enable-debug],
+ 		[leave debug information in the final binary (default: no)])],
+@@ -79,9 +65,6 @@
+ 	AC_S9X_COMPILER_FLAG([-g],  [g])
+ 	AC_S9X_COMPILER_FLAG([-O0], [o0])
+ else
+-	AC_S9X_COMPILER_FLAG([-O3], [o3], [
+-		AC_S9X_COMPILER_FLAG([-O2], [o2], [
+-			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
+ 	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
+ fi
+ 
diff --git a/games-emulation/snes9x/snes9x-1.53.ebuild b/games-emulation/snes9x/snes9x-1.53.ebuild
new file mode 100644
index 000000000000..0b500b5d59d8
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.53.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.53.ebuild,v 1.1 2011/09/26 22:23:27 mr_bones_ Exp $
+
+EAPI=2
+inherit autotools eutils flag-o-matic multilib gnome2-utils games
+
+DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
+HOMEPAGE="http://code.google.com/p/snes9x-gtk/"
+SRC_URI="http://snes9x-gtk.googlecode.com/files/${P}-src.tar.bz2"
+
+LICENSE="as-is GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio +xv +xrandr zlib"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	png? ( >=media-libs/libpng-1.2.43 )
+	amd64? ( png? ( >=media-libs/libpng-1.4.2 ) )
+	gtk? ( >=x11-libs/gtk+-2.10:2
+		x11-misc/xdg-utils
+		portaudio? ( >=media-libs/portaudio-19_pre )
+		joystick? ( >=media-libs/libsdl-1.2.12[joystick] )
+		opengl? ( virtual/opengl )
+		xv? ( x11-libs/libXv )
+		xrandr? ( x11-libs/libXrandr )
+		alsa? ( media-libs/alsa-lib )
+		pulseaudio? ( media-sound/pulseaudio ) )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	gtk? ( dev-util/pkgconfig
+		xv? ( x11-proto/videoproto ) )
+	nls? ( dev-util/intltool )"
+
+S=${WORKDIR}/${P}-src/unix
+
+pkg_setup() {
+	games_pkg_setup
+}
+
+src_prepare() {
+	cd "${WORKDIR}"/${P}-src
+	sed -i -e '/pedantic/d' {gtk,unix}/configure.ac || die
+	sed -i -e '75i#define OF(x) x' unzip/{un,}zip.h || die
+	sed -i -e '22i#define OF(x) x' unzip/ioapi.h || die
+	epatch "${FILESDIR}"/${P}-build.patch
+	cd unix
+	eautoreconf
+	if use gtk; then
+		cd ../gtk
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+
+	egamesconf \
+		$(use_enable joystick gamepad) \
+		$(use_enable debug debugger) \
+		$(use_enable netplay) \
+		$(use_enable zlib gzip) \
+		$(use_enable zlib zip) \
+		$(use_enable png screenshot)
+
+	if use gtk; then
+		cd ../gtk
+		egamesconf \
+			--disable-dependency-tracking \
+			--datadir=/usr/share \
+			$(use_enable nls) \
+			$(use_with opengl) \
+			$(use_with joystick) \
+			$(use_with xv) \
+			$(use_with xrandr) \
+			$(use_with netplay) \
+			$(use_with zlib) \
+			$(use_with alsa) \
+			$(use_with oss) \
+			$(use_with pulseaudio) \
+			$(use_with portaudio) \
+			$(use_with png screenshot)
+	fi
+}
+
+src_compile() {
+	games_src_compile
+	if use gtk; then
+		emake -C ../gtk || die
+	fi
+}
+
+src_install() {
+	dogamesbin ${PN} || die
+
+	dohtml {.,..}/docs/*.html
+	dodoc ../docs/{snes9x.conf.default,{changes,control-inputs,controls,snapshots}.txt}
+
+	if use gtk; then
+		emake -C ../gtk DESTDIR="${D}" install || die
+		dodoc ../gtk/{AUTHORS,doc/README}
+	fi
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	use gtk && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}