gentoo Easter resync : 12.04.2020

5 files changed, 20 insertions, 21 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 1a72a8b4e527..b281f04b07e6 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,8 +1,8 @@
 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.13.2.tar.xz 3820660 BLAKE2B 19949b1256ceeec38a10210a7430082ed197c1f19d37048170fa55a56554e741e3af670733e25fbccf11426d08075f1ac40589a2106169fa0ae9838c8b7725ab SHA512 a18a2dc56ad33068efb78e5fb61df3c45d0102d153a02122ce39917df41acb161469092d0299df228fa7afde53260e9b7acf82ae016b99618c94d2caf02efa51
 DIST qtmultimedia-everywhere-src-5.14.1.tar.xz 3795732 BLAKE2B 2022d204c0e0632865f4dc3431bad0df368552bca084d57ca79c446bc562fbffdbd05087db6160918eec9964d85670f194ee52408d700d2a039a672cd6d4e841 SHA512 5e82d1d6078291d2b4355e03c0a50311847a76065d931039a50c995d18b0a658ed67fd35df78dbb49d7a231745cfdd4fbe7d23f5b652e6bb0737060a9dee5ce3
-EBUILD qtmultimedia-5.12.3.ebuild 1403 BLAKE2B e0c523a1309e99930dfaa92740f65ce87aa67595e6cb52bd3cb97606691b2a6eac8171a2f53c7190718b318d9654062d249f2c4ce53c742e5fc9b11348739185 SHA512 288e02cfb16953ba278f50e45ccaaad060d59c52722669743e11b0452b41177a3aeee6fd237baf24dd6131f4fdc8ae8e739c632089dad3f48669194d2cc4938b
-EBUILD qtmultimedia-5.13.2-r1.ebuild 1511 BLAKE2B 452e376cd721c3ca625e282ee509bf85a86e6b5effb1775b028086fdc633bfd7c4f7fbbfef2a4eb773a9e0cd2dc6284137c599a30fc9294f4fa1c0196ce6d8d5 SHA512 b6ccc65bbf87ab6a5d28f44044bbefaafb9fdc35e73176241cfbcb180aeab61c0dae8f186d582fa07a9285f258fe387d9a33e72ce33f55fb70c7d74b0a55a0ae
-EBUILD qtmultimedia-5.14.1.ebuild 1448 BLAKE2B 6e2efd504b680ea14faf8dd98705c726b9277e80db016e211f5e28eeaa4fb74057b7fb5056b388c6212a006c4c1a76c8faec54cebfd9fe07971ccc90f7b56fa7 SHA512 5349717406ba215a2532b57efc1aaf3464c973402f495308f6318cf48876840df2580e548fccc72370ba8a5e8be633bd86717229f2aa27020468a1e423f0acdf
-MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
+DIST qtmultimedia-everywhere-src-5.14.2.tar.xz 3793964 BLAKE2B 98f408e9a3ea48c053797ec20139d134a50d623a4092665695a435c754ee85a369830b23cc5ccce3d9a099cf707c1b28c2529050ff60d3f93f26809b3b2593c4 SHA512 5ebee0f96334d58b74ae344875aa93d32bfdd7c906856f84152e9ae0a3ebb12f627a0d3ab4552031b70c20ad59db1674b1a261ed0828e1efcc6ab48ba3718559
+EBUILD qtmultimedia-5.13.2-r2.ebuild 1491 BLAKE2B dc9e2c5bc6df45278ee1179d5ab57b2cae17297388f31e6e1a4e1b7a1d4126990bee31c6d7327c97c7ababa97a78f6732b059d3f5cafe5a4efe85b5bfeb46c32 SHA512 f3e19bcfb74d750aaa97db0453508ebbe05f5d6cd3c1df9dda3d7cfd92716efe962a30766f4324e0a41ad2eaa88e8feb607ec909593fe516feadf85daae8cb64
+EBUILD qtmultimedia-5.14.1-r1.ebuild 1463 BLAKE2B e1a9cc0ac94ea56a784de8614d08bd14abec07d0d5086f6d0261bab4cd9efa97215a8d5a5970243fd4ee4d8fe8709038309afe2e745849225608eb14e1fa8dbf SHA512 3b96b93dbe94b5dca6186ae7e7c1b722f034fbe20adc6aba8af225e310bdf16088d2d785f6514cbfdbeba0a9af5ebae10216ac430b7b6455e0c27a7d40150c20
+EBUILD qtmultimedia-5.14.2.ebuild 1468 BLAKE2B c0b9361755a7a2c37196ff417c2875c498a61e3e5a3c775a06cebbac9948242a960802bfb3b97cd21ae564763e71562563b550bf69151bcbfcb4d7e09e9cc1ec SHA512 f152a6f0fdec63bd1f699e15a79802d3a2b347e2dba7362a4d56dc8f0c22c70fecc30ee5d68ff1421226c04810496c1456dd39a2a66d5f781443d1927ea8b47a
+MISC metadata.xml 732 BLAKE2B f07c73041fca311cdae68d67a638926bcc124a879cb39d92a431c42c2eb5fdec65a483a24d4931534ecd0299a655c584fccd5d42d8694902a64e0da6d64c627e SHA512 bf4f77d5e918dccac25a31bba310f8a508efa0f0ccbe5c142b48443205f44e50477a46d7c363ba9313c623ff68d5a9bdf1dc699aa6ec3fbb3ab6b14afd1eff55
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index 833d7be66b31..949504138692 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<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="qml">Build QML/QtQuick bindings and imports</flag>
 		<flag name="widgets">Build the QtMultimediaWidgets module</flag>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r2.ebuild
index 9c5866b6b7f8..6946c997e652 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r2.ebuild
@@ -7,14 +7,14 @@ 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"
 fi
 
-IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
+IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtgui-${PV}[gles2-only=]
 	~dev-qt/qtnetwork-${PV}
 	alsa? ( media-libs/alsa-lib )
 	gstreamer? (
@@ -26,12 +26,12 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio[glib] )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
+		gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
 		openal? ( media-libs/openal )
 	)
 	widgets? (
 		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2=]
+		~dev-qt/qtwidgets-${PV}[gles2-only=]
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.1-r1.ebuild
index 1b878987bc27..13a8f895e24d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.14.1-r1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
-IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
+IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtgui-${PV}[gles2-only=]
 	~dev-qt/qtnetwork-${PV}
 	alsa? ( media-libs/alsa-lib )
 	gstreamer? (
@@ -26,12 +26,12 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio[glib] )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
+		gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
 		openal? ( media-libs/openal )
 	)
 	widgets? (
 		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2=]
+		~dev-qt/qtwidgets-${PV}[gles2-only=]
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
index e2eca0bb1711..f8b9dfe3d426 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.14.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
@@ -10,11 +10,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
+IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtgui-${PV}[gles2-only=]
 	~dev-qt/qtnetwork-${PV}
 	alsa? ( media-libs/alsa-lib )
 	gstreamer? (
@@ -26,12 +26,12 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio[glib] )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
+		gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
 		openal? ( media-libs/openal )
 	)
 	widgets? (
 		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2=]
+		~dev-qt/qtwidgets-${PV}[gles2-only=]
 	)
 "
 DEPEND="${RDEPEND}