fix the screenshot configure arg with USE=gtk

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

4 files changed, 46 insertions, 19 deletions

diff --git a/games-emulation/snes9x/ChangeLog b/games-emulation/snes9x/ChangeLog
index 187fad807921..4eb78a0d4552 100644
--- a/games-emulation/snes9x/ChangeLog
+++ b/games-emulation/snes9x/ChangeLog
@@ -1,6 +1,10 @@
 # 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.49 2010/09/13 19:18:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.50 2010/11/10 22:44:27 mr_bones_ Exp $
+
+  10 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  snes9x-1.52-r1.ebuild, files/snes9x-1.52-build.patch:
+  fix the screenshot configure arg with USE=gtk
 
   13 Sep 2010; Michael Sterrett <mr_bones_@gentoo.org>
   snes9x-1.52-r1.ebuild:
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 177b0de00ab6..04749f981977 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,5 +1,5 @@
-AUX snes9x-1.52-build.patch 1219 RMD160 ac9af15b62c2ac454d1efcd4533314e4df55ec85 SHA1 c272379b4923d6448fa92fce1f218fc17343e72e SHA256 b61041e1b86d07922ecc2be6a4cb21b01e18024accc957b9d6d692948e0704bb
+AUX snes9x-1.52-build.patch 2487 RMD160 4cf491ec8940cdb05aca915d3192b6f6747f2f51 SHA1 c492e169d7e58afb28aa98e662075235dd4fe602 SHA256 a39253dfa8b4b68e6f1cad4e7ed8d872e78db16bb2c6aae1339bc7b9fd163380
 DIST snes9x-1.52-src.tar.bz2 1720137 RMD160 ec7f85058e4571d89a65a89d3f09e2e40db0cbcc SHA1 fb3957b68fcede882518516094a73ec5bbed76cf SHA256 36e09b2da62b9210feb224cfd183047a151a71c1d5e5f92749dc28bd4b7ff1cb
-EBUILD snes9x-1.52-r1.ebuild 3063 RMD160 f864b6830b1967b5e650ad4f0481346d0c1a2467 SHA1 da0a595cd0aca7d1e90e5ab2e6e2caec705f775b SHA256 28725676d191742be38bb088913d443849ef72d243f978d6a78989b7d600b481
-MISC ChangeLog 8264 RMD160 4d4eeebce333ca1fc27ddf3a8881bd879e64db79 SHA1 664acd10184324fa325b9b1e4ce2ac3119677339 SHA256 5cde78ec9d8d74b914f3325a1684c0d255d11370022ef7d8c2382044837086ed
+EBUILD snes9x-1.52-r1.ebuild 3034 RMD160 35be33135db7594b31f1f4f395cd4c07381f4e12 SHA1 479f8d99a1c545cf8451ea693b8141ce19ab7c25 SHA256 6ef5257957f0ff12746f59a863e2159af45f6234e1d956d3ff19f621bb127326
+MISC ChangeLog 8424 RMD160 b37e27e6755ddb219aac30aaae792da4b3912388 SHA1 05b14120a6b9b01c48bea8d8aab38542a8216844 SHA256 50eff9b11543dd85329b1e439bf7fa9824683e87c136aea6a406e48edd47a9de
 MISC metadata.xml 331 RMD160 cd80a6e54eca753843a1684a77425b6a61666dbb SHA1 a6fc87763db736db6e686c7ef643fc89b7a1649d SHA256 c62e1f0a7ce6a58297953bdab512e9d241cd7609181b6524cb55ab7ea1a88196
diff --git a/games-emulation/snes9x/files/snes9x-1.52-build.patch b/games-emulation/snes9x/files/snes9x-1.52-build.patch
index 8c3880f1af6b..ae6794b7318d 100644
--- a/games-emulation/snes9x/files/snes9x-1.52-build.patch
+++ b/games-emulation/snes9x/files/snes9x-1.52-build.patch
@@ -1,5 +1,38 @@
---- unix/configure.ac
-+++ unix/configure.ac
+diff -ru snes9x-1.52-src.orig/gtk/configure.ac snes9x-1.52-src/gtk/configure.ac
+--- snes9x-1.52-src.orig/gtk/configure.ac	2010-01-10 12:27:44.000000000 -0500
++++ snes9x-1.52-src/gtk/configure.ac	2010-11-10 17:33:21.003119007 -0500
+@@ -133,7 +133,7 @@
+   [],
+   [with_zlib=yes])
+ 
+-AC_ARG_WITH(png,
++AC_ARG_WITH(screenshot,
+   [AS_HELP_STRING([--with(out)-screenshot],
+     [Screenshot support through libpng if available (default: with)])],
+   [],
+@@ -280,7 +280,6 @@
+         echo "--> Disabling Xrandr support."
+     ])
+ fi
+-PKG_CHECK_MODULES([LIBPNG],libpng)
+ 
+ CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GLADE_CFLAGS $LIBXML_CFLAGS $PORTAUDIO_CFLAGS $LIBPNG_CFLAGS $SDL_CFLAGS $XV_CFLAGS $XRANDR_CFLAGS $ALSA_CFLAGS $PULSEAUDIO_CFLAGS"
+ LIBS="$LIBS $GTK_LIBS $GLIB_LIBS $GLADE_LIBS $LIBXML_LIBS $PORTAUDIO_LIBS $LIBPNG_LIBS $SDL_LIBS $XV_LIBS $XRANDR_LIBS $ALSA_LIBS $PULSEAUDIO_LIBS"
+diff -ru snes9x-1.52-src.orig/unix/Makefile.in snes9x-1.52-src/unix/Makefile.in
+--- snes9x-1.52-src.orig/unix/Makefile.in	2010-01-04 04:13:21.000000000 -0500
++++ snes9x-1.52-src/unix/Makefile.in	2010-11-10 17:32:08.828962612 -0500
+@@ -65,7 +65,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.52-src.orig/unix/configure.ac snes9x-1.52-src/unix/configure.ac
+--- snes9x-1.52-src.orig/unix/configure.ac	2009-02-26 12:01:16.000000000 -0500
++++ snes9x-1.52-src/unix/configure.ac	2010-11-10 17:32:08.828962612 -0500
 @@ -56,20 +56,6 @@
  # *** Execution begins here ***
  # *****************************
@@ -31,14 +64,3 @@
  	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
  fi
  
---- unix/Makefile.in
-+++ unix/Makefile.in
-@@ -65,7 +65,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 --git a/games-emulation/snes9x/snes9x-1.52-r1.ebuild b/games-emulation/snes9x/snes9x-1.52-r1.ebuild
index ff691c85f92d..1db76638564c 100644
--- a/games-emulation/snes9x/snes9x-1.52-r1.ebuild
+++ b/games-emulation/snes9x/snes9x-1.52-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.52-r1.ebuild,v 1.8 2010/09/13 19:18:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/snes9x-1.52-r1.ebuild,v 1.9 2010/11/10 22:44:27 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic multilib gnome2-utils games
@@ -48,11 +48,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	cd "${WORKDIR}"/${P}-src
 	epatch "${FILESDIR}"/${P}-build.patch
+	cd unix
 	eautoreconf
 	if use gtk; then
 		cd ../gtk
-		sed -i -e '/PKG_CHECK_MODULES(\[LIBPNG/d' configure.ac || die
 		eautoreconf
 	fi
 }