gentoo Easter resync : 12.04.2020

5 files changed, 84 insertions, 86 deletions

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 4142b3de61a9..fc154aaee553 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,7 +1,7 @@
 AUX plasma-5.67.0-construct-nullengine-w-KPluginMetadata.patch 966 BLAKE2B c3124a608ba4d98c72fae39a1e934fbb5cfdaca3c9ae6c007aa543cfd6d5d8e1df75252e58e86b4ba41088199f20e5225c5beb891670b8c2ee06dd7fed7f766a SHA512 daad08bcfdcad504f8e51290992d1d065e043af35624f02b24caedda4ee4c1d06f399f94edd3ec214e3a5f8f6e631c2ea0a7faf1843c7aa6678fe0aa6c8743fb
 AUX plasma-5.67.0-remove-hardcoded-colors.patch 7414 BLAKE2B e56f7055afa03767cecebd9954158d74cb97b837dd474f2f710b4e00548f5bf64cc3571aa22802ade239ab6794030760e4f223c14a3011d93f46783c4dac34f5 SHA512 cb3bc11054231344678ffbe629b5c4cf76d098ab05e932b340870d705d61cd6725425463bbaf4276040c24c1058e237643977c68d62f78848c2bb0510f4addb2
-DIST plasma-framework-5.64.0.tar.xz 3120788 BLAKE2B c9c008e4b4b711ba4c370ba95029c4fc7392fe298057f5f8fe959118ad873325cfef3e3a93cee0dc73c7ce786287f18ab661f22e9f32c5f706aca5d15b70d24a SHA512 d0dcdbc4c537d064a125cef11d07e562a9a3b1bd83442217f8f435260420753c34b4dfddd733fc497533bf16a22fad3746884764395e07cf0f268d5f8435ef3c
 DIST plasma-framework-5.67.0.tar.xz 3127592 BLAKE2B 15eabb6b3c62117ee64a8ceb2c6cee9d1df29942785b5e0e061f062e4ddc5cedb0ea73ea17e597bb09a5eef868cb8aafe81a25d51af19691f05152d05b916f8d SHA512 3708262501b39698a84656b1ec0ea461011369301c7e1f1e5858fdc5b3e06f4fd3a5d7511dba1f91e08e89b2331fcc3204561efd1e06440f97e6b4a32cbd8f92
-EBUILD plasma-5.64.0.ebuild 1899 BLAKE2B e63ebf02875b1bcafe8fcdc4a808b825bf9308c9beb389c9a1f748d04df385740f57fc76a4c87108ba1e8ae9162a557847eedd882336170aade350139bef13d9 SHA512 30dfcde51067155c381cc15f58d182fcb4dbe121ecc9fc8cd0b277cd6c74ed1807b051a64e485bc681a9ec5471576dd9c63819bd535389ed72d1686655784c73
-EBUILD plasma-5.67.0-r2.ebuild 2074 BLAKE2B bc5f5216484c09b37a78cefc5a0ffe097b35afee147f4fa985bee65580818f9b22e655c7dc3a4950254527c6dd4a27cab372d98a516a21e90dcbc926cc3a063f SHA512 bf26ebe3ab212f3681ff66fcbe51559611663c3ba16a3069e247d4531e621c17f21b6058dd3fbfac61cbec85aef083cacb7d4b2bc6b342c646ca1869fe702c00
-MISC metadata.xml 337 BLAKE2B 83b14f1456a141498367a54d2b3b1bd22095d8a2ea5d4b348bcc1b27b6e753900e89d2b2f7f6623a9737c6c6fdf4fdc741fb38fef17b17bc458d182e72be919c SHA512 bd0bffaf1b63f9b0181776335e38b2ad44baef7fd4a1d78752b5e342de444bfcda03b72c795c0b52c87a768e243e9ffdfbd02de745c2dde8f8372fdcfbaf2797
+DIST plasma-framework-5.69.0.tar.xz 3130816 BLAKE2B bfb86c96aa600d02c75a52c990784e001c29eb517f504162e2cfe68ea1d2f17a9eea61a9da03715c713a3ac588640a130708cdda02693467d57ac95fab1975f0 SHA512 37fcd4c3bb531e72616a3f128342a470e9a938b9e99012dcda89e99d8eca6a856b48bf050794b1cae561fd3006d7189a0711b172d6982fc7a5c2813bcf7048a6
+EBUILD plasma-5.67.0-r3.ebuild 2091 BLAKE2B f54d8025715f9820f8fc8fb32e50fca3c7c945391ea8ac3b27e6db5f23708e7b453ce582388a77991ed455ddbc0957e992b631445a06ada00f5064ac054254ec SHA512 81a9dc4a48d6d634dabee6641a732f99844bf38d6667a3fff070bd7a521e4b7a22968ed7e574893c653e2652002dd38a036a719563f5bed05f4e773c6d53de53
+EBUILD plasma-5.69.0.ebuild 1930 BLAKE2B b394277d5f614c5a7aa3d5f56aa26bb2d574b1140e7c58f879fd1f5bb7950229588922a6e2875a242a9bcd9132e99f77f1380fb1f3de5eff76ae3b2b29db25e4 SHA512 3ad4bfe0936337f683ac315ed09970af196e3c8be54183d0dba3917e336b0792d9b620de377f7b006073ed65a6b99c864da9550491b1e9aaac711a9cb87d30c8
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/plasma/metadata.xml b/kde-frameworks/plasma/metadata.xml
index 6b9e8700315d..2fdbf33d963d 100644
--- a/kde-frameworks/plasma/metadata.xml
+++ b/kde-frameworks/plasma/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
-	</use>
 </pkgmetadata>
