gentoo Easter resync : 12.04.2020

4 files changed, 12 insertions, 11 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index a776db418cfd..4dfe297fcd07 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,6 +1,6 @@
 AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8cca39a03f932ef23780c9d5f1104bdac665744dd03878a5b7f1ccc20dccab42facb8d97474c31548b602db0debb27e5490ac76e SHA512 2b1de2ceeeed51bcc691273caea969243ef08ced929030daa94c0f19bad2fb31a507e3efbb9018833a8bd3b66850380dfbefb9018fa39e00664a1295b9482183
 DIST kwin-5.17.5.tar.xz 6251468 BLAKE2B 52e2c11e6164d0c1da49f818e842fdbfdea599460204ada2fdd5f1f09cb230d4c1fe96e8c00a85d8c9518af7cfcbefc584d0223701448b5afc009af5cf01e0cd SHA512 67e1f7044579b7c1ef7feacf92910f449c7eb5f6ca3ada3e1ff5820f811c1b4a168690b74a163659c84c9daf0094144b5584f287fefeaff8effab48bab7258f7
-DIST kwin-5.18.2.tar.xz 6272328 BLAKE2B 32f9fc2bd9038209ca1e0957fd9428478749808d9f87bcd68f5c48184fef66e59e50be7e8a89a846d641e09cfcc7670e576305e0c6d2670363ce26331a01ac91 SHA512 dab807fd97d501b6dd90cb881a571a9c60be0fc6a7159460d7b025416d10fbfbe152d3cb13c067cd0ac035590e28ed5e72d971b8fd4e10cf2d3883309230b129
-EBUILD kwin-5.17.5.ebuild 2965 BLAKE2B b7daa2e55a7fdb6c787d2c1862d2954aecea814bd3afc2b1175c69a91e8cb92957eaab8c6a804e5d8661ce491a35ed46616ae2bf9b99c1f261400c6324a9fa23 SHA512 2ef33815f3e066dd553e87dc9abe74ed1959c1442e38ca52fdb4685369da84e82fe7c59ddf08305e9f709593f5fd4d609bf3dbd3c23c047c2ac42f1648bafbe2
-EBUILD kwin-5.18.2.ebuild 2969 BLAKE2B 6bbfec10f46bb711a786d6fddab98e5b53dcd92e0b4d7c0873cf9a363cc0f8084b634809c90008a1ac9864b09bacdae0a89bf6bca9d0faec68e1121c4f0d2c53 SHA512 5a7c486234d2a46b49fbfd6fd4ce97ba48cfae7c0f03c7c287c08f8d42112ab40a9a5fa7898a235f3053cda15ed7e3d4c3c420a854c25b934448abf4e937100e
-MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
+DIST kwin-5.18.4.1.tar.xz 6274296 BLAKE2B 78237c01e2b21645158a2d9aa48ebc495dac1fd605b8ff4914f5e3b5167fdc9a5664988fbcbf1245e4dc7ccb7d11307fc42f0b17bd3a17e7994c40c505428c63 SHA512 5e2ef7a8bd2969121d560e6558791298d8506d1af4c67aca8e6d2377af76e10b8e6ee32f116911a85352a74195a1cbd6dd4d40054f1796ff4b54b1e5418a5772
+EBUILD kwin-5.17.5-r1.ebuild 3008 BLAKE2B 379173f5f8d92fe4657383dbf537188f81a6b0ee5732d967b3970f97a095e5a9bb056f12f65fb12546d1d71af005b22ab70c4c9ece2fe9520b5a445ddcb47010 SHA512 ada392af0be05ac08ec8c6275ea78d76946231b16890538d12a64965ff4f8303b8e8d4e32b83bf0445eaf75f4169b345a5ffac359e40697cfd475d1f392b8b86
+EBUILD kwin-5.18.4.1-r1.ebuild 3012 BLAKE2B dc839920a16255c3198d3bcbf69697164f49cdcd957a21cec9a58fd3ae8bb31dc3e62effd70568e912d45d26feb9a7f2d50a8c0c516080efb931a6587568352d SHA512 efac2ffd57ee4c3fb9b004aafb7a7a7c92ea53fba6d808fe1278baef50718dc0eb74a5ffa9638ca662da89859ea7352b35e2257c583e95feaf189b825c6a16bc
+MISC metadata.xml 347 BLAKE2B 9288920f1da9d97be4ba082678abbd6c404efdd6d7c6b997015e38e7d1f36f2b6201bda92799af0ac02287e86d2525c0a7e783e7efd305ed67ff8b96715ffe59 SHA512 e9e82ec176a53e1bea1eb323c1d1daffdcf900f1787ae76fd3de0434ffb8ac77429131ebbfc11080a1771ed03195e7d98c98be2ebf6a444de95d6cd0eb539824
diff --git a/kde-plasma/kwin/kwin-5.17.5.ebuild b/kde-plasma/kwin/kwin-5.17.5-r1.ebuild
index 6806a101a494..27859ed33e22 100644
--- a/kde-plasma/kwin/kwin-5.17.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.17.5-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="caps gles2 multimedia"
+IUSE="caps gles2-only multimedia"
 
 COMMON_DEPEND="
 	>=kde-frameworks/kactivities-${KFMIN}:5
@@ -48,7 +48,7 @@ COMMON_DEPEND="
 	>=kde-plasma/kscreenlocker-${PVCUT}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2=]
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
 	>=dev-qt/qtscript-${QTMIN}:5
 	>=dev-qt/qtsensors-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -58,7 +58,8 @@ COMMON_DEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
+	media-libs/mesa[egl,gbm,wayland,X(+)]
+	gles2-only? ( media-libs/mesa[gles2] )
 	virtual/libudev:=
 	x11-libs/libICE
 	x11-libs/libSM
diff --git a/kde-plasma/kwin/kwin-5.18.2.ebuild b/kde-plasma/kwin/kwin-5.18.4.1-r1.ebuild
index 76f48ca9b6f7..a66ce81e1bc2 100644
--- a/kde-plasma/kwin/kwin-5.18.2.ebuild
+++ b/kde-plasma/kwin/kwin-5.18.4.1-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="caps gles2 multimedia"
+IUSE="caps gles2-only multimedia"
 
 COMMON_DEPEND="
 	>=kde-frameworks/kactivities-${KFMIN}:5
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 	>=kde-plasma/kscreenlocker-${PVCUT}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2=]
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
 	>=dev-qt/qtscript-${QTMIN}:5
 	>=dev-qt/qtsensors-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -59,7 +59,7 @@ COMMON_DEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
+	media-libs/mesa[egl,gbm,wayland,X(+)]
 	virtual/libudev:=
 	x11-libs/libICE
 	x11-libs/libSM
@@ -73,6 +73,7 @@ COMMON_DEPEND="
 	x11-libs/xcb-util-keysyms
 	x11-libs/xcb-util-wm
 	caps? ( sys-libs/libcap )
+	gles2-only? ( media-libs/mesa[gles2] )
 "
 RDEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:5
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index e816cb21af76..9b1b37b6a988 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="gles2">Use OpenGL ES 2 instead of full GL</flag>
 		<flag name="multimedia">Enable effect video button in desktop effects KCM</flag>
 	</use>
 </pkgmetadata>