version bump (bug #489326)

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

5 files changed, 242 insertions, 17 deletions

diff --git a/media-libs/libsdl2/ChangeLog b/media-libs/libsdl2/ChangeLog
index 61130c2bba5d..c474333c961c 100644
--- a/media-libs/libsdl2/ChangeLog
+++ b/media-libs/libsdl2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libsdl2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.4 2013/09/05 18:46:48 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/ChangeLog,v 1.5 2013/10/25 16:03:19 mr_bones_ Exp $
+
+*libsdl2-2.0.1 (25 Oct 2013)
+
+  25 Oct 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/libsdl2-2.0.1-static-libs.patch, +libsdl2-2.0.1.ebuild,
+  files/libsdl2-2.0.0-static-libs.patch, files/libsdl2-2.0.0-threads.patch:
+  version bump (bug #489326)
 
   05 Sep 2013; Julian Ospald <hasufell@gentoo.org> libsdl2-2.0.0.ebuild,
   +files/libsdl2-2.0.0-threads.patch:
@@ -18,4 +25,3 @@
   28 Aug 2013; Julian Ospald <hasufell@gentoo.org> +libsdl2-2.0.0.ebuild,
   +files/libsdl2-2.0.0-static-libs.patch, +metadata.xml:
   initial import wrt #480826
-
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch
index ed3f0d20c547..6d083e050287 100644
--- a/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch
+++ b/media-libs/libsdl2/files/libsdl2-2.0.0-static-libs.patch
@@ -1,6 +1,5 @@
-diff -r c1563f514b5b Makefile.in
---- a/Makefile.in	Thu Apr 04 11:35:22 2013 -0400
-+++ b/Makefile.in	Wed Apr 17 14:17:09 2013 -0400
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -33,10 +33,10 @@
  OBJECTS = @OBJECTS@
  VERSION_OBJECTS = @VERSION_OBJECTS@
@@ -46,9 +45,8 @@ diff -r c1563f514b5b Makefile.in
  install-data:
  	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
  	$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
-diff -r c1563f514b5b configure.in
---- a/configure.in	Thu Apr 04 11:35:22 2013 -0400
-+++ b/configure.in	Wed Apr 17 14:17:09 2013 -0400
+--- a/configure.in
++++ b/configure.in
 @@ -2659,23 +2659,23 @@
  
  VERSION_OBJECTS=`echo $VERSION_SOURCES`
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch b/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch
index 48c3dadda475..434313fdf0f6 100644
--- a/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch
+++ b/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch
@@ -10,9 +10,8 @@ stepik-777
 
 Thread local storage is used to store current window and current opengl context. OpenGL worked before this changeset: 7596 (45e5c263c096)
 
-diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_systhread.h
---- a/src/thread/SDL_systhread.h	Thu Sep 05 07:02:27 2013 -0700
-+++ b/src/thread/SDL_systhread.h	Thu Sep 05 07:15:26 2013 -0700
+--- a/src/thread/SDL_systhread.h
++++ b/src/thread/SDL_systhread.h
 @@ -26,6 +26,7 @@
  #define _SDL_systhread_h
  
@@ -21,9 +20,8 @@ diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_systhread.h
  
  /* This function creates a thread, passing args to SDL_RunThread(),
     saves a system-dependent thread id in thread->id, and returns 0
-diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_thread.c
---- a/src/thread/SDL_thread.c	Thu Sep 05 07:02:27 2013 -0700
-+++ b/src/thread/SDL_thread.c	Thu Sep 05 07:15:26 2013 -0700
+--- a/src/thread/SDL_thread.c
++++ b/src/thread/SDL_thread.c
 @@ -125,6 +125,7 @@
      SDL_TLSEntry *entry;
      SDL_TLSData *storage = NULL;
@@ -50,9 +48,8 @@ diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_thread.c
  
      return storage;
  }
-diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_thread_c.h
---- a/src/thread/SDL_thread_c.h	Thu Sep 05 07:02:27 2013 -0700
-+++ b/src/thread/SDL_thread_c.h	Thu Sep 05 07:15:26 2013 -0700
+--- a/src/thread/SDL_thread_c.h
++++ b/src/thread/SDL_thread_c.h
 @@ -23,6 +23,8 @@
  #ifndef _SDL_thread_c_h
  #define _SDL_thread_c_h
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.1-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.1-static-libs.patch
new file mode 100644
index 000000000000..6d083e050287
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.1-static-libs.patch
@@ -0,0 +1,79 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -33,10 +33,10 @@
+ OBJECTS = @OBJECTS@
+ VERSION_OBJECTS = @VERSION_OBJECTS@
+ 
+-SDLMAIN_TARGET = libSDL2main.a
++SDLMAIN_TARGET = libSDL2main.la
+ SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
+ 
+-SDLTEST_TARGET = libSDL2_test.a
++SDLTEST_TARGET = libSDL2_test.la
+ SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
+ 
+ SRC_DIST = acinclude Android.mk autogen.sh BUGS build-scripts configure configure.in COPYING CREDITS debian include INSTALL Makefile.minimal Makefile.in README* sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test TODO VisualC.html VisualC WhatsNew Xcode Xcode-iOS
+@@ -122,15 +122,13 @@
+ .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
+ 
+ $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
+-	$(AR) cru $@ $(SDLMAIN_OBJECTS)
+-	$(RANLIB) $@
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
+-	$(AR) cru $@ $(SDLTEST_OBJECTS)
+-	$(RANLIB) $@
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ install: all install-bin install-hdrs install-lib install-data
+ install-bin:
+@@ -151,10 +149,8 @@
+ install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
+ 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
+-	$(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
+-	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
+-	$(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
+-	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
++	$(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
++	$(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
+ install-data:
+ 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
+ 	$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
+--- a/configure.in
++++ b/configure.in
+@@ -2659,23 +2659,23 @@
+ 
+ VERSION_OBJECTS=`echo $VERSION_SOURCES`
+ VERSION_DEPENDS=`echo $VERSION_SOURCES`
+-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
++VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
+ VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
+-\\$(objects)/\\2.o: \\1/\\2.rc\\\\
++\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
+ 	\\$(WINDRES) \\$< \\$@,g"`
+ 
+ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
+ SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
+-SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
++SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
+ SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
+-\\$(objects)/\\2.o: \\1/\\2.c\\\\
++\\$(objects)/\\2.lo: \\1/\\2.c\\\\
+ 	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
+ 
+ SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
+ SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
+-SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
++SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
+ SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
+-\\$(objects)/\\2.o: \\1/\\2.c\\\\
++\\$(objects)/\\2.lo: \\1/\\2.c\\\\
+ 	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
+ 
+ # Set runtime shared library paths as needed
diff --git a/media-libs/libsdl2/libsdl2-2.0.1.ebuild b/media-libs/libsdl2/libsdl2-2.0.1.ebuild
new file mode 100644
index 000000000000..11b9e3e8234f
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.0.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.1.ebuild,v 1.1 2013/10/25 16:03:19 mr_bones_ Exp $
+
+EAPI=5
+inherit autotools flag-o-matic toolchain-funcs eutils
+
+MY_P=SDL2-${PV}
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org"
+SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="3dnow alsa altivec +audio custom-cflags dbus directfb fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
+REQUIRED_USE="
+	alsa? ( audio )
+	fusionsound? ( audio )
+	gles? ( video )
+	nas? ( audio )
+	opengl? ( video )
+	pulseaudio? ( audio )
+	xinerama? ( X )
+	xscreensaver? ( X )"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	directfb? ( >=dev-libs/DirectFB-1.0.0 )
+	fusionsound? ( >=media-libs/FusionSound-1.1.1 )
+	gles? ( media-libs/mesa[gles2] )
+	nas? ( media-libs/nas )
+	opengl? ( virtual/opengl virtual/glu )
+	pulseaudio? ( media-sound/pulseaudio )
+	tslib? ( x11-libs/tslib )
+	udev? ( virtual/udev )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXt
+		x11-libs/libXxf86vm
+		xinerama? ( x11-libs/libXinerama )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+	)"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
+	epatch "${FILESDIR}"/${P}-static-libs.patch
+	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+
+	local directfbconf="--disable-video-directfb"
+	if use directfb ; then
+		# since DirectFB can link against SDL and trigger a
+		# dependency loop, only link against DirectFB if it
+		# isn't broken #61592
+		echo 'int main(){}' > directfb-test.c
+		$(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
+			&& directfbconf="--enable-video-directfb" \
+			|| ewarn "Disabling DirectFB since libdirectfb.so is broken"
+	fi
+
+	# sorted by `./configure --help`
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable audio) \
+		$(use_enable video) \
+		--enable-render \
+		--enable-events \
+		$(use_enable joystick) \
+		$(use_enable haptic) \
+		--enable-power \
+		$(use_enable threads) \
+		--enable-timers \
+		--enable-file \
+		--disable-loadso \
+		--enable-cpuinfo \
+		--enable-atomic \
+		--enable-assembly \
+		$(use_enable sse ssemath) \
+		$(use_enable mmx) \
+		$(use_enable 3dnow) \
+		$(use_enable sse) \
+		$(use_enable sse2) \
+		$(use_enable altivec) \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		--disable-alsa-shared \
+		--disable-esd \
+		$(use_enable pulseaudio) \
+		--disable-pulseaudio-shared \
+		--disable-arts \
+		$(use_enable nas) \
+		--disable-nas-shared \
+		--disable-sndio \
+		--disable-sndio-shared \
+		$(use_enable audio diskaudio) \
+		$(use_enable audio dummyaudio) \
+		$(use_enable X video-x11) \
+		--disable-x11-shared \
+		$(use_enable X video-x11-xcursor) \
+		$(use_enable xinerama video-x11-xinerama) \
+		$(use_enable X video-x11-xinput) \
+		$(use_enable X video-x11-xrandr) \
+		$(use_enable xscreensaver video-x11-scrnsaver) \
+		$(use_enable X video-x11-xshape) \
+		$(use_enable X video-x11-vm) \
+		--disable-video-cocoa \
+		${directfbconf} \
+		--disable-directfb-shared \
+		$(use_enable fusionsound) \
+		--disable-fusionsound-shared \
+		$(use_enable video video-dummy) \
+		$(use_enable opengl video-opengl) \
+		$(use_enable gles video-opengles) \
+		$(use_enable udev libudev) \
+		$(use_enable dbus) \
+		$(use_enable tslib input-tslib) \
+		--disable-directx \
+		--disable-rpath \
+		--disable-render-d3d \
+		$(use_with X x)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use static-libs || prune_libtool_files
+	dodoc {BUGS,CREDITS,README,README-SDL,README-hg,TODO,WhatsNew}.txt
+}