gentoo resync : 22.12.2021

3 files changed, 9 insertions, 101 deletions

diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index ee85464583bd..ce29198d5715 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,5 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
-DIST kinfocenter-5.22.5.tar.xz 1170716 BLAKE2B 8e9cefdb426e9635928aa2b81359acc1e8b2113865b18109fa442efa7cd35684fdf911a39c3ce8a43c31afabced6820d6bac6ce31a5c00eb629f6a8462906a7b SHA512 7eaafde6f9a388e9d4cfe9a8f4057c462bf83f9fecdd39fdd96e05f4c5094c1a116bf66a781bba67721e63e8cfd5a8bfb32fb1906392c2acb70263afaa17c560
 DIST kinfocenter-5.23.4.tar.xz 1153160 BLAKE2B 8273d69e6e548f5b2b7bc95eca7d9fac204f6dcc1a3f26a1b496da926b241e11c20fa047f449255e3e6d31c61056d44e2b89301c0e6b9851312fb53bcda58962 SHA512 c3fb598ef27dc696d3763b5ca982b17d521999c5ebaa00484dfac120f1eeafaa41adc1694bc6f0cc96388eb56e83b015c80bc94a54af334d5e643730ad4485ae
-EBUILD kinfocenter-5.22.5.ebuild 2640 BLAKE2B 7c9240900fab2677818ef21f7ed7f467c1b39bc8db8c1fe777f88914f199a2e8609df176c17b2348e331ea8261ba7cc937c4ebb37fcc9ffa9e11750425cdf8cf SHA512 d2bf9570ffb7f759c96d4c42de3cf46ba6061854b9606740fe7c2be3596ddfc4a47e07a9fc0c7ef6964e945738d5413c1e2e7d07812e87ff0b043a51275ecb6a
-EBUILD kinfocenter-5.23.4.ebuild 2786 BLAKE2B c3179132642e7d8b73ed908161e92e37c1870d141e03b251f93f672a03abc39af004a021f00d45e0fd099d91d8a9a3eb06b6c03d3f0ba0e38d9bb56a29c9a4d4 SHA512 805ee119251c41ccd63cac8565094e734fb457c35d3d21df9031444c93e114927a2182737e378b55ba9276d039ef8da87ede0db56bc14cfc4edc99df963b28b4
+EBUILD kinfocenter-5.23.4.ebuild 2862 BLAKE2B 81c0d51c51324740e5bbe76ebfc4043ec076aefc98d602cd5fb0fd6a3d1fd489ac5a9bc452af14231a006e0a8a79f6d36d79c16ebb776b0d9ab5f0be54604dcd SHA512 6b72d7a8e13fb2a64b0b3945c1ac744adc96e9b1401ed87d1306ba58217bdd6606fbfd5457d48f9f6e86dfab57734ad267c602e14dd8ef4fc012f086e46dca51
 MISC metadata.xml 389 BLAKE2B 7775c88615433812927bd69023ba3943d13b1fadc77d1c8a84f286e0f7b3efdc34d3cd9b877cafcb3ae7ef9c0056c6a39d669baea5875707155d361a6024b1d0 SHA512 dfebb398a78818127260bc03d2e267c3feea4c54f2de6adec01868fceede532764a0f90559b070d4136cb6c1ad8e86cc98d832f340b3a0a687a41b0c354631b0
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.22.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.22.5.ebuild
deleted file mode 100644
index 1f8716c3d94a..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.22.5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Utility providing information about the computer hardware"
-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 ~ppc64 ~riscv x86"
-IUSE="gles2-only ieee1394 +opengl +pci usb wayland +X"
-
-REQUIRED_USE="opengl? ( X ) wayland? ( || ( opengl gles2-only ) )"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${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/solid-${KFMIN}:5
-	gles2-only? ( media-libs/mesa[gles2] )
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		media-libs/libglvnd[X?]
-		!gles2-only? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	usb? ( virtual/libusb:1 )
-	wayland? (
-		>=kde-frameworks/kwayland-${KFMIN}:5
-		media-libs/mesa[egl(+)]
-	)
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/systemsettings-${PVCUT}:5
-"
-
-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)
-		$(cmake_use_find_package X X11)
-	)
-
-	if has_version "dev-qt/qtgui[gles2-only]"; then
-		mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
-	else
-		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
-	fi
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# TODO: Make this fully obsolete by /etc/os-release
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "NFS information module" net-fs/nfs-utils
-		optfeature "Samba status information module" net-fs/samba
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.23.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.23.4.ebuild
index 8c0e917a1080..101c2ca7de15 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.23.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.23.4.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="gles2-only ieee1394 +opengl +pci usb wayland +X"
 
 REQUIRED_USE="opengl? ( X ) wayland? ( || ( opengl gles2-only ) )"
@@ -77,6 +77,13 @@ src_configure() {
 	ecm_src_configure
 }
 
+src_test() {
+	local myctestargs=(
+		-E "smbmountmodeltest"
+	)
+	ecm_src_test
+}
+
 src_install() {
 	ecm_src_install