gentoo resync : 01.08.2021

3 files changed, 2 insertions, 101 deletions

diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index c7f170799c34..226978cff84a 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.21.5.tar.xz 1304704 BLAKE2B e63d261bd57f69f3941c670f7d4e45428959544f15187829a704a240706bc04a65dad4bbfeca32444050abb1a5a8c50ccb9365d261cf71149498d1ca408bb77d SHA512 2becdd6f6be00de309467fee1478bec75bc6fa7d8d233b0a5bc8e6124f780add705d549209c842c3cd621bc8931a8ecdecb5a2902ab369bcd476939580bec41a
-DIST kinfocenter-5.22.3.tar.xz 1163596 BLAKE2B 6f06e31189109009873cf71716ee3e3fb3cb6dce246d133fee224d2739ebb40441af72d1e7e5b18078a61aecc9d56d00f82140d64bc43e0e1fe89ee824144ccb SHA512 2b33573ff3091167175df7ecb907df9c43d720dbf0776a65126f028d093cc330d887554b37c8e1e99e8f24f75e7552ec154830fe10c61ba52617acd6cd960bd0
 DIST kinfocenter-5.22.4.tar.xz 1164096 BLAKE2B ad384dfdf35c237075e2e25ac08eea1fafcfabb3bd28f72a452ff9a770577f416af52564aad9911e4d1282988512889864f20abd7f1a27e15c35f55d9d7a2953 SHA512 cb48dbe47e8d65441ba59fa1617a685218482a13099dc83667a37cfa512e0db2f0dbb954e26055926dede8ec52eebfe60312471b735b3abd1f229c3286979b14
 EBUILD kinfocenter-5.21.5.ebuild 2536 BLAKE2B cf5f5a7b0b5a934a88790f0ab564f1a0398bfe4ca94369aa1c0756e7e9846784175a0835f8062fc29ded31bb2c7254a44e47a9795ee129e07e0ff2e428641e4d SHA512 31c09305eb04dbcdd90b9c5436ce5175024ab6649085bf6f0f825bd48646ca119b6ffd86a5fddb897dc055a3c47d17bb07bfa369ea25a76aac80cf3bad0440ab
-EBUILD kinfocenter-5.22.3.ebuild 2607 BLAKE2B 807490cc08ade274e90bd2b324887fbb1de1886367071de479d937076765d42c732d8c4f94ce140cc920eadd8e664d92c11be8394ae3779e1231493560c7f729 SHA512 4dd529cdd2030276bcf201c27af789ff423b37a3918e8e8bef72c506483942fd2365ac913a48eff3a982054e49e1964c1b3c33847c3bf29148c801dadb3f141b
-EBUILD kinfocenter-5.22.4.ebuild 2607 BLAKE2B 807490cc08ade274e90bd2b324887fbb1de1886367071de479d937076765d42c732d8c4f94ce140cc920eadd8e664d92c11be8394ae3779e1231493560c7f729 SHA512 4dd529cdd2030276bcf201c27af789ff423b37a3918e8e8bef72c506483942fd2365ac913a48eff3a982054e49e1964c1b3c33847c3bf29148c801dadb3f141b
+EBUILD kinfocenter-5.22.4.ebuild 2610 BLAKE2B 33bd9f09edf507019337383c02d61580bed4b72c44465f4806d5e30215cb8ab03f9e7744dd3cdf9ed1e1b8bfcbf0b655e2bbb723ef2e356d94ba2c02bc19823e SHA512 92865b06b3411bf16ba20e3d61711d8acf640db6004f6f960c290c16682e38880ea0809b82a2e9174c50a25d6f9fd16174fc033579a5543b32dba1e57c28f0a3
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.22.3.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.22.3.ebuild
deleted file mode 100644
index 56856fb3a329..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.22.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~x86"
-IUSE="gles2-only ieee1394 +opengl +pci usb wayland"
-
-REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
-
-BDEPEND=">=dev-util/cmake-3.14.3"
-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
-	x11-libs/libX11
-	gles2-only? ( media-libs/mesa[gles2] )
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		media-libs/mesa[X(+)]
-		!gles2-only? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	usb? ( virtual/libusb:1 )
-	wayland? (
-		>=kde-frameworks/kwayland-${KFMIN}:5
-		media-libs/mesa[egl]
-	)
-"
-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)
-	)
-
-	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.22.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.22.4.ebuild
index 56856fb3a329..40532f2226fb 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.22.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.22.4.ebuild
@@ -49,7 +49,7 @@ DEPEND="
 	usb? ( virtual/libusb:1 )
 	wayland? (
 		>=kde-frameworks/kwayland-${KFMIN}:5
-		media-libs/mesa[egl]
+		media-libs/mesa[egl(+)]
 	)
 "
 RDEPEND="${DEPEND}