gentoo resync : 12.08.2018

5 files changed, 3 insertions, 246 deletions

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 49c0ec07feee..7b99bbf0fe2c 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,9 +1,6 @@
-AUX libsdl2-2.0.4-static-libs.patch 4899 BLAKE2B e294903f7a675f01fa884c8a98897b6a2c6e836d7baacb0f121f2aa48f2d0408c549f72e6f7886cba2db255486d4f29ed01b608cde133686d3c4809fd571edd9 SHA512 a71a6807251a8348f14a9dc1c5990d59cc63e067ee611a43b850950d8afde737830cf0bb0b0fd1fe6dc37e16490020fa21fbb9c70285333ee44ae2eb292f1a5a
 AUX libsdl2-2.0.6-static-libs.patch 2373 BLAKE2B 4632bf1c0d841d148acfbdf4c0fc25eb0eb3436478c1dddb4165c14d543793e2c378401f7b371976ffea38d6c3ceba4c4e4bfe415c0cfc4d07e62f2ec18dfc3f SHA512 c03037185a21ac3e2a664ab85847a0af95a44f579c2959fbc74d55ea8e59f7ed04775dcaea1fc2e284fca7ce6debca15a4062ba0e9bb0086f3dec49ba8044fb0
 AUX libsdl2-2.0.8-rework-variables.patch 2061 BLAKE2B 8a64934ad09295442f6f63ffab50779e1975903449d3f47d70b42a5a82102ff0198ea0cd2b4766beb3844dee9f1d1539eb29a8abad7c12a10b6fa0789b1c80a6 SHA512 6d3f11a87d0a5eebbb7cd6e145075329f774f02ddfda227e211f0fdc5ac3d7c2d132a3cdc4b48baca9871ecd01b9a9e0c5b82ed727579e1b7eeb1d9fde48ae81
-DIST SDL2-2.0.4.tar.gz 4136230 BLAKE2B 374ba4c86f10d07f592dbeb6340b38e1360561fed4fa40d75c763adbfc3dd1605eed6841243ce14597814da5b0a86d7c6d4351198987919a3a7bc4db943f32b7 SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
-EBUILD libsdl2-2.0.4.ebuild 4642 BLAKE2B 4076b8040962f3640151a53798ed20baba3bb07e8a607191f76a0cc7fc1015fb8fca6b11184403d798819dae2b3b963d5aef21732b5092c8e4497bc2fa4d1f50 SHA512 a83ffe2f864f559c359b9315f50b82735ccbf246719b5598482a85afd3000ee52a261c17076dbde86078f31a8f7f46a22ac8d2891635d287f71e83715c8a4452
-EBUILD libsdl2-2.0.8-r1.ebuild 4743 BLAKE2B 7aa1841ecf4f3815c3435eae649e365355ce3a4e50d1bb08dedd4d1af2a588451f6f8e65f24e384afbbdbdeb65213df6cd68c3498af1f477c75fe946af9419ce SHA512 b95a7f8e0a3c716e7c925f60f8463d04afa2cef0d96bb18fee694ee8ca4984ff14143e55c1bba2f165243931211eb3a1573a1d3d396c8be7f50741d0729b5668
+EBUILD libsdl2-2.0.8-r1.ebuild 4742 BLAKE2B 333677b4ed0a69eb34ba2a6d2da4140e23009d9780bfa297e0c85f74da31fa68ae964b68423232bfad67d34c8dffee86ea5de2db88cf3135fd2631d029aa56aa SHA512 99400ab240ec25f85f5b0a549a0d56b6b96d600ad9705e68af99ddb717e542a140eec7211a5435b5a1169772efa169581f32a8f6b1c758cad0a8aa70c7268c24
 EBUILD libsdl2-2.0.8-r2.ebuild 5173 BLAKE2B 03b84a9b6888a3fe83e3f689dc8f554eb612f64f1f258c15dfc7f8349ad08d38a4c4cf20a5a3a8aa3592225dfd6690db4724af32cf4d27943a97b336bf05a07d SHA512 7d7c1f59f492c7a856e947284a239d3b3a2d22a0259d80422af01fb77a0a48ddf49221faf965c46c1af9588da9bd4e08d7f24f507c816b228d729bf673bc73ee
