gentoo resync : 18.11.2018

3 files changed, 3 insertions, 99 deletions

diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 76ba59ef01b4..8b936661f07d 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,9 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
-DIST kinfocenter-5.12.7.tar.xz 1286660 BLAKE2B fd1548666a9f47e6bcb168942ff9071c16dfc1095434bdee4a3626bc04bd64d89b75cb7bcff4e085fb52125b84faf4acd1cd2c7812dfcb18970a462245a1333e SHA512 440e1d9c6be280fee95681148f6f9c069529431f3367fd5938663afa840cd191c85fd995b9a0a4fb6ae143d2c74415cafcfc99e4a7d7e25dc99fdd3820608f9b
 DIST kinfocenter-5.13.5.tar.xz 1286000 BLAKE2B d8e9278f3c7214e13403970e86ac72f5cad3ed2506752c297860d91f26e986b6bce806a7498b78e4517b8d6c8a0ff31e2d2b6f0117babb93839dc8c923cf6bbd SHA512 a54b3ef5df1855f3002965f70c2e627ddc0b1e69eaa36461da1018b9ffd6e033ca61c4890a358ddc22f6f9e66cab5cdbaa1ff5386dda29fe87248f8af5567e50
-DIST kinfocenter-5.14.2.tar.xz 1316660 BLAKE2B 8a6905531cc856e4e1f5aa084eb88c4edd76bf5a20749be0b6a5a8df96638a933207f8c19f7febd229a62d7fe1b48387fc9702df8fa4f8426a17ae28a1eef3c9 SHA512 562c4227cee6e0136a095f8807c5e143299353fb9a241f8bbf4e5048e2a30f780c6a75056cef5bf4b8e6418cd96e4e229181f7a13dd5d80ec92a98b15e90b806
-EBUILD kinfocenter-5.12.7.ebuild 2455 BLAKE2B d028ed2f3ceac90a7fc5c9fac8465980356d6fb655e0a4ecf635cbf647e6cef749ef7412bca9b7d296277946f8d5cdc16668c9cb06f2c75565c3fe4f8acc515d SHA512 93e2599d146225d551af8ac2e23368a4d6f06aec8d37f1528627246bc45b58e12741a84d08f9553b279311e86754014fcfb93617bd1e99be10e3ce33fa66ae2d
+DIST kinfocenter-5.14.3.tar.xz 1322480 BLAKE2B 447de617a858fee4cb807cf776a945207387317c5e8be6cc41c445f3ea8647620ab30b2495d26c3446ace3447fb3693e6ed7e385874bca34b8118658bca608c1 SHA512 6d07299cb2145cfe172dc79cfe849b03000fe770e397fd050b053b2f40f09dec5d5ffa9336223320597b965a0c612c0b09333e20fb54c3edb41773d473f9998a
 EBUILD kinfocenter-5.13.5.ebuild 2453 BLAKE2B f25ded49a6e6b230af09002afccc09562c98fad9d87ebd7853968325ea9951aa065b1c21358c3b4aad4aa1eca0a18e9a07659bebd78e7c22ac57c528e483a57c SHA512 9547588cfeab947f5f15b26d713b4c3c438de7aaae9c0ff1ac956b68a580a41e7c8efdb30c845311f739e240d8119f3f9ef8cc4cd688bdb6359e8848407841b7
-EBUILD kinfocenter-5.14.2.ebuild 2455 BLAKE2B d028ed2f3ceac90a7fc5c9fac8465980356d6fb655e0a4ecf635cbf647e6cef749ef7412bca9b7d296277946f8d5cdc16668c9cb06f2c75565c3fe4f8acc515d SHA512 93e2599d146225d551af8ac2e23368a4d6f06aec8d37f1528627246bc45b58e12741a84d08f9553b279311e86754014fcfb93617bd1e99be10e3ce33fa66ae2d
+EBUILD kinfocenter-5.14.3.ebuild 2486 BLAKE2B 29066ef7f8728450df3f929701b81e5969b54e9c02849f60785442455b3389c95246d6d1d5ae6c27a476543b0972a7daa04ee7da44c701e5fe6c03addc6cf60e SHA512 8ecb8f56cc56b69bc1990a021c22c9be003c9a3afefa7c4ce105b8639b2d27a1da723c84079c2729a017fa0bab8cbac01b92a592508a8df744146f8c0d324517
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.14.2.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.14.2.ebuild
deleted file mode 100644
index 215d99985102..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.14.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="A utility that provides information about a computer system"
-HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-KEYWORDS="~amd64 ~arm ~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)
-	x11-libs/libX11
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		$(add_qt_dep qtgui 'gles2=')
-		media-libs/mesa[gles2?]
-		!gles2? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	wayland? (
-		$(add_frameworks_dep kwayland)
-		media-libs/mesa[egl]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep plasma)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-apps/kcontrol:4
-	!kde-misc/about-distro
-	!kde-plasma/kinfocenter:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package ieee1394 RAW1394)
-		$(cmake-utils_use_find_package pci PCIUTILS)
-		$(cmake-utils_use_find_package wayland EGL)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	if has_version "dev-qt/qtgui[gles2]"; then
-		mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) )
-	else
-		mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
-	fi
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	if ! has_version "net-fs/nfs-utils"; then
-		elog "Installing net-fs/nfs-utils will enable the NFS information module."
-	fi
-	if ! has_version "net-fs/samba"; then
-		elog "Installing net-fs/samba will enable the Samba status information module."
-	fi
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.12.7.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.14.3.ebuild
index 215d99985102..962d97c0f61a 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.12.7.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.14.3.ebuild
@@ -53,6 +53,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
+	$(add_qt_dep qtquickcontrols)
 	!kde-apps/kcontrol:4
 	!kde-misc/about-distro
 	!kde-plasma/kinfocenter:4