gentoo resync : 15.06.2021

3 files changed, 10 insertions, 12 deletions

diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 0e8afd7b9181..430fe2dc28ca 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.20.5.tar.xz 1286404 BLAKE2B 3420e9d73e5cf73c91733fb3c72a4315db577ef5248e11036c4a6bdb1e897deb5983276ef903c25664ceba549cbad12bff2b6e6951abc90fbca0cc97e42c60ae SHA512 c7d2eb7307682f7bdc8ac22d1905dcc8bab0e258ee5f3458c4f40e43fee4d14ecd6b423f4357b338e05924db93d7c9914d3c36756620aac9fc6d0897ea4e5a90
 DIST kinfocenter-5.21.5.tar.xz 1304704 BLAKE2B e63d261bd57f69f3941c670f7d4e45428959544f15187829a704a240706bc04a65dad4bbfeca32444050abb1a5a8c50ccb9365d261cf71149498d1ca408bb77d SHA512 2becdd6f6be00de309467fee1478bec75bc6fa7d8d233b0a5bc8e6124f780add705d549209c842c3cd621bc8931a8ecdecb5a2902ab369bcd476939580bec41a
-EBUILD kinfocenter-5.20.5.ebuild 2691 BLAKE2B 986fa3655c926cb93446e8b9195d0b43f4184e721dbc15911c877a242ce34c8078ed82cc3fc31e01eea0931adc33c522d97c045b137194518641a126e4370372 SHA512 5cf14c0d3259d0d05b957a553aa7c9158eabc6250815810bff1a66e292f2983a0f0464ec9fa75eb66191f0733732d602011b4853943ee41f5c4aa7cf45ef5b71
-EBUILD kinfocenter-5.21.5.ebuild 2539 BLAKE2B a29663fe6c17f8ec61919fed251ef9f8cd7ec0c5156d821a27596ce14b1beda233d27e979223ef5145ba8e76c494094a71c4be64579e3874f2d882e86bb9b6c9 SHA512 8b37737dbde1fc4b3b967cdf5a9cb0055a0247877fe56e612434032bdf032e901fec0321f44defbdef07390d3e9e082fe9ae0731fd747bcdb30d8c90de584b7a
+DIST kinfocenter-5.22.0.tar.xz 1162588 BLAKE2B d6b26d7e63af57c9f37202cec60861b89e58443631ab11215868c7b019e59211711e2f142f5275e3ba17d458bbe296d915f4a9a704311a36525f748771a1dae8 SHA512 ae5754d8c0054b35f78c14e54177480df9271dfcea80d72ecf8da7d89ea5dc9ff57964d88ab64cc15811cf4a15ffe0e5a7b4e186c5a1c1385167d1bc0653fdf1
+EBUILD kinfocenter-5.21.5.ebuild 2536 BLAKE2B cf5f5a7b0b5a934a88790f0ab564f1a0398bfe4ca94369aa1c0756e7e9846784175a0835f8062fc29ded31bb2c7254a44e47a9795ee129e07e0ff2e428641e4d SHA512 31c09305eb04dbcdd90b9c5436ce5175024ab6649085bf6f0f825bd48646ca119b6ffd86a5fddb897dc055a3c47d17bb07bfa369ea25a76aac80cf3bad0440ab
+EBUILD kinfocenter-5.22.0.ebuild 2607 BLAKE2B 807490cc08ade274e90bd2b324887fbb1de1886367071de479d937076765d42c732d8c4f94ce140cc920eadd8e664d92c11be8394ae3779e1231493560c7f729 SHA512 4dd529cdd2030276bcf201c27af789ff423b37a3918e8e8bef72c506483942fd2365ac913a48eff3a982054e49e1964c1b3c33847c3bf29148c801dadb3f141b
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
index 2321b8e4c6db..34faa34418d0 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="gles2-only ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.20.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.22.0.ebuild
index 80e318f9a816..56856fb3a329 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.20.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.22.0.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org optfeature
 
 DESCRIPTION="Utility providing information about the computer hardware"
@@ -15,8 +15,8 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="gles2-only ieee1394 +opengl +pci wayland"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only ieee1394 +opengl +pci usb wayland"
 
 REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
 
@@ -27,12 +27,9 @@ DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=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
@@ -40,7 +37,6 @@ DEPEND="
 	>=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
 	x11-libs/libX11
 	gles2-only? ( media-libs/mesa[gles2] )
@@ -50,6 +46,7 @@ DEPEND="
 		!gles2-only? ( media-libs/glu )
 	)
 	pci? ( sys-apps/pciutils )
+	usb? ( virtual/libusb:1 )
 	wayland? (
 		>=kde-frameworks/kwayland-${KFMIN}:5
 		media-libs/mesa[egl]
@@ -66,6 +63,7 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package ieee1394 RAW1394)
 		$(cmake_use_find_package pci PCIUTILS)
+		$(cmake_use_find_package usb USB1)
 		$(cmake_use_find_package wayland EGL)
 		$(cmake_use_find_package wayland KF5Wayland)
 	)