gentoo resync : 05.02.2020

4 files changed, 6 insertions, 76 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 7a15c9539340..9ef234117fad 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,11 +1,9 @@
 AUX qtmultimedia-5.13.2-gstreamer-crash.patch 1395 BLAKE2B d53993a824ee9bcf43d23c2d0a5755ede01d232bd71a0f578cb242147de3b3835e0670ad982c4e3ff3109d53c452517770948b6ca11f3656180d1659aeb2b831 SHA512 5cc9b7986648420bcbce372286f93637e772ea55d25d953569b61eae18e6e678f2c1a0fca00e96528cbe00543872151a3e07abc02850b96df6ad297284317958
 DIST qtmultimedia-everywhere-src-5.12.3.tar.xz 3742244 BLAKE2B 65cc184c2625c998ec0f12d5d2f72401693521c9b5e1f27db342279724789e88e0bd6c6cb741ccf28939e8edbb657dde391ceb24ab0cb97c786c114e7e95743d SHA512 4f10e40aaf73dda2d70502e6a1441149c2b4389e9c7de72245c850d926c3ecb57ca6b09c63d208eff4b9ec63b7f9845eb2740cd0df4e4b7eee8f51746a6d3963
-DIST qtmultimedia-everywhere-src-5.12.5.tar.xz 3744764 BLAKE2B 47e7c09ddc4961ea2c479835732cc31139a4ecb577571a9b804a946909292439ef6bd85d5f8afdae0caacf3491391a8b45b2bfdd113dd18902fa097a0dc36253 SHA512 a59983d887c8de462399fd53beb640c1b865c17f8b1a83635c2e1d27903861dd588eb64935d7c02d733c51c9a21174065e70a5fc1aa78600e5540c489b7695a3
 DIST qtmultimedia-everywhere-src-5.13.2.tar.xz 3820660 BLAKE2B 19949b1256ceeec38a10210a7430082ed197c1f19d37048170fa55a56554e741e3af670733e25fbccf11426d08075f1ac40589a2106169fa0ae9838c8b7725ab SHA512 a18a2dc56ad33068efb78e5fb61df3c45d0102d153a02122ce39917df41acb161469092d0299df228fa7afde53260e9b7acf82ae016b99618c94d2caf02efa51
-DIST qtmultimedia-everywhere-src-5.14.0.tar.xz 3758400 BLAKE2B 12aa55e83dce58e1f36cf82c11da3b5e2d781db00be5c3d19786ca35c55703cef27e279058a5f76304673b4cef610bb281bcc237af6668dca3605cd7cbf73555 SHA512 ab5cf713e207c0538004860debc2da74830fd4b1d13c3c3ee0b3b9ee8f4438512f94952ec4ca7408cd055b69f4d1b0396d79d123365a6c74c14c4fee1f86c622
-EBUILD qtmultimedia-5.12.3.ebuild 1442 BLAKE2B 9119b837e2b5d05315de59bcff3f050641fbfce0e9c5fa98c83d063b0ff1182a40d109f406efb5585bb21e8a1aa7c882489f754d79ac40da95ebe8848f5936b6 SHA512 e7791558ba9bda82a883aed78a82b53f835db95774b415f19d4e61ac709b8d0fd916dde4b21a15c27c43578cfc8b4ed069da4a2a31f6b0545aac767d3d94fa4a
-EBUILD qtmultimedia-5.12.5.ebuild 1445 BLAKE2B bed865095f592c13c0642b5b364525f59c97060f648a66d0582f632f0353f7b4cbede150ae6f7db7812281d48e333a2e562293c7ca78796c46781622154a608f SHA512 4349ea4bdec5a86403b781c66ab0e71ce76aee9c2c2267d098a3ae6b9e0bdfa191734c40cfdf57b9581a8fe785d20b9bb069ec065664633a75010fdbb6535203
+DIST qtmultimedia-everywhere-src-5.14.1.tar.xz 3795732 BLAKE2B 2022d204c0e0632865f4dc3431bad0df368552bca084d57ca79c446bc562fbffdbd05087db6160918eec9964d85670f194ee52408d700d2a039a672cd6d4e841 SHA512 5e82d1d6078291d2b4355e03c0a50311847a76065d931039a50c995d18b0a658ed67fd35df78dbb49d7a231745cfdd4fbe7d23f5b652e6bb0737060a9dee5ce3
+EBUILD qtmultimedia-5.12.3.ebuild 1407 BLAKE2B bf92a3bc481fbcef11e1003551ce7877d8a600b3ad2e09c9091733118b143b4a1010d832bc1f1f4ec87c24e1bc2e610aef28a52a325cdc3a50b69a31a08dd9dd SHA512 1acc9308b0919fa024879ed346a6707fabda3c42bf04e8b22d6614fac23c09e5c28359bcaff206738ac15102cb1b5180c78805ab29faac64d3ec83508f8ebb98
 EBUILD qtmultimedia-5.13.2-r1.ebuild 1512 BLAKE2B 190a3ef5f4513337435a4564f6ee7f50d973cd555b7376c5927a8e82b3be8ce2bab65bbfa7e9524508634d667c359c15eaf8664540d93f82f1e2b731d4248626 SHA512 c13eb61577e8debd3445eccdeb06a8b726db3e8c37fbca92dd43040f56d11a5f069b4ec0efca874cec67aab97bb20cc7a12a0734faf125d5a0d9c754c04d1735
 EBUILD qtmultimedia-5.13.2.ebuild 1448 BLAKE2B a932815ba950f6ca4a92467f5b7fee3b768b485b4f5a29ee604cf1ec234444d0fa3c3002eabe7990aa70e4f2be8eb6b5327498ac09279991d8ea5c71a1f8f8c5 SHA512 ab5a885ebedfd17b62ce5762197bc9b689cae6c3a46ffc16d0d37b7f4b43561fcfae6dc3949cab01bf119d492a2a9dbd096dc6a081592391f61a4010692acfb5
-EBUILD qtmultimedia-5.14.0.ebuild 1448 BLAKE2B a932815ba950f6ca4a92467f5b7fee3b768b485b4f5a29ee604cf1ec234444d0fa3c3002eabe7990aa70e4f2be8eb6b5327498ac09279991d8ea5c71a1f8f8c5 SHA512 ab5a885ebedfd17b62ce5762197bc9b689cae6c3a46ffc16d0d37b7f4b43561fcfae6dc3949cab01bf119d492a2a9dbd096dc6a081592391f61a4010692acfb5
+EBUILD qtmultimedia-5.14.1.ebuild 1448 BLAKE2B 6e2efd504b680ea14faf8dd98705c726b9277e80db016e211f5e28eeaa4fb74057b7fb5056b388c6212a006c4c1a76c8faec54cebfd9fe07971ccc90f7b56fa7 SHA512 5349717406ba215a2532b57efc1aaf3464c973402f495308f6318cf48876840df2580e548fccc72370ba8a5e8be633bd86717229f2aa27020468a1e423f0acdf
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
index c98560542874..a9f5bb6c8901 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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="arm x86"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.5.ebuild
deleted file mode 100644
index 5e68278f02c7..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.12.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 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 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
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.1.ebuild
index 349dd584a74c..e2eca0bb1711 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.14.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7