Version bump wrt #254468 by Wizzleby.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 166 insertions, 3 deletions

diff --git a/games-emulation/snes9x/ChangeLog b/games-emulation/snes9x/ChangeLog
index 5be01e0dcf59..81c145dc0349 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.37 2010/01/08 21:55:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.38 2010/03/14 17:15:13 ssuominen Exp $
+
+*snes9x-1.52 (14 Mar 2010)
+
+  14 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> +snes9x-1.52.ebuild,
+  +files/snes9x-1.52-build.patch:
+  Version bump wrt #254468 by Wizzleby.
 
   08 Jan 2010; Tupone Alfredo <tupone@gentoo.org>
   files/snes9x-1.51-config.patch:
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index b2ac218ee462..571989d6e206 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -10,9 +10,12 @@ AUX snes9x-1.51-config.patch 528 RMD160 2bb2f78a60444bafa86c690748c69ca8403ae084
 AUX snes9x-1.51-glibc2.10.patch 295 RMD160 489c655d5677ddcc6c6827c6a07c3a7effa308bd SHA1 e506de81a5b12879959e7a549ac90e752b475f43 SHA256 c2c3956dab03385c377c6ebb20aabc0efdc0bad65f635ef6b1f5099d600a2b69
 AUX snes9x-1.51-opengl.patch 3265 RMD160 372edbbdcad3091c7f3dbdc43bfa661da11df9ec SHA1 8ba87226b5e271768fd9e1f5d6106d7eef1df838 SHA256 3006fe29f027b8be2a8f0a9c8cd41392bfd1ae6999333edb0e4d1b5b9ada2a64
 AUX snes9x-1.51-x11.patch 4297 RMD160 40998bbd623779dd6160ebd98a542f7e1d3c97cb SHA1 464066c638d80168fb904544256150f66b6ec1df SHA256 edc568083e20ba99698f500f60bcb6f0ffe4c84dd772d6ec9aa0c47918ed8787
+AUX snes9x-1.52-build.patch 1219 RMD160 ac9af15b62c2ac454d1efcd4533314e4df55ec85 SHA1 c272379b4923d6448fa92fce1f218fc17343e72e SHA256 b61041e1b86d07922ecc2be6a4cb21b01e18024accc957b9d6d692948e0704bb
 DIST snes9x-1.43-src.tar.gz 1016251 RMD160 d2003f7afb208109405b41f4eec586b93518f9b2 SHA1 c6883c451aeb442030862ec19a8dca25ee02d82c SHA256 cb60baaeabc28b68f7dfc8fd54453f6268b66aae33ea64eb1788c19df09be6f1
 DIST snes9x-1.51-src.tar.bz2 1707256 RMD160 5813405b05f181224614f95e8ba3c309f79e1b36 SHA1 a0de23fb376463d27f4e8fc7f11424bd3c598585 SHA256 70c8f41fc7f1e000605127e0f4261e3eb52c72019b3cbf9bc8061b0b8ccdf687
+DIST snes9x-1.52-src.tar.bz2 1720137 RMD160 ec7f85058e4571d89a65a89d3f09e2e40db0cbcc SHA1 fb3957b68fcede882518516094a73ec5bbed76cf SHA256 36e09b2da62b9210feb224cfd183047a151a71c1d5e5f92749dc28bd4b7ff1cb
 EBUILD snes9x-1.43-r2.ebuild 2806 RMD160 52295918ca64f3132bb69a1a2bc84200a782d0e7 SHA1 b85911bc9b522c30f2f8f3df349f11a5dc409def SHA256 35600aef9bc85fc6597a47971abb1feb423f486de646712419888f0feddbfe88
 EBUILD snes9x-1.51.ebuild 2874 RMD160 a3e91080488f68ba69015b6e81b52c14fa4d2ea0 SHA1 4c04e0e51b21d650b3de9e1c6ae8e613adbe07ef SHA256 d17bbd231c6c671b54ba92ea569783a43693df7f06b567ed495d9550d3362ee1
