gentoo resync : 18.11.2019

3 files changed, 40 insertions, 35 deletions

diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index d4c66ce73d02..802f431cf232 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.16.5.tar.xz 1321040 BLAKE2B b8c1e699d23175bc1048233aa589e91c31625f8a93da2b3ade5f71bf410723c853f2b4f0654a78be1f2c7a2350e66a8f932c4c0c7db9bbc2c22ac3ef9ff5b2a6 SHA512 1b98515beac87ff5394c06dd6029a2688db27a900f4c85fd4884d332a20120d553c25b98ae5ccfd7da2e6cbaa866edb84809f49c1c19922f25241acdc9e56832
-DIST kinfocenter-5.17.2.tar.xz 1344056 BLAKE2B e40dc6efc8df24f0c868232fc67e02cdad189d124a3b3460cd1855949306b806c41fe54f8d554ff8da7aa255e7078899641696c1dd6f524b12c1762c81102fb0 SHA512 aeb1b61f2ab198ceeaead3873659df5901740e9bd80f03a34bb955a6c172c0f3f31ba54d51a2b7cc9f827128c4a9161a841eecbb49be2ecde58be62f4319d2d4
-EBUILD kinfocenter-5.16.5.ebuild 2556 BLAKE2B faf8debb2bb55b8d742c620a6daa1dacadf88e1f66b774dfde845bd4a76c52f7130b8ddfd3cf854ca21d1aa8bccc162b0ffca7498fd2995a3becd0901314402d SHA512 bdfb961e33a46ca05cb0530084aa576d92353c676e4726df7ea953545a7b627fb3f65e71d3f64a156a0c7d76541fb1c20f5289d5b7aea0a2df8570f565c4bc92
-EBUILD kinfocenter-5.17.2.ebuild 2559 BLAKE2B 3f11ac44d0cbc64aa532d6da8c500050777a24063bdd6b6aec7e375561d49e85a5884e288acfc9a9a4924acdb8e211332120f3d37b2e99575ccd388f5daad65b SHA512 ed2481b3a29e22a27284a42137ea18f87f9802331956d2de129b66cd0fb2529d5a5a44a141153a61c18a35cd2c78faec038785f1fa4420ca05ddc77b5d9c36f3
+DIST kinfocenter-5.17.3.tar.xz 1340968 BLAKE2B fddd82953d329aa59d4a06a3d98a9cd93cf6e9cf2c74c4b688f1551397e7f8769d15df4536342ad61aad4a6d3d5e663b8fad70a1a4a6d13b52365df8dd3ee5c2 SHA512 92dd4005b995f5e5d88ef7ef796cba8701ac8a2b67b44531686d4a9ed81f4e124c734bf76204d5d869d54a8cd83f510e48e184f3cc78a2a46e1fce1186d935f6
+EBUILD kinfocenter-5.16.5.ebuild 2544 BLAKE2B 004476cf535a5069af198a44f751efb50a64330d272e395326b175ec23f6be920a2bb86f0ff0379901b1829017b735f94530a54d2adc39170944bce61f074ffc SHA512 f2e059b867776864c698591997d5791d935f253633707f88265838587ba56a7075acf11cb680f089f547cf65f16a4d9a7c45ba7989c5c864a2c92a6f987b3e52
+EBUILD kinfocenter-5.17.3.ebuild 2786 BLAKE2B d016eb3a07b6023c200c9c6a1087b8243de0fb0ce7785906da9696b6f26a11a8a256769f0ed85f64ecbb196991845e081d218f585eb9fb0736302cb3df3aca7f SHA512 d43a12f6121632539c586890bf0c6c4b7a7766b3f547e6be61caa3971a942f6bf4388b7494c822adf523453bdc10a59cde404baf7aeb0a19d971d25a5c7d8b91
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.16.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.16.5.ebuild
index 98ff660fe3a6..7c96628820c9 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.16.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.16.5.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Utility providing information about the computer hardware"
-HOMEPAGE="https://kde.org/applications/system/kinfocenter/"
+HOMEPAGE="https://userbase.kde.org/KInfoCenter"
 SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
 KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="gles2 ieee1394 +opengl +pci wayland"
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.17.2.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.17.3.ebuild
index 7bfec63201e8..0d921c3df595 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.17.2.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.17.3.ebuild
@@ -4,57 +4,62 @@
 EAPI=7
 
 CMAKE_MIN_VERSION=3.14.3
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Utility providing information about the computer hardware"
-HOMEPAGE="https://kde.org/applications/system/kinfocenter/"
+HOMEPAGE="https://userbase.kde.org/KInfoCenter"
 SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="gles2 ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	x11-libs/libX11
 	ieee1394? ( sys-libs/libraw1394 )
 	opengl? (
-		$(add_qt_dep qtgui 'gles2=')
+		>=dev-qt/qtgui-${QTMIN}:5[gles2=]
 		media-libs/mesa[gles2?,X(+)]
 		!gles2? ( media-libs/glu )
 	)
 	pci? ( sys-apps/pciutils )
 	wayland? (
-		$(add_frameworks_dep kwayland)
+		>=kde-frameworks/kwayland-${KFMIN}:5
 		media-libs/mesa[egl]
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep plasma)
+	>=kde-frameworks/plasma-${KFMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtquickcontrols2)
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
 src_configure() {
@@ -71,11 +76,11 @@ src_configure() {
 		mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
 	fi
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_install() {
-	kde5_src_install
+	ecm_src_install
 
 	# TODO: Make this fully obsolete by /etc/os-release
 	insinto /etc/xdg
@@ -86,7 +91,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		has_version "net-fs/nfs-utils" || \