gentoo resync : 13.06.2020

3 files changed, 9 insertions, 13 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index b2a7680e9754..5553d60c38e0 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -4,6 +4,7 @@ AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a7186
 AUX plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch 3503 BLAKE2B 360e27d03d8429d7d2b1c11f9b40ac0049108ab0461e9428cb5f2fe67241708190796d3a60a503e0ab1903dee61c27dfe7d2a187e36032518632a4966fe10215 SHA512 f7367acf43a4c3aed20ee42853fb0657f64182222a208511f97657b734a430eb8d24c6cf10b6a276ae3313d791938905abbc33387adc272725addc606a86f482
 AUX plasma-workspace-5.18.5-stop-multiplying-duration-values.patch 3899 BLAKE2B 434e8c1df5bac91b68085258641194a9ced7fbbaa35f7a97bc29a1921d00dd59c0a39fed948325d7d686c075514c9621391b1000869bd93de266cb179f538b6d SHA512 24927936b7940bf181c05a87a95e4b6d87f1658b9ab94cb980f0fc697b4cbd2fdbf8a7a141413c1bad6d040408ff24b419a44a3a404bc02accfaf9d9250cb110
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
-EBUILD plasma-workspace-5.18.5-r1.ebuild 7244 BLAKE2B 14e6f270b72f168e446df3fb8250ccfeb7b73432a2d723c24dde6848047d6290c1c6d51ec4e170877b34803f6e4aacc67c7ced1a37183b2e3386066bbde02ef5 SHA512 fa7287fe087844f55399406d01919438747020db920601d00696c6650feadada5468910d453e05e63ecbccfb19b50c736ce2e19d430660f85fada033bd854e51
-EBUILD plasma-workspace-5.18.5.ebuild 6987 BLAKE2B b17560d59293f948bbcca87a39f3770ec39a319d2d2f8b3df194a35191f068483d0c5e218594212fdaa4af5c954ae03f7fac454f9265bbc70badc681c06a4ca2 SHA512 4fab8614add4a4b0e457e0de49926e13b712a82dfdb4726c72ceaac104a7f1b509228194f5648411164e0dff4ec5283c44f0151b12d23a46a1e2a73203f53ba1
+DIST plasma-workspace-5.19.0.tar.xz 5683696 BLAKE2B cb1ed331c3a3f9f08ee8809b520800ce96db9f2091c0b778ee1ef212e3a6d87b619af87961f20d9fbdcf7353cfe416b3a3763570b178b82a3e24dda68de54f55 SHA512 3311855d43a0590659e4dcc981dac135e7724cb378fb766e6b78d48dbebba96c949d31f057432bbd73a1eac6f2ca1bce39fb9a2a37dfc232561ebfaab81b0ccc
+EBUILD plasma-workspace-5.18.5-r1.ebuild 7241 BLAKE2B 7a1ea14452de71a0d514f8ad75f489ea9a9b549517cc1c51b91cf319c91de6988869fe9b1c962cf0f79a64129464f98410e5e63198c828bb2d0c8f61e739a775 SHA512 8e91e8b6e377aafd493fc6a1b64a797f6ac4a0433f9feeab945e1c48b6146e54fa625720b0995b00f4cf88f49e85af5818234c2088413eb024d65567eb4b6fe2
+EBUILD plasma-workspace-5.19.0.ebuild 6827 BLAKE2B b0b5e45cd35dc577d73d8668a6283b640fd4b216a7d113a83cbf6d033317a49192c3bc1d57381b42fd3daff3487e5177ea57dd76609ca880ec72907a1a08f315 SHA512 e0b9d5a19b0a336aacaa1018ff6e42eb9e1b019ea4d0326ef35910200aac6f1467da4f09992a664da38fe21e31945e262bec6e68f05e68cfbe4e51a3be35ce78
 MISC metadata.xml 752 BLAKE2B cd21241fe0de70e075d26290b647b72126b451e8da5f174c5b3616fe4c509fa7cc2beb090ad05e1eef6d4357ac5fa2b6c2425cc71403e0ff576611bf6916bbda SHA512 cc8629cb747580ae01c0fd102859055f93fd70b0d515e646e03e5d832447a0a4ae663f86cfa756b7c30ce7d49a29a513da8a243cfdfcfa1cff0f84234699097e
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
index 4662a7858bf0..a47bf9b9589e 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.0.ebuild
index d4db44181265..22fad8190438 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.0.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.70.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.14.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,16 +15,15 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
 
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5=[jpeg]
+	>=dev-qt/qtgui-${QTMIN}:5[jpeg]
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtsql-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
@@ -124,11 +123,7 @@ PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" # downstream patch
-
-	"${FILESDIR}/${P}-sddm-theme-prevent-logo-leaking.patch" # in Plasma/5.18
-)
+PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
 
 RESTRICT+=" test"