-MISC ChangeLog 6802 RMD160 36c34bae75222b9e23f78373eb90466f733c10c7 SHA1 90b84458d0d75d1db3568ea22028827d2aa74b1b SHA256 adb93a4628ca50eec338a64a84a4183afebe542b476c7753e4fcdcc3cdbad8b1
-MISC metadata.xml 264 RMD160 ce2073cceaf823ec0243794e7774cd652f7ec925 SHA1 afc7d1160eaff0253192dc6592e1665eec1093e4 SHA256 0c52501f31b9f073402cbb17d00926c8e19a6638625c7d452279396b0297890b
+EBUILD snes9x-1.52.ebuild 2720 RMD160 520b6d9735cd84bdec690df330d3789c9bd66aad SHA1 0a902fe0ea81e1ddb1f64b0e49a4d1d477fd4705 SHA256 f05cd4fdad62558c7f1dc5325208ccc576b6225c4309eee78eefca726180bf6b
+MISC ChangeLog 6983 RMD160 1e8d28cf1b7e8385c1ba7607bbd20cc63a9eef50 SHA1 31d3aee3915344c3a63211cfa68c3cf382143f79 SHA256 25e75ea93b9cc0bd8014d49fb59e438dfcc6ffaf5c3d3850428ec4e31edffd65
+MISC metadata.xml 334 RMD160 4f4edcdcdd6a29a1c343e4bf8f54216f07ddfecc SHA1 d6e7ef8be60e7d6c2feecd2f2ea857e955e44b0b SHA256 de4cddcdc2f3619338049af9fa693339c5079664665fdb48b97fd6f51715dad4
diff --git a/games-emulation/snes9x/files/snes9x-1.52-build.patch b/games-emulation/snes9x/files/snes9x-1.52-build.patch
new file mode 100644
index 000000000000..8c3880f1af6b
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.52-build.patch
@@ -0,0 +1,44 @@
+--- unix/configure.ac
++++ unix/configure.ac
+@@ -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
+ 
+--- 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/metadata.xml b/games-emulation/snes9x/metadata.xml
index e2cb59ae5eec..a420386c0166 100644
--- a/games-emulation/snes9x/metadata.xml
+++ b/games-emulation/snes9x/metadata.xml
@@ -4,5 +4,6 @@
   <herd>games</herd>
   <use>
     <flag name="netplay">Enable playing ROMs over the network (not recommended)</flag>
+	<flag name="xrandr">Enable support for the X xrandr extension</flag>
   </use>
 </pkgmetadata>
diff --git a/games-emulation/snes9x/snes9x-1.52.ebuild b/games-emulation/snes9x/snes9x-1.52.ebuild
new file mode 100644
index 000000000000..2cc4c3d0ba20
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.52.ebuild
@@ -0,0 +1,109 @@
+# 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.ebuild,v 1.1 2010/03/14 17:15:13 ssuominen Exp $
+
+EAPI=3
+inherit autotools eutils flag-o-matic multilib 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 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="alsa debug gtk joystick multilib netplay nls opengl oss pulseaudio portaudio +xv +xrandr zlib"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	amd64? ( multilib? ( app-emulation/emul-linux-x86-xlibs )
+			gtk? ( >=app-emulation/emul-linux-x86-gtklibs-20100220-r2 ) )
+	gtk? ( >=x11-libs/gtk+-2.10:2
+		>=gnome-base/libglade-2.0
+		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}
+	x86? ( dev-lang/nasm )
+	x11-proto/xproto
+	gtk? ( dev-util/pkgconfig
+		xv? ( x11-proto/videoproto ) )
+	nls? ( dev-util/intltool )"
+
+S=${WORKDIR}/${P}-src/unix
+
+pkg_setup() {
+	use amd64 && use multilib && [[ -z ${NATIVE_AMD64_BUILD_PLZ} ]] && \
+			has_multilib_profile && ABI=x86
+	games_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	eautoreconf
+	if use gtk; then
+		cd ../gtk
+		sed -i -e '/PKG_CHECK_MODULES(\[LIBPNG/d' configure.ac || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+
+	egamesconf \
+		$(use_enable x86 zsnes-asm) \
+		$(use_enable joystick gamepad) \
+		$(use_enable debug debugger) \
+		$(use_enable netplay) \
+		$(use_enable zlib gzip) \
+		$(use_enable zlib zip) \
+		--disable-screenshot
+
+	if use gtk; then
+		cd ../gtk
+		egamesconf \
+			--datadir="${EPREFIX}/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 x86 assembler) \
+			$(use_with alsa) \
+			$(use_with oss) \
+			$(use_with pulseaudio) \
+			$(use_with portaudio) \
+			--without-png
+	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
+		cd ../gtk
+		emake DESTDIR="${D}" install || die
+		dodoc AUTHORS doc/README
+	fi
+
+	prepgamesdirs
+}