dev-qt: version bump 5.6.0

Package-Manager: portage-2.2.28

3 files changed, 84 insertions, 1 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index b195bceef83..bfa8ca5a093 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,3 +1,4 @@
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qtmultimedia-opensource-src-5.5.1.tar.xz 3464340 SHA256 7cc7ca99f41587c188303670499e5c75101f9a8cb6178e8f29cc941e637d957f SHA512 e38a3bc0ed77ab6fe7f3a68e2b0dcfebe3fb29c860a1ca48391a1519ebc4c564f25469082b4e9ef78e31093724df24b33aa83158fa9211221fa2c6d9154ce0d0 WHIRLPOOL 8e70821769a86a5de40754e303232c5e1441cc5c04b88082bac349d56360c7ad25af8d7893a3b3f2d9255ff6d18af8051bb369444c331fc4ecf5bce3de330bed
+DIST qtmultimedia-opensource-src-5.6.0.tar.xz 3503736 SHA256 103f99d6cd266f5c4485546a75ef0c6ee7e88dc901a0be21447cf89159370686 SHA512 d8da59d04bc76cd6ed131f35db944ef2743bd4d2812f578eb8a67803bf83a02d4a9df2b26ae76ca116302a722ee67e0c3e00a86a2312ea763d051d3275fe950b WHIRLPOOL 673a14658ecd656edc777b75108df08bf0de7f5798aec0a186813b1d2f37731b218978eb09837061ed9c5bb4abf6531a2f0e0d98ff3dd4bee4d669a89596c906
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index e5b0ef7a739..8f5201465d6 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -8,7 +8,7 @@
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
-		<flag name="gles2">Enable EGL/GLES2 integration</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="gstreamer">Enable audio support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>
 		<flag name="gstreamer010">Enable audio support via <pkg>media-libs/gstreamer</pkg> using SLOT 0.10</flag>
 		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
@@ -18,4 +18,9 @@
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>http://doc.qt.io/</doc>
 	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
 </pkgmetadata>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild
new file mode 100644
index 00000000000..1a2ca34b34c
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.6.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="The Multimedia module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
+REQUIRED_USE="?? ( gstreamer gstreamer010 )"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtnetwork-${PV}
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gstreamer010? (
+		dev-libs/glib:2
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-bad:0.10
+		media-libs/gst-plugins-base:0.10
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qml? (
+		~dev-qt/qtdeclarative-${PV}
+		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		~dev-qt/qtopengl-${PV}
+		~dev-qt/qtwidgets-${PV}[gles2=]
+	)
+"
+DEPEND="${RDEPEND}
+	gstreamer? ( x11-proto/videoproto )
+"
+
+src_prepare() {
+	# do not rely on qtbase configuration
+	sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
+		qtmultimedia.pro || die
+
+	qt_use_compile_test alsa
+	qt_use_compile_test gstreamer
+	qt_use_compile_test openal
+	qt_use_compile_test pulseaudio
+
+	qt_use_disable_mod qml quick \
+		src/src.pro \
+		src/plugins/plugins.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/gsttools/gsttools.pro \
+		src/plugins/gstreamer/common.pri
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		$(usex gstreamer 'GST_VERSION=1.0' '')
+		$(usex gstreamer010 'GST_VERSION=0.10' '')
+	)
+	qt5-build_src_configure
+}