gentoo resync : 11.10.2017

3 files changed, 217 insertions, 0 deletions

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index faf44ab47424..4df29b61c081 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,11 +1,14 @@
 AUX libsdl2-2.0.4-static-libs.patch 4899 SHA256 e9ee478c8f2f70f0849038d448a29aaf9c13079e8a6ca663c6f186fc38ea0c44 SHA512 a71a6807251a8348f14a9dc1c5990d59cc63e067ee611a43b850950d8afde737830cf0bb0b0fd1fe6dc37e16490020fa21fbb9c70285333ee44ae2eb292f1a5a WHIRLPOOL 59b032da6ab86a75b23b8da2418de93a714a18499bd9a3cdbac10b8daf66499bdc1b746c78dcc463add42c334b5fe45eb9c725a497d0360c1f2d110e6f9acd98
 AUX libsdl2-2.0.5-ds3_ds4.patch 10482 SHA256 66a1702baaffa6e565edb72a1be670facbf865ffcc1d3ccd9a0a584354a0a43a SHA512 01e8f09f48b464a7f60d87ea47418b51f26f28b4463f2d55e9b2e9374f6824ac1981e98b599d244c0900409a93f93d4a4f363b51c0f8e1a84e4f04ffb883ca27 WHIRLPOOL 78fc07da0813298fddddadc40d9e83787c7881acefbcb53d7110fc4d6c82c411dc7e943a58a0a576823ed3f64686b5cb5168e08246b7b9702b5ce13d8e647627
 AUX libsdl2-2.0.5-static-libs.patch 4686 SHA256 6bf51c76aa0bd65d9036a415f5edcc17a2a04906538c4a7dce359818ebaf68c0 SHA512 98f02ace8419e25f5feb737fdb39dddf55b8db6188cd517bb720d9d02537ddcd4cc6a0c32efd7ec699a694dd719366866fd9eb5174775749802ee75dd2e944e6 WHIRLPOOL e0a884675211d3761ade50085bead66eec8d4b2205f3d4819da19b358c0f506c5b4bea401df649925709bda85f94a9fdca339d8c846da658f7904284ccb7f26e
+AUX libsdl2-2.0.6-static-libs.patch 2373 SHA256 8baa14187f600e8de74a1d128714bcb931f0cd2b733a23c78e6f50dfd55c4e3a SHA512 c03037185a21ac3e2a664ab85847a0af95a44f579c2959fbc74d55ea8e59f7ed04775dcaea1fc2e284fca7ce6debca15a4062ba0e9bb0086f3dec49ba8044fb0 WHIRLPOOL 58a31dd84f0e420c355b866b6c97890742cbbe63c12f888c5a79933d19d3a94ff1fa55cb7e68710c83f707d34db49f75f85bfb3af77f1e9e85931d09638ff33a
 DIST SDL2-2.0.4.tar.gz 4136230 SHA256 da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6 WHIRLPOOL 2203061d32d51552e5bcfaa9752de5cb3173c0c733698894de177f9a0c1bad73706633e2d232f9b893e4c3736a93aff00ae94eb044b19a05a1cdd7a4c030b574
 DIST SDL2-2.0.5.tar.gz 4209352 SHA256 442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785 SHA512 6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750 WHIRLPOOL 77aff6af67c29aab175f812be0aebbb65a757bd942de872b8330cb7cfabcd4abe0abd0c21b56bd409fb623b97c71981be5807e47dc03bf773aac85361582b796
+DIST SDL2-2.0.6.tar.gz 4420311 SHA256 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df SHA512 ad4dad5663834ee0ffbdca1b531d753449b260c9256df2c48da7261aacd9795d91eef1286525cf914f6b92ba5985de7798f041557574b5d978b8224f10041830 WHIRLPOOL ad39ec811ac6f305a58352e1f332e9c29a34587c0eb2c9f163e76f93565418bd910210aea8113f53ca46bc745975ed8cc7b228f517af0a99d782fef44c4e0783
 EBUILD libsdl2-2.0.4.ebuild 4755 SHA256 1b95e513c3f963ff37b9e4ffe788561a9a7c37dbe2e5b4a92cfd81808cbfa0f5 SHA512 a3ee75d9916d1000282f30a7e7a6587ca5b523d08d77a3a0efc220e64ee552df462f1fd9d8f1128dd6b67e799e3046101dc1c3dc0aa30f90a12f0e58f2413210 WHIRLPOOL 728d2749a7aabc6abd66cd513c823d05ff2b875953ba0f0a5b75ecb52ad8b20f6d2b7d2741f7ad06787fb70f31381757cf6787ae363fbf5f4d6bed65fc3e2923
 EBUILD libsdl2-2.0.5-r1.ebuild 4833 SHA256 bb1f34d9cb5aa7dd1e1f19db22e6aded0869d6af5bd929ece2f94791ed600d8d SHA512 9cbb0dc1fdb10c1d2f4c88615874c9c712dc864f8e65629bd0943aba3131dbd9f401a4a64e7b43a6ac393f8c69239e85ee0135ee886b47569dde4f20c4c098f5 WHIRLPOOL 8d44901b1aca11b1ed4aa70eb2bc9c617b429a362bf732e793dce6f0809fc6b11ab6ecfa11071c7aa1fb808018964bd1a7c23bc905de409c8a3d5957ad36794e
 EBUILD libsdl2-2.0.5.ebuild 4791 SHA256 c3c15eb2967f2a35f0fed5fbfe12cbeb4368be3d56752eb22eb72da0bd4e1a28 SHA512 a7ee500df710579bd4be766935984871a0311307b78f35d42cb7459c25d298fe66b00283d044e8ab7353722b30ab5f52327840e87cc08d9ff6fa23e4b4f84e66 WHIRLPOOL 829bb0a737d7fba58c8253455a54914e93e0eca6b7e1dab9f5288e674c45e78a1f5c585d97341fd815ee3205cfdef8d8d9d624f0367503cd6e6fa8532e3927d0