-MISC metadata.xml 1665 BLAKE2B 7f469ffb0096991ffcd95d5cac92ded15aa0b6d0d60f0d38bcaf966336a8c782b51a4fd61e2984b97bf65896438517868836b251619647f330004c4795acd008 SHA512 dc0fae98711a1a79ccd76371e6747c8cf722dfb84d75d1d414bb90980886d649c53f9bdbee96e627854ace0fc6b30160688dc906aa74cc943e71172737ae659c
+MISC metadata.xml 1602 BLAKE2B 600168481346aa4a72024f35a35640f8c415aa38f6c337a9995cd61c1f0c438fdd533dcf50b2506c7b3e638f9144295037df69bdcdcb3fcdd0821358caef2984 SHA512 c16d7e97a45a8897c806ef6087242710c95a0602f858947bf68c240075fbdc69ea1ae4c46eed567341f493868b94e1b63160a8b2cb1c1d44da232273c9f46001
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch
deleted file mode 100644
index bee2fd580aaa..000000000000
--- a/media-libs/libsdl2/files/libsdl2-2.0.4-static-libs.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- SDL2-2.0.4.orig/configure.in
-+++ SDL2-2.0.4/configure.in
-@@ -3114,7 +3114,7 @@
-         if test -f /lib/w32api/libuuid.a; then
-             LIBUUID=/lib/w32api/libuuid.a
-         else
--            LIBUUID=-luuid
-+            LIBUUID=-Wl,-luuid
-         fi
-         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion $LIBUUID -static-libgcc"
-         # The Windows platform requires special setup
-@@ -3464,23 +3464,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\\\\
--	\\$(WINDRES) \\$< \\$@,g"`
-+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
-+	\\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,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\\\\
- 	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --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\\\\
- 	\\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
- 
- # Set runtime shared library paths as needed
---- SDL2-2.0.4.orig/Makefile.in
-+++ SDL2-2.0.4/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 = *.txt acinclude Android.mk autogen.sh android-project build-scripts cmake cmake_uninstall.cmake.in configure configure.in debian docs include Makefile.* sdl2-config.cmake.in sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test VisualC.html VisualC VisualC-WinRT Xcode Xcode-iOS
-@@ -138,15 +138,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)
--	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
--	$(RUN_CMD_AR)$(AR) cru $@ $(SDLMAIN_OBJECTS)
--	$(RUN_CMD_RANLIB)$(RANLIB) $@
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
--	$(RUN_CMD_AR)$(AR) cru $@ $(SDLTEST_OBJECTS)
--	$(RUN_CMD_RANLIB)$(RANLIB) $@
-+	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
- 
- install: all install-bin install-hdrs install-lib install-data
- install-bin:
-@@ -167,10 +165,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
diff --git a/media-libs/libsdl2/libsdl2-2.0.4.ebuild b/media-libs/libsdl2/libsdl2-2.0.4.ebuild
deleted file mode 100644
index e3a0c12691c3..000000000000
--- a/media-libs/libsdl2/libsdl2-2.0.4.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: convert FusionSound #484250
-
-EAPI=5
-inherit autotools flag-o-matic toolchain-funcs eutils multilib-minimal
-
-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="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86"
-
-IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
-REQUIRED_USE="
-	alsa? ( sound )
-	fusionsound? ( sound )
-	gles? ( video )
-	nas? ( sound )
-	opengl? ( video )
-	pulseaudio? ( sound )
-	wayland? ( gles )
-	xinerama? ( X )
-	xscreensaver? ( X )"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
-	gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
-	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
-		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-	epatch "${FILESDIR}"/${P}-static-libs.patch
-	sed -i -e 's/configure.in/configure.ac/' Makefile.in || die
-	mv configure.{in,ac} || die
-	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
-}
-
-multilib_src_configure() {
-	use custom-cflags || strip-flags
-
-	# sorted by `./configure --help`
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		--enable-atomic \
-		$(use_enable sound audio) \
-		$(use_enable video) \
-		--enable-render \
-		--enable-events \
-		$(use_enable joystick) \
-		$(use_enable haptic) \
-		--enable-power \
-		--enable-filesystem \
-		$(use_enable threads) \
-		--enable-timers \
-		--enable-file \
-		--disable-loadso \
-		--enable-cpuinfo \
-		--enable-assembly \
-		$(use_enable cpu_flags_x86_sse ssemath) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable cpu_flags_x86_3dnow 3dnow) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 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 sound diskaudio) \
-		$(use_enable sound dummyaudio) \
-		$(use_enable wayland video-wayland) \
-		--disable-wayland-shared \
-		--disable-video-mir \
-		$(use_enable X video-x11) \
-		--disable-x11-shared \
-		$(use_enable X video-x11-xcursor) \
-		$(use_enable X video-x11-xdbe) \
-		$(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 \
-		--disable-video-directfb \
-		$(multilib_native_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) \
-		--disable-ibus \
-		$(use_enable tslib input-tslib) \
-		--disable-directx \
-		--disable-rpath \
-		--disable-render-d3d \
-		$(use_with X x)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
-}
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
index d52a80e3217f..08a462b416b2 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index f10ebbd6297d..66484c6e18e3 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/metadata.xml
@@ -24,7 +24,6 @@
 		Perl, PHP, Pike, Python, and Ruby.
 	</longdescription>
 	<use>
-		<flag name="fusionsound">use FusionSound audio driver</flag>
 		<flag name="gles">include OpenGL ES support</flag>
 		<flag name="haptic">Enable the haptic (force feedback) subsystem</flag>
 		<flag name="joystick">Control joystick support (disable at your own risk)</flag>