gentoo resync : 02.02.2022

4 files changed, 10 insertions, 138 deletions

diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 7b9a006ea2b4..c1e6d984726e 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,8 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
-DIST kinfocenter-5.23.4.tar.xz 1153160 BLAKE2B 8273d69e6e548f5b2b7bc95eca7d9fac204f6dcc1a3f26a1b496da926b241e11c20fa047f449255e3e6d31c61056d44e2b89301c0e6b9851312fb53bcda58962 SHA512 c3fb598ef27dc696d3763b5ca982b17d521999c5ebaa00484dfac120f1eeafaa41adc1694bc6f0cc96388eb56e83b015c80bc94a54af334d5e643730ad4485ae
 DIST kinfocenter-5.23.5.tar.xz 1152396 BLAKE2B f30af8e32a43079cd87b52e5d8180ca58f8d5743fa2f26afbc4f7cf70bbb2260929f7bfc0907d03320ff29fd2440968f14fa8185832052194390bd4581a085e1 SHA512 9cb25087587f3b469178424ee991b1832bed23cabcdfe2fc515fb1824ba618ee0cc7e5cd270f9ca348f90ceac68f5758d0c7d690cc1ae29b5c136995d7a2e684
-EBUILD kinfocenter-5.23.4.ebuild 2862 BLAKE2B 81c0d51c51324740e5bbe76ebfc4043ec076aefc98d602cd5fb0fd6a3d1fd489ac5a9bc452af14231a006e0a8a79f6d36d79c16ebb776b0d9ab5f0be54604dcd SHA512 6b72d7a8e13fb2a64b0b3945c1ac744adc96e9b1401ed87d1306ba58217bdd6606fbfd5457d48f9f6e86dfab57734ad267c602e14dd8ef4fc012f086e46dca51
-EBUILD kinfocenter-5.23.5-r1.ebuild 2637 BLAKE2B 025961f044124e82cdbe64038924ce26986fe1f0127fe424569005c08cb12af9790b5f9ba4a3331215e408e076343ba3c093db1d1c8e9dd25170a9682e37f730 SHA512 b8c082d9cbe4deca38d92b1902197b71ad15befc1d4daa7e7f66d88bcc13367663d9c160ea2c77675705744223a9a72af90d89fdd62a759b6b108898febdeeb3
-EBUILD kinfocenter-5.23.5.ebuild 2786 BLAKE2B f47b235421964bfd928c8842b9b15a86731afb50262e71e0b7915b60ad5b1b172ce808ae3eb8440cced8151128a7c069e9a8c7ef9f1741ceb099fb8cc5993695 SHA512 be7c490f4bf07d54a8d14abe5b9f298aa00d2f8c33c6e46a5a50c1825ab848532796cb0a732f3f661bc79aa9b6f67acf8be24935bcb3c878acc6b27c2e7ff113
+DIST kinfocenter-5.23.90.tar.xz 716256 BLAKE2B bdf567b597128ad87b2d61fb7c7105e8ceb5ddcfbc2d90d404b231d0cd476be15d8f087ddee6c1df71a5231e799a83a46aca1426ff3a3e8539988384cff3b486 SHA512 2988f7d976dd774decbd2af6b0d52513257ee0d2f19e0aa23127d6e9d7d493e02739663599aac64bb9689a756b667998a4851d0fb7f21f93afbc3a972de1c7dd
+EBUILD kinfocenter-5.23.5-r1.ebuild 2634 BLAKE2B c1623eea4c91e02518c856e23dde02442d3291d0f2ea95eaf552a61c42a46075834ca0df6989f475f10078ce051484bf5147432b0a11f9e7baffabe1d89c2e7a SHA512 668f1cb0c59921c542637db62d7b99eaa937e9ad367b4f9db28bfe03997bae0c9dd2768355c757e19f78b9a0c14ec90b0b7cd115ad0dfb821e273a1f0cf080b6
+EBUILD kinfocenter-5.23.90.ebuild 2258 BLAKE2B 9156ebdb8367ca5289a55d6a0acc7723067a1eedc676b34da646966f1f0d86e155e8bb22e64d86a03f8192902155477701538ed3c6dfcd3161530e1ed15be92a SHA512 d4cff756ce138645da74762dbaf037da60cc2b0962b4989c01db17b1e6f3f12e9c36bb097dc1213bb8178a6d8df70b7add4f5a7fca714adc6527b923d5ad9600
 MISC metadata.xml 389 BLAKE2B 7775c88615433812927bd69023ba3943d13b1fadc77d1c8a84f286e0f7b3efdc34d3cd9b877cafcb3ae7ef9c0056c6a39d669baea5875707155d361a6024b1d0 SHA512 dfebb398a78818127260bc03d2e267c3feea4c54f2de6adec01868fceede532764a0f90559b070d4136cb6c1ad8e86cc98d832f340b3a0a687a41b0c354631b0
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.23.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.23.4.ebuild
deleted file mode 100644
index 101c2ca7de15..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.23.4.ebuild
+++ /dev/null
@@ -1,106 +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.86.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_test() {
-	local myctestargs=(
-		-E "smbmountmodeltest"
-	)
-	ecm_src_test
-}
-
-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
-		optfeature "Vulkan graphics API information module" dev-util/vulkan-tools
-		optfeature "advanced CPU information module" sys-apps/util-linux
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.23.5-r1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.23.5-r1.ebuild
index 771923518700..8932c05d294a 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.23.5-r1.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.23.5-r1.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 +X"
 
 REQUIRED_USE="opengl? ( X )"
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.23.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.23.90.ebuild
index 6ff1dc3660ad..dd00438ec4c2 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.23.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.23.90.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.86.0
+KFMIN=5.90.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 inherit ecm kde.org optfeature
@@ -16,9 +16,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"
-IUSE="gles2-only ieee1394 +opengl +pci usb wayland +X"
-
-REQUIRED_USE="opengl? ( X ) wayland? ( || ( opengl gles2-only ) )"
+IUSE="gles2-only usb"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -31,25 +29,13 @@ DEPEND="
 	>=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
@@ -60,20 +46,9 @@ RDEPEND="${DEPEND}
 
 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
 }
 
@@ -95,5 +70,9 @@ pkg_postinst() {
 		optfeature "Vulkan graphics API information module" dev-util/vulkan-tools
 		optfeature "advanced CPU information module" sys-apps/util-linux
 	fi
+	optfeature "Wayland information module" app-misc/wayland-utils
+	optfeature "OpenGL information module" x11-apps/mesa-progs
+	optfeature "PCI devices information module" sys-apps/pciutil
+	optfeature "X Server information module" x11-apps/xdpyinfo
 	ecm_pkg_postinst
 }