old

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 5 insertions, 195 deletions

diff --git a/games-emulation/snes9x/ChangeLog b/games-emulation/snes9x/ChangeLog
index d36321372bf4..f1fb875161c7 100644
--- a/games-emulation/snes9x/ChangeLog
+++ b/games-emulation/snes9x/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/snes9x
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.60 2013/01/24 19:24:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/snes9x/ChangeLog,v 1.61 2013/01/24 19:29:48 mr_bones_ Exp $
+
+  24 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/snes9x-1.52-build.patch, -snes9x-1.52-r1.ebuild:
+  old
 
   24 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> snes9x-1.53.ebuild:
   update LICENSE
diff --git a/games-emulation/snes9x/files/snes9x-1.52-build.patch b/games-emulation/snes9x/files/snes9x-1.52-build.patch
deleted file mode 100644
index ae6794b7318d..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.52-build.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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 ***
- # *****************************
- 
--# 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.52-r1.ebuild b/games-emulation/snes9x/snes9x-1.52-r1.ebuild
deleted file mode 100644
index b5f1da332f22..000000000000
--- a/games-emulation/snes9x/snes9x-1.52-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2012 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.11 2012/05/04 04:38:40 jdhore 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 )
-			multilib? ( >=app-emulation/emul-linux-x86-xlibs-20100611
-				gtk? ( >=app-emulation/emul-linux-x86-gtklibs-20100611
-					alsa? ( app-emulation/emul-linux-x86-soundlibs )
-					joystick? ( >=app-emulation/emul-linux-x86-sdl-20100611 ) )
-		) )
-	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? ( virtual/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() {
-	cd "${WORKDIR}"/${P}-src
-	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 x86 zsnes-asm) \
-		$(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 \
-			--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 x86 assembler) \
-			$(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
-		cd ../gtk
-		emake DESTDIR="${D}" install || die
-		dodoc 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
-}