gentoo resync : 15.01.2020

3 files changed, 27 insertions, 23 deletions

diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 1d96e4f60dc1..a5fd1b621ae4 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,5 @@
-DIST kde-gtk-config-5.16.5.tar.xz 154292 BLAKE2B 32dc80f3b77e502c5a5ae55e9b0071282c10b7a2bb47311b89d2a2242d8398cfb74ef18e4c50bdb3c458816fb1508e85f7b2bd90497b7a9d3cc9e92d3ff24e27 SHA512 42f02f1784a428cd7b83a8aa774aaaa57a867c18c7f0b23493639559d93f9410172cfd1d9b87226c6eb112135d9bee346f111023b70c41ced04ebc67891778f3
 DIST kde-gtk-config-5.17.4.tar.xz 154744 BLAKE2B 79af7643b2f8cbf813d1ca8d4a3da61fb9efb3d6410012faf3d5e390dbda67b817a7c92f65a6cc5d919372647785a8449920172fdfcc65d2ad912a994fdb1d4a SHA512 1c4cdeb6b39eea56e18ed368839eb943e65061818256074780965d284abf5c3f967ad50a6c273d79f980369b26310ba8942b0ab3cde31da13a8a4f7c42d3dcaf
-EBUILD kde-gtk-config-5.16.5.ebuild 1245 BLAKE2B 3d1291f02a58851e8f39158a767323d4ae2c8318a4e1eed082c7ce7a4f9525ec08f2b19ae2e9da8db166870f24e35a8b3b352c57295d7439cabb47972b46e01b SHA512 839b86c955d8e5c004bb6fa62eca8fdc757b31f134ffcce8ca27dff70d70acafa263b22b7edc4a75733c9f9909fdcd248dacc7508cde8f93fdc770e997b6fd89
-EBUILD kde-gtk-config-5.17.4.ebuild 1387 BLAKE2B eb1c2e1e22febe5d3287cc02b0430f089f8b317a510a765d60dc9c2e9d3ed206598b2ab12742807cb0d123f9b98deb009dba678834ddab2b36f37b2684443423 SHA512 3581c450f647939fbd00d9ffb15085efbce94e4d5cf18648e68334eaa08ef51bb0e7418b093e42d1c24d9467a2925f708250f63f929277509a4a6e2a17b5c146
+DIST kde-gtk-config-5.17.5.tar.xz 155340 BLAKE2B 10363865751489a16dfc62924694b0b47aa05c7e097a512822ae54026bacd4cf167cdff0e7c7d29e7a7aba8dffb757fa176f60fec62df8aedb0d51f9da7b9fcb SHA512 29cea96d6f7471717ecb2f48df5e19a96c7730c9f47157dc01c236d11253547aba57f5cb30cbb08659af53dba81160ff1982f9ed2908aaec91940365eb625201
+EBUILD kde-gtk-config-5.17.4.ebuild 1384 BLAKE2B 8c438469184b361e72019bbc0c04873bc491c34b33665b1a271a84ad61821b113e6d425b0a2ba8493528a3f05737f6383140a6154473cd8e494bfb3c043dd056 SHA512 7cde192f483d6ce81d74073718efd25e7d5808ea10f89aa1ae0ab4fd9480d3510d4ec633d8a030e16676c28869b2912464a2e46f9e248a54e81e06fc032836fe
+EBUILD kde-gtk-config-5.17.5.ebuild 1387 BLAKE2B b6db22f3d5fb4f5b3d579c7814329036728bdeffed7fe958ee1db24c4a730ac97666935552558558a54efdb9cd85adbd05052c61c8afb2e57adccab62e86df3b SHA512 03d508d7b5b4fad1f4c97a2cd42ca524d6ab5d796d366a465979791f2f1e5e1a79ebd76593a994a94ece4c9524e8952d4c39f86848d476cc0b2fb9de88710e94
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.4.ebuild
index d05a47d6624a..871b2cc9b8a0 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.4.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
 HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.16.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.5.ebuild
index 035a36f90661..a074c2ded7cd 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.16.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.5.ebuild
@@ -1,31 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
 HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	dev-libs/glib:2
 	gnome-base/gsettings-desktop-schemas
 	x11-libs/gtk+:2
@@ -33,7 +37,7 @@ DEPEND="
 	x11-libs/libXcursor
 "
 RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
 src_configure() {
@@ -41,11 +45,11 @@ src_configure() {
 		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 	elog "If you notice missing icons in your GTK applications, you may have to install"
 	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
 	elog "for example."