gentoo resync : 30.05.2020

3 files changed, 72 insertions, 2 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 4a4bf8daf94f..437b09f8bec7 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,7 @@
 DIST qtmultimedia-everywhere-src-5.14.1.tar.xz 3795732 BLAKE2B 2022d204c0e0632865f4dc3431bad0df368552bca084d57ca79c446bc562fbffdbd05087db6160918eec9964d85670f194ee52408d700d2a039a672cd6d4e841 SHA512 5e82d1d6078291d2b4355e03c0a50311847a76065d931039a50c995d18b0a658ed67fd35df78dbb49d7a231745cfdd4fbe7d23f5b652e6bb0737060a9dee5ce3
 DIST qtmultimedia-everywhere-src-5.14.2.tar.xz 3793964 BLAKE2B 98f408e9a3ea48c053797ec20139d134a50d623a4092665695a435c754ee85a369830b23cc5ccce3d9a099cf707c1b28c2529050ff60d3f93f26809b3b2593c4 SHA512 5ebee0f96334d58b74ae344875aa93d32bfdd7c906856f84152e9ae0a3ebb12f627a0d3ab4552031b70c20ad59db1674b1a261ed0828e1efcc6ab48ba3718559
+DIST qtmultimedia-everywhere-src-5.15.0.tar.xz 3796364 BLAKE2B 3ab2137f811910c25c86aee10ee8266729ba186412bb0d61c02c655573cff66c2725f30c3d8782473820a1b9e0388d9fdb24c218c09afdcde26d899039bd7bb6 SHA512 120ff3be99c685fb5944da657d571d83c985e139a34b23f7527daf2a0fdde949a452d4c3691b41a86ed3f141decf1833f496b3b61fd87bc602b8164563cb79d6
 EBUILD qtmultimedia-5.14.1-r1.ebuild 1463 BLAKE2B e1a9cc0ac94ea56a784de8614d08bd14abec07d0d5086f6d0261bab4cd9efa97215a8d5a5970243fd4ee4d8fe8709038309afe2e745849225608eb14e1fa8dbf SHA512 3b96b93dbe94b5dca6186ae7e7c1b722f034fbe20adc6aba8af225e310bdf16088d2d785f6514cbfdbeba0a9af5ebae10216ac430b7b6455e0c27a7d40150c20
-EBUILD qtmultimedia-5.14.2.ebuild 1466 BLAKE2B 4fecd64481969699b4377b83005a2b4f5be4c44c65d8f2bc2275e0b95a97c0ae391ffc554d159c3a8f87dfbf4ae177c3cc837978eda1bcf34c29917f90de274f SHA512 a8bf1af802ee94226ace78479e32ec6b8ae391cf4a3914bd3796480cdfcee809f74b35ea9d61b00dd1be9d80303ca09bc455ad174de923044efd212dd489692d
+EBUILD qtmultimedia-5.14.2.ebuild 1463 BLAKE2B a8d8942473b50cf29baeab99af5ea3025080d617a94fba609746bd3c85d50e6b0a2526e4e822cb26866d02a6c48703579a053e491e78aeb5694322057355252f SHA512 41c3942cf81540b458a95a7854ed24aaee0636d62f26973de46b9e254051baf3bc4e8b7586ae2b574ffca0f091a6bdfa8f7b814f263eb423f5f42ace5c1c7796
+EBUILD qtmultimedia-5.15.0.ebuild 1468 BLAKE2B c0b9361755a7a2c37196ff417c2875c498a61e3e5a3c775a06cebbac9948242a960802bfb3b97cd21ae564763e71562563b550bf69151bcbfcb4d7e09e9cc1ec SHA512 f152a6f0fdec63bd1f699e15a79802d3a2b347e2dba7362a4d56dc8f0c22c70fecc30ee5d68ff1421226c04810496c1456dd39a2a66d5f781443d1927ea8b47a
 MISC metadata.xml 732 BLAKE2B f07c73041fca311cdae68d67a638926bcc124a879cb39d92a431c42c2eb5fdec65a483a24d4931534ecd0299a655c584fccd5d42d8694902a64e0da6d64c627e SHA512 bf4f77d5e918dccac25a31bba310f8a508efa0f0ccbe5c142b48443205f44e50477a46d7c363ba9313c623ff68d5a9bdf1dc699aa6ec3fbb3ab6b14afd1eff55
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
index 13f1b39dbc18..aa661ade1e26 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
@@ -7,7 +7,7 @@ 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"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.0.ebuild
new file mode 100644
index 000000000000..f8b9dfe3d426
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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"
+fi
+
+IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2-only=]
+	~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-only? ( ~dev-qt/qtgui-${PV}[egl] )
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		~dev-qt/qtopengl-${PV}
+		~dev-qt/qtwidgets-${PV}[gles2-only=]
+	)
+"
+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
+}