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

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 202 insertions, 3 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/Manifest b/games-emulation/snes9x/Manifest
index 03bcdd5b35fb..bd6e682411d5 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,5 +1,8 @@
 AUX snes9x-1.52-build.patch 2487 RMD160 4cf491ec8940cdb05aca915d3192b6f6747f2f51 SHA1 c492e169d7e58afb28aa98e662075235dd4fe602 SHA256 a39253dfa8b4b68e6f1cad4e7ed8d872e78db16bb2c6aae1339bc7b9fd163380
+AUX snes9x-1.53-build.patch 2515 RMD160 75b6d399eedae2512dff82493fb6b9c0e5574a3a SHA1 e71399e67cbd71ed1fadf6f404951ba42112dd46 SHA256 fb4a34f90041dac78984d9e9548595073731bfd3a8becd865bffca7392c9805b
 DIST snes9x-1.52-src.tar.bz2 1720137 RMD160 ec7f85058e4571d89a65a89d3f09e2e40db0cbcc SHA1 fb3957b68fcede882518516094a73ec5bbed76cf SHA256 36e09b2da62b9210feb224cfd183047a151a71c1d5e5f92749dc28bd4b7ff1cb
+DIST snes9x-1.53-src.tar.bz2 1838746 RMD160 b3f7ba73caee5373951ec1e1decef1ab6c7207f2 SHA1 57be6480369f66b9aaaeb722789ce114f58ed1e2 SHA256 9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3
 EBUILD snes9x-1.52-r1.ebuild 3087 RMD160 998c707b1eceea65abb8eba70d5ad58fc9ba1f14 SHA1 9c7a74674e8250dabc9e5b13d7a6288c76bc4577 SHA256 d373c470d7e48bf469cc0297021ecf3dc13640e5dbf5e18dfca6ee0255f65ea9
-MISC ChangeLog 8582 RMD160 c06fbb95de5840c52e5418447e78c4a88815e4a7 SHA1 e7d546603ccccad75f1bfa0ed1b5f3bb52b98878 SHA256 75f452ef6636dcfa1d466ce7456859efebf0f9fb11a0bdc8cc221df648538264
+EBUILD snes9x-1.53.ebuild 2834 RMD160 9e520f38bcd6518246e7ab2cd33f296c3d1dc97c SHA1 936fa9f3bf9152f9585f43f82f3193a1f3f320e6 SHA256 2f37def5fdddc6557b9726fe1b510f6b08f1788ea3bb5308e5f970b9b9f4563a
+MISC ChangeLog 8799 RMD160 f8e540549f97cc60bc6b19084edae6297a81a24d SHA1 f3d21376dfbbd47bfd3adfd401da96d798e3df22 SHA256 a4b391dc82d362418cd781a29c4b8ae64b5215171f28c22fa283a7e93fb8d9b7
 MISC metadata.xml 331 RMD160 cd80a6e54eca753843a1684a77425b6a61666dbb SHA1 a6fc87763db736db6e686c7ef643fc89b7a1649d SHA256 c62e1f0a7ce6a58297953bdab512e9d241cd7609181b6524cb55ab7ea1a88196
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
+}