gentoo resync : 19.03.2019

3 files changed, 72 insertions, 2 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index c143e43cbd6c..58433d511f44 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,7 @@
 DIST qtmultimedia-everywhere-src-5.11.3.tar.xz 3710012 BLAKE2B b1757e80914a41913846dcb890fd56706b402aa0498cfa3e58277e8ab50e95c597df1b32dae11f146283d42c874ec03d8d33374447fc71f529c30d0e465c14cc SHA512 1c9b8f3392ac0c7e63a05d57fb74473a89edc9f2e482d8df97761ca20efd13bca2c1c68907ab4b4af71a109a783a641c2faaf72e7df90fcbed6bcd6e13350567
 DIST qtmultimedia-everywhere-src-5.12.1.tar.xz 3740192 BLAKE2B f8c5d134ad0482f8016ace4935b6fe494d5ef12af47b2fd818b7a7d5566d69d9c7709376810b3d0085d70661a750373c004b26631e5447299a9aa28fdb217b91 SHA512 cdf9161648abd9f6c6d20171a75e9edefd77a46e946263f7e22e9f2ae69a55132688c31e46378cdc74c3bdf528fd94383b7e3b20bd8befa485a02cabb398dea0
+DIST qtmultimedia-everywhere-src-5.12.2.tar.xz 3745076 BLAKE2B 76b68bbfb8b158803369ecf58bf85d54a50ad24a7988c2ef3e468f5e697b89601cb88efff60c97389f63f0004ef826ee8f357e70e44456df34096fd5c85c9a57 SHA512 3ee8e2f93f2a7a094e821f5b08fead32ee67bc0af7bd7eaadf2a40bbc12c774c62e4b9dc4f8526245e43530665156fd79f891243434d7c06da8c92401f3a9088
 EBUILD qtmultimedia-5.11.3.ebuild 1450 BLAKE2B 4c0e7773c5d567e64332db5c2d743c1e8701701a291367bf87fb6c7d10e258e1ccb7a47fc0c82bfb1c01909b8def86077f4ba6c1b04fefe9a30e0216876d506d SHA512 d09dc048fe5c44f41abef3c27a57467ad1cc5e102f3d486fc36331a55735875fce8e638747f297d789db80e3fcb0e894e255b7fbd57e06d43d4ccb391a2b2cc4
-EBUILD qtmultimedia-5.12.1.ebuild 1454 BLAKE2B 10fc926cb311cff9688d363dda0b57e7fed15a10cfb5e09f9ccf347e9735ce481bee5e75c495e6a374d83f6ef0292aab76f95f1eff4fa4276e479c5865145cf0 SHA512 5930fa0eb718ca1794c030a5206cc825c0871e08093a83f9b8be6c023ee8699ea0d2246fa6fd8ee900ae274f573e358864ef97a606716361c0adf215bfbf732c
+EBUILD qtmultimedia-5.12.1.ebuild 1460 BLAKE2B 75abdc2cd16f927b23a36ec9e06e07fcb9599d7471e92068c4c2916f79290bbee071dde9301362ca97572a4bc4118cae65bc7f832368cdcc14a8140899aada4d SHA512 7f46f89194740c40622df3cde51afa112125139060471848bd1379b222cfcfd525c87e0e7b32707fc9379f7e2571dd838f0e9f1bb372cc693dbca160804788ac
+EBUILD qtmultimedia-5.12.2.ebuild 1460 BLAKE2B 75abdc2cd16f927b23a36ec9e06e07fcb9599d7471e92068c4c2916f79290bbee071dde9301362ca97572a4bc4118cae65bc7f832368cdcc14a8140899aada4d SHA512 7f46f89194740c40622df3cde51afa112125139060471848bd1379b222cfcfd525c87e0e7b32707fc9379f7e2571dd838f0e9f1bb372cc693dbca160804788ac
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.1.ebuild
index 921705de1eee..6d8241532e20 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.12.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.12.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 		media-libs/gst-plugins-bad:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-sound/pulseaudio[glib] )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}
 		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.2.ebuild
new file mode 100644
index 000000000000..6d8241532e20
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.12.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
+
+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
+	)
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	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-base/xorg-proto )
+"
+
+src_prepare() {
+	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+		src/multimedia/multimedia.pro || die
+
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
+
+	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=(
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
+	)
+	qt5-build_src_configure
+}