gentoo resync : 12.05.2022

4 files changed, 11 insertions, 30 deletions

diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 6fe52b693cad..0c87ab1d1563 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.23.5.tar.xz 1152396 BLAKE2B f30af8e32a43079cd87b52e5d8180ca58f8d5743fa2f26afbc4f7cf70bbb2260929f7bfc0907d03320ff29fd2440968f14fa8185832052194390bd4581a085e1 SHA512 9cb25087587f3b469178424ee991b1832bed23cabcdfe2fc515fb1824ba618ee0cc7e5cd270f9ca348f90ceac68f5758d0c7d690cc1ae29b5c136995d7a2e684
 DIST kinfocenter-5.24.4.tar.xz 719404 BLAKE2B fb79a2c3ab6b6a7d7411a3c601b5e7e32b9c09e153baf15a76ff562570016b8d981f717f1866b5e23293537f85bc79ba335291751be7460dc0ed1700291739a3 SHA512 91fffdeb61e2dc67ab2abee6b1f0db9e7a9dcbd71005f27d644d654dbcd806e60fb1a4a54530477fb9a1eb91cea006a05575c4dc3e9461e8b8f18830d957f187
-EBUILD kinfocenter-5.23.5-r1.ebuild 2634 BLAKE2B c1623eea4c91e02518c856e23dde02442d3291d0f2ea95eaf552a61c42a46075834ca0df6989f475f10078ce051484bf5147432b0a11f9e7baffabe1d89c2e7a SHA512 668f1cb0c59921c542637db62d7b99eaa937e9ad367b4f9db28bfe03997bae0c9dd2768355c757e19f78b9a0c14ec90b0b7cd115ad0dfb821e273a1f0cf080b6
-EBUILD kinfocenter-5.24.4.ebuild 2259 BLAKE2B 4870f4a79fcca18503288a19f6e9ea6562deb82b2c49b17a6d70c43b89f9afd730e8296daf98787153730ff23b1cc5fb3b9b4ec1ce62893c7d567abee72981f9 SHA512 50ade075252c619f5a5b42c8359c721867142b454fcd0d34238d4d3b519e51cf9f6b820b6b76a1614a360c8e7cac4189f9792fc6ef36f7630b3aa6ef5a7a80ab
-MISC metadata.xml 389 BLAKE2B 7775c88615433812927bd69023ba3943d13b1fadc77d1c8a84f286e0f7b3efdc34d3cd9b877cafcb3ae7ef9c0056c6a39d669baea5875707155d361a6024b1d0 SHA512 dfebb398a78818127260bc03d2e267c3feea4c54f2de6adec01868fceede532764a0f90559b070d4136cb6c1ad8e86cc98d832f340b3a0a687a41b0c354631b0
+DIST kinfocenter-5.24.5.tar.xz 719404 BLAKE2B 49ac1db6f1e98fdd2575f43891ebb27448f211d61d811496f4a54170806ed2df80211f7248bec093e45855625b3ba6f768ec66b070b196de9452205b632fbbcf SHA512 598d7993808ac6f32ae89c2a50624caf81c4d7a355ae155469d79fda923d3bcd4256077863186a42d594ddd36c06ffb5c3fd02987cf638b2bc88dffdb9b47883
+EBUILD kinfocenter-5.24.4.ebuild 2256 BLAKE2B 173f95f1b91d4d31be1e1ddb0d48a0fb0026bdc4d63159b5e7aae5e76bfc7f6bd5e48603f4854d7e7307940f7a8d71eceb4c12a0bf86c31def7ba3f453f77c7b SHA512 96ca6c69890ef04c3af536f66c3570c9616ff402cf348b98ced451315ad26c8c27f0efc027cb0a7e8c5592a5b0ef63758b8cf35f344e6eabda62ec5a617d6cbf
+EBUILD kinfocenter-5.24.5.ebuild 2259 BLAKE2B 4870f4a79fcca18503288a19f6e9ea6562deb82b2c49b17a6d70c43b89f9afd730e8296daf98787153730ff23b1cc5fb3b9b4ec1ce62893c7d567abee72981f9 SHA512 50ade075252c619f5a5b42c8359c721867142b454fcd0d34238d4d3b519e51cf9f6b820b6b76a1614a360c8e7cac4189f9792fc6ef36f7630b3aa6ef5a7a80ab
+MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.24.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.24.4.ebuild
index ecad66875ea1..b08d48776b71 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.24.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.24.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 usb"
 
 DEPEND="
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.23.5-r1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild
index 8932c05d294a..ecad66875ea1 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.23.5-r1.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.24.5.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
@@ -15,10 +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 ~riscv x86"
-IUSE="gles2-only ieee1394 +opengl +pci usb +X"
-
-REQUIRED_USE="opengl? ( X )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gles2-only usb"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -31,21 +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 )
-	X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
@@ -56,18 +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 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
 }
 
@@ -90,5 +71,8 @@ pkg_postinst() {
 		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/pciutils
+	optfeature "X Server information module" x11-apps/xdpyinfo
 	ecm_pkg_postinst
 }
diff --git a/kde-plasma/kinfocenter/metadata.xml b/kde-plasma/kinfocenter/metadata.xml
index 40dfec7815b2..d925f2439758 100644
--- a/kde-plasma/kinfocenter/metadata.xml
+++ b/kde-plasma/kinfocenter/metadata.xml
@@ -8,7 +8,4 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
-	<use>
-		<flag name="pci">Show advanced PCI information</flag>
-	</use>
 </pkgmetadata>