gentoo resync : 15.01.2020

3 files changed, 21 insertions, 18 deletions

diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index c191c4164e43..f120ec842865 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,6 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
-DIST plasma-workspace-5.16.5.tar.xz 4905748 BLAKE2B 049a4ff618aade78ac130c1496f6add0ddc391db5b025045eaee91fbcac0a0b9e7b44a06757c94699c1038b18a96a06eb31d4ab6518bfda6d308e12b1269ca04 SHA512 e55e89b6a8e3dcf68bb7ad4f62f284cd819c7461eff1269f84df086a2516401c26363cc6c3c8e6cc8e27788222b3ed81098d765a25e5d96d9274e3b342816369
 DIST plasma-workspace-5.17.4.tar.xz 4962200 BLAKE2B 2050dbf77dbdf144017e0ddf4b827b9dbe27b8f475eedaed969a442e036f162cabad5d6b47fd650491ed5989cade48ebafbd5f599dbc790c14515ce01ebfd626 SHA512 3f5aa07ccd19604bc399bb1d30dd16ac82e1405613c1f4a939e3c2cba3b4a478213095617052440dda222f1712608533e5806939117752d31b0616a6009cf45b
-EBUILD xembed-sni-proxy-5.16.5.ebuild 937 BLAKE2B 6473e8e3eab0f3bd10a1d074ef32929e1f4a5f9e01ea48182df4afc3f1b1350a5631fbf275e934696b2237588a3559a429261d1cf1392b3c354846560be0ce08 SHA512 28b2489919c5487c64eea3f31c94e4d0b1b90072e7ce0d6f77e8b1403b997d95c86cc07634628b049dde96f42f4e9df984e49a7eef529b06ec55fd245f8182c3
-EBUILD xembed-sni-proxy-5.17.4.ebuild 1039 BLAKE2B c97e58c743eadef1f5ce5e1b7ac91b256768961d187ad7f1ea9d813c439c1f9b896ca6dd5ccdd90e5412e0f8e2b6f65a50aaf426ddfa264e1f3083caed9b1913 SHA512 81851dafac7087f5e15d24222cc09cffe1624c42ebc77e20d1a7e6431d39db5fa93cb1d4f37c8edba2119c6f54505f4a23fdcbb790b6053739e25039fc9aadb3
+DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a
+EBUILD xembed-sni-proxy-5.17.4.ebuild 1024 BLAKE2B adad43896a32ea63b375722c7bb47b1d3815923fc4c98dbaf37562f6d80e218da8018bdd1bf92d0539a5a55e90ee0e8871a2bd35f0551465cbc054f6b79860ed SHA512 6e244d51fc9b44a19859d192fe1d56e04c5fe0131a27ec4ffb56e98f27549a59a90cdbb3e060359e9b7b8ddb11205b76c5be0d50050576a23c1185ab8b6d3729
+EBUILD xembed-sni-proxy-5.17.5.ebuild 1027 BLAKE2B c0deef143075afa3aebbe7167fd01a72aeb69290751784a61343546d36c0c8223278665349aec752ac85c62afcdc3827f68ba27df481fe111432603a2afccc58 SHA512 6175b75470335d8b3a6acbc8c3956d356bbc6fcff1063682b9cb480826caf6c08ccd18ac12f2400e0570e24a9e04f90764c940a0ecd4bd826a63b2d3af6e6ffd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild
index f0e14f08c6f9..f2088176430b 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild
@@ -7,14 +7,14 @@ KDE_ORG_NAME="plasma-workspace"
 KFMIN=5.64.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.12.3
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
 HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
@@ -37,7 +37,7 @@ S="${S}/${PN}"
 PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
 		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.5.ebuild
index 4faf2de2b993..dc13af98ef7e 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.5.ebuild
@@ -1,25 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_AUTODEPS="false"
-KMNAME="plasma-workspace"
-inherit kde5
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit cmake kde.org
 
 DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
 HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	x11-libs/libxcb
 	x11-libs/libXtst
 	x11-libs/xcb-util-image
@@ -34,7 +37,7 @@ S="${S}/${PN}"
 PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
 
 src_prepare() {
-	kde5_src_prepare
+	cmake_src_prepare
 
 	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
 		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"