+EBUILD libsdl2-2.0.6.ebuild 4871 SHA256 02adfe1db546a81708f28c02ceeda69769ef4b7d48b695f7470871bc2bbc0b7d SHA512 4ef9025d47d7313788d344ae3addd5256e66d17acf42b5f95557a603077c57e3c81b2932cd1198f59dd5108de81c66757b12d36878f08a7a61d50a9323644ae3 WHIRLPOOL 55d9743974e7a36ed81a7ce3d72bf8662e25ffb8788504250813dab9b40e42196c760df96f7d33ab40fbb14bbc1bb501423c87027291dec37cd74f10dd6d53aa
 MISC ChangeLog 5036 SHA256 d1346c5a7e7ba020de8f72d1f638c8fec4418d962cf9188b9518af6b93b0dc2d SHA512 d2a1dc0decdbd5b0b5754ee4fd14667e41d3e01927b8bbc1cd4bdb4b7499dfd326cdafbebfc80ba9daf8ba4a44a388ccc8d636b17dcfdb949122a7b0265d0871 WHIRLPOOL 03843cb5a80f4bc3f9908355f6c8414278bd69da91a5dc4ce4435c8c25c71412f06278e937d193e9735e762f8dad230e7e626ff71627f3de50fa12475ffa8561
 MISC ChangeLog-2015 5311 SHA256 e543afa31a118561233bf9060d1719933f81ca15415e4798bfb0c4bd8711119e SHA512 09400d6937e900025ffdf6b3d39ef2202b7a9a83df98fed2354e4fe85bcbb1d0f966e608088f1c372bba9559c0ece17405ee0d5115502e84f11642d7789d7c02 WHIRLPOOL c91ea0b26d40e85fd2bc8404d3f6b94cfd670d3e75915482111420012a18ce355cbffb18382cbd81aa5e337227f60399c522aa51dc9905cc591319900a27b96d
 MISC metadata.xml 1626 SHA256 437d69fbda00c8837a4fb18ecfb6ecb1615004434844241aa15c57e7a57a8947 SHA512 bca03557793cab7fe23ff7073add8bc112f4046326dae99cda4079b3adccd56b9179c871b04e97174c178d90b1b82b3f6ff5f42f53a705d4a22c9732e57787de WHIRLPOOL 6d2aea6011e9953b9b1c0e394d0ee54b52173c3c51e12971146d285077e6f199a322e1933387039adfa239456a412ff7274daa8e26260c9943565a029f1d22a1
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch
new file mode 100644
index 000000000000..a1427a075b4c
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch
@@ -0,0 +1,44 @@
+--- SDL2-2.0.6/configure.in
++++ SDL2-2.0.6/configure.in
+@@ -3546,7 +3546,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
+@@ -3956,10 +3956,10 @@
+ 
+ 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`
+--- SDL2-2.0.6/Makefile.in
++++ SDL2-2.0.6/Makefile.in
+@@ -143,13 +143,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): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS)
+-	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_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_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir)
++	$(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_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir)
++	$(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:
diff --git a/media-libs/libsdl2/libsdl2-2.0.6.ebuild b/media-libs/libsdl2/libsdl2-2.0.6.ebuild
new file mode 100644
index 000000000000..4117b57c829b
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.0.6.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: convert FusionSound #484250
+
+EAPI=6
+inherit autotools flag-o-matic toolchain-funcs ltprune 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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? ( || ( >=media-libs/FusionSound-1.1.1 >=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-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	)
+	virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/SDL2/SDL_config.h
+)
+
+PATCHES=(
+	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
+	"${FILESDIR}"/${PN}-2.0.6-static-libs.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	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`
+	local myeconfargs=(
+		$(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)
+		--disable-video-opengles1
+		$(use_enable gles video-opengles2)
+		--disable-video-vulkan
+		$(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)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+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
+}