diff --git a/kde-frameworks/plasma/plasma-5.64.0.ebuild b/kde-frameworks/plasma/plasma-5.64.0.ebuild
deleted file mode 100644
index 41d92a57f3e8..000000000000
--- a/kde-frameworks/plasma/plasma-5.64.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="gles2 wayland X"
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-BDEPEND="
-	>=kde-frameworks/kdoctools-${PVCUT}:5
-"
-RDEPEND="
-	>=kde-frameworks/kactivities-${PVCUT}:5
-	>=kde-frameworks/karchive-${PVCUT}:5
-	>=kde-frameworks/kconfig-${PVCUT}:5
-	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
-	>=kde-frameworks/kcoreaddons-${PVCUT}:5
-	>=kde-frameworks/kdeclarative-${PVCUT}:5
-	>=kde-frameworks/kglobalaccel-${PVCUT}:5
-	>=kde-frameworks/kguiaddons-${PVCUT}:5
-	>=kde-frameworks/ki18n-${PVCUT}:5
-	>=kde-frameworks/kiconthemes-${PVCUT}:5
-	>=kde-frameworks/kio-${PVCUT}:5
-	>=kde-frameworks/kirigami-${PVCUT}:5
-	>=kde-frameworks/knotifications-${PVCUT}:5
-	>=kde-frameworks/kpackage-${PVCUT}:5
-	>=kde-frameworks/kservice-${PVCUT}:5
-	>=kde-frameworks/kwidgetsaddons-${PVCUT}:5
-	>=kde-frameworks/kwindowsystem-${PVCUT}:5
-	>=kde-frameworks/kxmlgui-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2=]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	!gles2? ( virtual/opengl )
-	wayland? (
-		>=kde-frameworks/kwayland-${PVCUT}:5
-		media-libs/mesa[egl]
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !gles2 OpenGL)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/plasma/plasma-5.67.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.67.0-r3.ebuild
index 7155e18e8ab4..37b67199cb70 100644
--- a/kde-frameworks/plasma/plasma-5.67.0-r2.ebuild
+++ b/kde-frameworks/plasma/plasma-5.67.0-r3.ebuild
@@ -12,8 +12,8 @@ inherit ecm kde.org
 DESCRIPTION="Plasma framework"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="gles2 wayland X"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+IUSE="gles2-only wayland X"
 
 # drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
 BDEPEND="
@@ -22,7 +22,7 @@ BDEPEND="
 RDEPEND="
 	>=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/qtquickcontrols-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
@@ -45,7 +45,7 @@ RDEPEND="
 	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
 	=kde-frameworks/kwindowsystem-${PVCUT}*:5
 	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	!gles2? ( virtual/opengl )
+	!gles2-only? ( virtual/opengl )
 	wayland? (
 		=kde-frameworks/kwayland-${PVCUT}*:5
 		media-libs/mesa[egl]
@@ -69,7 +69,7 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package !gles2 OpenGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
 		$(cmake_use_find_package wayland EGL)
 		$(cmake_use_find_package wayland KF5Wayland)
 		$(cmake_use_find_package X X11)
diff --git a/kde-frameworks/plasma/plasma-5.69.0.ebuild b/kde-frameworks/plasma/plasma-5.69.0.ebuild
new file mode 100644
index 000000000000..5ec5f22228ae
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.69.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only wayland X"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+	>=kde-frameworks/kdoctools-${PVCUT}:5
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kactivities-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdeclarative-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		=kde-frameworks/kwayland-${PVCUT}*:5
+		media-libs/mesa[egl]
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !gles2-only OpenGL)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}