gentoo auto-resync : 13:10:2022 - 01:41:21

22 files changed, 39 insertions, 556 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 51fe3578bb53..7f322e312fb4 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index fec1854ae8ca..e4fc8d65a51f 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -23,5 +23,5 @@ EBUILD blender-3.2.0.ebuild 12656 BLAKE2B 99a1dac1a65ffb9001cc3b5708e1b2aaaca1d0
 EBUILD blender-3.2.1.ebuild 12660 BLAKE2B 4b898ea0493ef82750ea0c3a2cec91e7c9b35400aa998f7d1ce694b4483ac2174e6e207d7ab26779112fda2b01d96395ba15d31f6273251fbae8e50c2e5f2fd8 SHA512 6cf2db910ac26163f7045dbf9f37e1ada226d812912f3169ed205bae5e457bba697764ff58276d2265c636bffde4e75f34b756a4b1669cb49be1ee5fb77a5c98
 EBUILD blender-3.2.2.ebuild 13211 BLAKE2B 769a50f1aec4f42fe08a6d34e2a9cf48e9689e128607e234f05323e9a397211844cafd57e0b74b2166efc888554f928b28ac6137a68e87d0b415ae2fd30e4226 SHA512 0cd806a36f5e108a7834b97cd842919d3ad86ee76ba9439a78b7dd181beba6384e28a60ccbae6cce5dd397e8cd5d6f830816f0e324bd5c37848c2c1be3f6c0ee
 EBUILD blender-3.3.0.ebuild 13174 BLAKE2B 0decb5d9a939094101b0572d154777236e07d451bf40f0e2c178fbe10b3b5d21065b046555673c11c30d9ded1f3971fc995ee6b3547a5051b15f0d32b3c8d050 SHA512 e4df8aa24b9d8054979f69cb39394cdd68cea82141cbd52867761e956bb6e59db2cca692088dd898e5a28360f795f94efb27e664f88b666cc3bf57e7f490fb92
-EBUILD blender-9999.ebuild 12904 BLAKE2B 8fa7f44b796dc1fd162c401b96a20a7313e8de0aa16eacf1f4ab85cde0f0614faefe8195c0db052016ae588526ff7fce2b1ce473d1fc7ff521a32d65d283f196 SHA512 7f50e267c69e5f2211d208c202d04b9f9578f907ac7a9f4c79cb4cc231e0cf2e77bc0a058c0d3b0b9d9cb5cfa7b455a83ac333a1ccee880cea74a48dd4372e54
+EBUILD blender-9999.ebuild 13307 BLAKE2B f521c4117fd5e2c597b20b8e2751dde55bdf13ecd6f8f8bb4fc77d22a98c80a5c2ed57a6496f3c56101d7129d30eeb064720557d17e3a9bda36ff51b6e68d2c0 SHA512 c8ad0fc445caca570f59d93c6bb7152d97b1e2bbfbdcb50ba89dced13582bdc960e68ace57a70eb6980a4dd263be287f137b6ccb5a92cec99e7029f7e3528ca9
 MISC metadata.xml 3083 BLAKE2B 6ba639c8ecc383f3ebf51eaf9a3c323d1154868647317c084fd374512e99bcb3a91496e54079d3ec6b41167043529eac95c263240602bf13e0cf2627e65bec27 SHA512 41d73d22d9f35d17cabc45a1784901ce1c5596c791abc6f828590ce886f7ab17491304e49614df8506cef0dc7bd732899cb945e53a0c57d302fc3480e91e04a0
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index f903ad6cd28b..f89499ab68c2 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -26,10 +26,10 @@ SLOT="${PV%.*}"
 LICENSE="|| ( GPL-3 BL )"
 IUSE="+bullet +dds +fluid +openexr +tbb \
 	alembic collada +color-management cuda +cycles \
-	debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
+	debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k \
 	man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
 	+openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
-	test +tiff valgrind"
+	test +tiff valgrind wayland X"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -70,11 +70,6 @@ RDEPEND="${PYTHON_DEPS}
 	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? ( dev-libs/gmp )
-	!headless? (
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
 	jack? ( virtual/jack )
 	jemalloc? ( dev-libs/jemalloc:= )
 	jpeg2k? ( media-libs/openjpeg:2= )
@@ -106,6 +101,18 @@ RDEPEND="${PYTHON_DEPS}
 	tbb? ( dev-cpp/tbb:= )
 	tiff? ( media-libs/tiff )
 	valgrind? ( dev-util/valgrind )
+	wayland? (
+		>=dev-libs/wayland-1.12
+		>=dev-libs/wayland-protocols-1.15
+		>=x11-libs/libxkbcommon-0.2.0
+		media-libs/mesa[wayland]
+		sys-apps/dbus
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
 "
 
 DEPEND="${RDEPEND}
@@ -124,6 +131,9 @@ BDEPEND="
 		dev-texlive/texlive-latexextra
 	)
 	nls? ( sys-devel/gettext )
+	wayland? (
+		dev-util/wayland-scanner
+	)
 "
 
 blender_check_requirements() {
@@ -227,10 +237,15 @@ src_configure() {
 		-DWITH_CYCLES_STANDALONE_GUI=OFF
 		-DWITH_DOC_MANPAGE=$(usex man)
 		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GHOST_WAYLAND=$(usex wayland)
+		-DWITH_GHOST_WAYLAND_DBUS=$(usex wayland)
+		-DWITH_GHOST_WAYLAND_DYNLOAD=OFF
+		-DWITH_GHOST_WAYLAND_LIBDECOR=OFF
+		-DWITH_GHOST_X11=$(usex X)
 		-DWITH_GMP=$(usex gmp)
 		-DWITH_GTESTS=$(usex test)
 		-DWITH_HARU=$(usex pdf)
-		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON)
 		-DWITH_INSTALL_PORTABLE=OFF
 		-DWITH_IMAGE_DDS=$(usex dds)
 		-DWITH_IMAGE_OPENEXR=$(usex openexr)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 04fd50c8e26a..6f92dc317c38 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,8 +1,4 @@
-AUX digikam-7.3.0-cmake.patch 4316 BLAKE2B 7da300081ad72f6a3c1f5dc4c5c04bbc67d5cc2b2a876dfe0c72dddde19274060c9f4fb8e723a9ebf023dbd1d7993ccfa96426a26ffd4bd736213a96058ad4df SHA512 a326826ff291e9facae55ad3bbc03e5d7173437c9b9734e3b48a5eb6c18ed2f3e1afcb44a3c0f3a2b77fb67f6d414da1dc03992fa9f70d7307e5864d66e2fff3
-AUX digikam-7.5.0-akonadi-22.04.0.patch 906 BLAKE2B 962e53ffd27428f41ee998b9bd6d94b4541d8f9d66e1e9005b071d8a6fc2250cd0f8cadd2685467c26d76f664dec98fcb0ce8737612d06bb57799097688be08a SHA512 44f33f77b327f384764d74aade0567560f2f8cf34f53a9391da42ade06b08d9edc858c8b48cb0f2677dce8fa195e31d866585ee287a49a765d3fd2f8d5ed3c41
 AUX digikam-7.8.0-cmake.patch 4066 BLAKE2B 3f18ad5c25629cf7f32ced42c55875e3158a68083c28ca70c5b6a32795117339aebf930753f82ad21cc57990d4a0f030f39583a7b318433e3feb47ed1c4a3ddd SHA512 83626bdeacb91afd069ce4b9023f4a62154a53b2de569fb24286153fd5083a1970e3b34d37abae61ed77928d9f22bde84622ad67fd8659fefd105c1c15ed34d0
-DIST digiKam-7.5.0.tar.xz 339573688 BLAKE2B 26014564e9f9d44db65d4588924da2c85897fb514df0a963f51b9fddb1f26ce3ddf18856b2d4b0eb140581ee7948f048986cf79687a31730e29017b5a811a3d6 SHA512 a2f5005b8f8b8cd9ef58a6bd563481a95004fbad7110d13f1ec4d8550311f1765410dda54f5b04c91bde7ec089e145656961c7c70b27242931e78abd698763e9
 DIST digiKam-7.8.0.tar.xz 345431764 BLAKE2B 43fff59b51b98a04ca852cadedafc2792aafa5cf9e90f1ce0ad6174533844c7164e72b623a253d42fc4ea695fa7e4bd6cc954287ac72a35211f9fa564a13cb92 SHA512 d2ec96239760cc06808a73bcbf1a2131653764719d1e23afa8cea8eda449e221b177f2a96ca2a997d1c82a6a4977c4227165c932bdd006d5305cdb4c63f454fc
-EBUILD digikam-7.5.0.ebuild 4078 BLAKE2B 61a01480bb6d12cc15954aa666b43b67578d126ed8e0891e4247291951a3a1ddd110afe24fb14b7848141757c19c7622ae2ac22276fc7d5ea0c62ffe956f5ba3 SHA512 5e8807b8be15cbfc0bef84c54ae9719886dd7b1f54b9a9fcf4075cb5d2a191410ff4ac1ade6324e9c76de1fe4a28715fddea77e1fe6445266145a801162c5255
-EBUILD digikam-7.8.0-r1.ebuild 4058 BLAKE2B 553ca6fde4372bd2f249d663951aaeb7d0ac7237186659c3377c1fdb094e8c3b237b652b7b88cb7e58df8a6859526f46879569f339821ea205557aff027f9074 SHA512 0490b7a4edfe099170004d012c3d9cfc342cafbc5d71873c9d7f5e87ff9d28963d4b5a742f9829c1401a6e78879584397ecaf6eeaf1c48af207f231eea483d4a
+EBUILD digikam-7.8.0-r1.ebuild 4057 BLAKE2B 6cc4aae9262c6b37ee43232381ac9f4d315ab4a3dcf3bced082e72c89fa37c7474ed89d76bd4792ef97b418ab7c55cfbdcf35d3957c265a5941ba6fa08d813fc SHA512 a6c123b07df47447d18795db198e9b9f9ae85e557326b7b75a23e56a58ab704c294c88948680c8af0f84fec34e92ed6e2f0788173394eb29b93ccfe2583d46db
 MISC metadata.xml 1166 BLAKE2B 022418e3ce42ac9ec248d5301d20786cd3ddedac61e85b934d9074d9e68fa9511720976620ae84dc2def3961fba307fa9c9d84e5bd90896da7b866b21dfbf7f9 SHA512 1e249e12495dcf72e0eb02f9fa7822112afba627a0b155a2188c382e69a3697cd186757484cd0f559a2985a83ace953a62cbb4e0afb4a6c9551d89053321b3c1
diff --git a/media-gfx/digikam/digikam-7.5.0.ebuild b/media-gfx/digikam/digikam-7.5.0.ebuild
deleted file mode 100644
index 1db410616c22..000000000000
--- a/media-gfx/digikam/digikam-7.5.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.88.0
-QTMIN=5.15.2
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	if [[ ${PV} =~ beta[0-9]$ ]]; then
-		SRC_URI="mirror://kde/unstable/${PN}/"
-	else
-		SRC_URI="mirror://kde/stable/${PN}/${PV}/"
-	fi
-	SRC_URI+="digiKam-${PV/_/-}.tar.xz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
-
-# bug 366505
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[mysql?]
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-gfx/exiv2-0.27:=[xmp]
-	media-libs/lcms:2
-	media-libs/liblqr
-	media-libs/libpng:0=
-	>=media-libs/opencv-3.3.0:=[contrib,contribdnn]
-	media-libs/tiff:0
-	virtual/jpeg:0
-	addressbook? (
-		>=kde-apps/akonadi-contacts-19.04.3:5
-		>=kde-frameworks/kcontacts-${KFMIN}:5
-	)
-	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	heif? ( media-libs/x265:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	lensfun? ( media-libs/lensfun )
-	marble? (
-		>=dev-qt/qtconcurrent-${QTMIN}:5
-		>=kde-apps/marble-19.04.3:5
-		>=kde-frameworks/kbookmarks-${KFMIN}:5
-	)
-	mediaplayer? (
-		media-libs/qtav[opengl(+)]
-		media-video/ffmpeg:=
-	)
-	opengl? (
-		>=dev-qt/qtopengl-${QTMIN}:5
-		virtual/opengl
-	)
-	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-	scanner? ( >=kde-apps/libksane-19.04.3:5 )
-	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	mysql? ( virtual/mysql[server(+)] )
-	panorama? ( media-gfx/hugin )
-"
-BDEPEND="
-	sys-devel/gettext
-	panorama? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-7.3.0-cmake.patch"
-	# upstream git master
-	"${FILESDIR}/${P}-akonadi-22.04.0.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF # bug 698192
-		-DENABLE_APPSTYLES=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		-DENABLE_QWEBENGINE=ON
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		$(cmake_use_find_package calendar KF5CalendarCore)
-		$(cmake_use_find_package gphoto2 Gphoto2)
-		$(cmake_use_find_package heif X265)
-		$(cmake_use_find_package imagemagick ImageMagick)
-		$(cmake_use_find_package lensfun LensFun)
-		$(cmake_use_find_package marble Marble)
-		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-		$(cmake_use_find_package mediaplayer QtAV)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_INTERNALMYSQL=$(usex mysql)
-		$(cmake_use_find_package opengl OpenGL)
-		$(cmake_use_find_package panorama KF5ThreadWeaver)
-		$(cmake_use_find_package scanner KF5Sane)
-		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/digikam/digikam-7.8.0-r1.ebuild b/media-gfx/digikam/digikam-7.8.0-r1.ebuild
index 009c5c38aa12..27e1478148f2 100644
--- a/media-gfx/digikam/digikam-7.8.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-7.8.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 		SRC_URI="mirror://kde/stable/${PN}/${PV}/"
 	fi
 	SRC_URI+="digiKam-${PV/_/-}.tar.xz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
diff --git a/media-gfx/digikam/files/digikam-7.3.0-cmake.patch b/media-gfx/digikam/files/digikam-7.3.0-cmake.patch
deleted file mode 100644
index 2b580f92a1cc..000000000000
--- a/media-gfx/digikam/files/digikam-7.3.0-cmake.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 370308fb8381b55e7ebfcdd77f1361b49a288f88 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 17 Feb 2019 23:51:03 +0100
-Subject: [PATCH] Un-break optional Qt5/KF5 detection
-
----
- core/CMakeLists.txt | 58 ++++++++++++++++-----------------------------
- 1 file changed, 20 insertions(+), 38 deletions(-)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 16bba83335..b8cdc59baa 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -65,17 +65,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
- )
- 
- if(ENABLE_QWEBENGINE)
--    find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebEngineWidgets)
-+    find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
- else()
--    find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebKitWidgets)
-+    find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
- endif()
- 
--find_package(Qt5 ${QT_MIN_VERSION}
--             OPTIONAL_COMPONENTS
--             DBus
--             OpenGL
--             XmlPatterns                # For Rajce plugin
--)
-+find_package(Qt5DBus ${QT_MIN_VERSION})
-+find_package(Qt5OpenGL ${QT_MIN_VERSION})
-+find_package(Qt5XmlPatterns ${QT_MIN_VERSION}) # For Rajce plugin
- 
- if(ENABLE_DBUS)
-     if(NOT Qt5DBus_FOUND)
-@@ -86,16 +83,11 @@ endif()
- # Dependencies For unit tests and CLI test tools
- 
- if(BUILD_TESTING)
--    find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
--                 NO_MODULE COMPONENTS
--                 Test
--    )
--
--    find_package(Qt5 ${QT_MIN_VERSION}
--                 QUIET
--                 OPTIONAL_COMPONENTS
--                 Qml WebView  # Optional, for 'sialis' O2 library test tool.
--    )
-+    find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
-+    
-+    # Optional, for 'sialis' O2 library test tool.
-+    find_package(Qt5Qml ${QT_MIN_VERSION} QUIET NO_MODULE)
-+    find_package(Qt5WebView ${QT_MIN_VERSION} QUIET NO_MODULE)
- endif()
- 
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
-@@ -113,38 +105,28 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
-              OPTIONAL_COMPONENTS
-              KIO                    # For Desktop integration (Widgets only).
-              IconThemes             # For Desktop integration.
--             FileMetaData           # For KDE file indexer support.
-              ThreadWeaver           # For Panorama tool.
-              NotifyConfig           # KDE desktop application notify configuration.
-              Notifications          # KDE desktop notifications integration.
- )
- 
--find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
--             OPTIONAL_COMPONENTS
--             AkonadiContact         # For KDE Mail Contacts support.
--             Contacts               # API for contacts/address book data.
--)
-+find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support.
- 
--find_package(KF5 ${KSANE_MIN_VERSION} QUIET
--             OPTIONAL_COMPONENTS
--             Sane                   # For digital scanner support.
--)
--
--find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET
--             OPTIONAL_COMPONENTS
--             CalendarCore           # For Calendar tool.
--)
-+find_package(KF5CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool.
- 
- if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
-     set(HAVE_KCALENDAR_QDATETIME TRUE)
- endif()
- 
--if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KF5AkonadiContact_FOUND OR NOT KF5Contacts_FOUND))
--    set(ENABLE_AKONADICONTACTSUPPORT OFF)
-+if(ENABLE_AKONADICONTACTSUPPORT)
-+    find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED
-+                AkonadiContact         # For KDE Mail Contacts support.
-+                Contacts               # API for contacts/address book data.
-+    )
- endif()
- 
--if(ENABLE_KFILEMETADATASUPPORT AND NOT KF5FileMetaData_FOUND)
--    set(ENABLE_KFILEMETADATASUPPORT OFF)
-+if(ENABLE_KFILEMETADATASUPPORT)
-+    find_package(KF5FileMetaData ${KF5_MIN_VERSION} REQUIRED) # For KDE file indexer support.
- endif()
- 
- # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one.
-@@ -275,7 +257,7 @@ endif()
- find_package(X11)
- 
- if(X11_FOUND)
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras)
-+    find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
-     set(HAVE_X11 TRUE)
- else()
-     set(HAVE_X11 FALSE)
--- 
-2.34.1
-
diff --git a/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch b/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch
deleted file mode 100644
index a2933bc71d3f..000000000000
--- a/media-gfx/digikam/files/digikam-7.5.0-akonadi-22.04.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 51efe295a222070743187af0367b0bf957879337 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Fri, 22 Apr 2022 19:13:28 +0200
-Subject: [PATCH] Fix build with akonadi-contacts 22.04
-
----
- core/utilities/extrasupport/addressbook/akonadiiface.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/core/utilities/extrasupport/addressbook/akonadiiface.cpp b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
-index 6a78863cf6..8e65a405da 100644
---- a/core/utilities/extrasupport/addressbook/akonadiiface.cpp
-+++ b/core/utilities/extrasupport/addressbook/akonadiiface.cpp
-@@ -49,7 +49,11 @@
- #include <AkonadiCore/Item>
- #endif
- 
-+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 80)
-+#include <Akonadi/ContactSearchJob>
-+#else
- #include <Akonadi/Contact/ContactSearchJob>
-+#endif
- #include <KContacts/Addressee>
- 
- #if defined(Q_OS_DARWIN) && defined(Q_CC_CLANG)
--- 
-GitLab
-
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 08a9c88e3b2b..3d4fe844014c 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -3,8 +3,8 @@ AUX gimp-2.99.12_fix_libheif-1.13_build.patch 2309 BLAKE2B 32d4edf87f20f9fc0b783
 DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1
 DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d122cdc6dd3b7637f06cff28310e12d9a79678ac477b56728f4ceb53292001c53f026e94be417db76dd7e14740ab SHA512 898c1e1ffd2270ccc965db9a8263e04d95455535361b47f92256b4028808e1e91eb1924cf6cef7ff9e988194ebbc67535bd9cfbf0243159824e58551a2b91ba3
 DIST gimp-2.99.12.tar.xz 24282140 BLAKE2B 2174e1d50941071ea6e96f0e3f315484867aa90ae06cbcdc7b30914f959c1a15a7e7ea34ba22ce09a973b29acf1277e3a4519d744140c3fcabc59f31dc3ebf43 SHA512 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917
-EBUILD gimp-2.10.32-r1.ebuild 5651 BLAKE2B ef43e980abbf5138658ab5d99c6eb61260c6c46830b7af5b7c73439fe9021c874e2a1510312ed19adf9aeef1c74690759ea812001b9e61b4d16ab76026f853df SHA512 5032166ffe5b5a90dff4dc9fc5198d8ea853fdee93c05993a2a2848cebb32b7ad762f2723237dff5ea09967236cac69235796bad654c57b203d45c75c9d5e042
-EBUILD gimp-2.99.10-r2.ebuild 6610 BLAKE2B c84f1e15b27933c47e989c1cbdf6fdb63e32d5a64447d0b46bea2c219f2f1ca5c0d360146817ba5459e49fc0ae8055eb0f2cb3914f1473794ab91532670a265f SHA512 654c530093c1a949dc9e69362da07f009ca9a6e6695d17f660aeba33616256627de9f88a174f94ce6d4f94028ee39843971a1f2e3f216842fd46d9b6757b4798
-EBUILD gimp-2.99.12-r1.ebuild 6864 BLAKE2B c87f2113968c2e5fdc14a2295fa7482da7295f5ee18ed1f7c87a8711ff4fc5d7e8492d38e167b81169d09786a22bb5150bb5c687fee9001147f4d51841271316 SHA512 942d93da26e23fedfbf0e18a88543722d704e7700e828262feb05ef300bde97af23ea6b32253e3cf3c25e334eb639d30c7a542b50151ed0e3b057cfe6175b48d
-EBUILD gimp-9999.ebuild 6716 BLAKE2B 3bb64815eb150c7b212f7a0fac16308a580896b7cff02fcfae97faa528600ad0ad7330c75da29f62870d956dd865b5c8dbfa89b0025a920719e6ff7165709e69 SHA512 c93640bd93922e80dbca12a2490d4676657e26235f4a6ed57224853e76e5e5dbb15e6f7020bc1b3678a30dddea24e3dbad049f08dd19fb2071be19086472cb32
+EBUILD gimp-2.10.32-r1.ebuild 5653 BLAKE2B df49cb2852cc4e67f2785d6fc333315c34622b59932d6c009bf180b82c4f73a3605a8b83bf33f659466921975a0e30b31ab37b4fdf55c169627ad513aa90284c SHA512 6e9d2f5509140dca95c60b315bf829e3507a01b93524c3629f1d41b91ae44ac5f392d5cf64210be041c0c537262fadc61a5f19af679e099cffed9812fbc0bd68
+EBUILD gimp-2.99.10-r2.ebuild 6612 BLAKE2B 0cc214f9d0528286d3917b00189fe4da48bab1757f86a090b640850f8ac89e1ede9e3e62825918bbd435e9e8e26a240506fc497aae308f9cbe5a4d471d38a37d SHA512 f0009115053871da906fd5e634a41bb9b315fb2556983d9f66a70254f161be3f647649be991d6edf9f568df124565e0283c5457ffc5cd561b349094e253967eb
+EBUILD gimp-2.99.12-r1.ebuild 6866 BLAKE2B 360ba5d7b1ccc37811da2326e76cec1932152bc86afa509f1f40d7efc244d813818b4614a67c32c65065e0218f1f0e5e0b023efec44cd5bbd407c68c7f2cd004 SHA512 f028e8c084710066510dfe67f14d12f93f047ca0363d82b0615660be0dac3d1c2c2cd027c324845b1ba32bb9e316f9eb9c94de7a358cec7853af7cfedfeca6f1
+EBUILD gimp-9999.ebuild 6718 BLAKE2B bba54e45595e4b5b2bb454cac590c9d1a7406d0c6f2b037f5b9cc101a24d3a2ce62dde6b528b8312763f8816d6d72a8a1ab078c0eb81de6384c625ed083c55b4 SHA512 c00b83aa4eee416659b22a40adca9a778f1db8e70b7497bd46c501c74ed2ca9221ddf5647fac17293cc34321e679f3a75166e3d0b1f75e9a7eb49e940f548fbb
 MISC metadata.xml 646 BLAKE2B 167cb95fb064b2470cdbb6b625f7d6e24aacac57081a1177fdc9e878b4cf1a20c6b86a7e621530b45bc7db5f07e173a47829fd5be9dde6f9b9fcf54a39f24236 SHA512 9f6501b6a14f860be69e29baaace61fe4c964413b8c43882bf06144406333f4d69d6adaa315503dc83fbdb467cd47e3d752ed6abe4b78bd5cb32fb9f3be1ac1d
diff --git a/media-gfx/gimp/gimp-2.10.32-r1.ebuild b/media-gfx/gimp/gimp-2.10.32-r1.ebuild
index a3403b9088ad..630e1aea392c 100644
--- a/media-gfx/gimp/gimp-2.10.32-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.32-r1.ebuild
@@ -10,7 +10,7 @@ inherit autotools gnome2 toolchain-funcs virtualx
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
+LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/2"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86"
 
diff --git a/media-gfx/gimp/gimp-2.99.10-r2.ebuild b/media-gfx/gimp/gimp-2.99.10-r2.ebuild
index a4a5b7dc8ed8..7023075ae708 100644
--- a/media-gfx/gimp/gimp-2.99.10-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.99.10-r2.ebuild
@@ -14,7 +14,7 @@ inherit gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
+LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
 
 IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
diff --git a/media-gfx/gimp/gimp-2.99.12-r1.ebuild b/media-gfx/gimp/gimp-2.99.12-r1.ebuild
index 832014ddddb4..14762335bd3e 100644
--- a/media-gfx/gimp/gimp-2.99.12-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.99.12-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.99/${P}.tar.xz"
 
-LICENSE="GPL-3 LGPL-3"
+LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
 
 IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python test udev unwind vala vector-icons webp wmf xpm"
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index a09486cb7046..0454db1459c8 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
 EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git"
 SRC_URI=""
-LICENSE="GPL-3 LGPL-3"
+LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/3"
 
 IUSE="X aalib alsa doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python test udev unwind vala vector-icons webp wmf xpm"
diff --git a/media-gfx/kgeotag/Manifest b/media-gfx/kgeotag/Manifest
index 24843a897f2f..8ad5cc5aa26f 100644
--- a/media-gfx/kgeotag/Manifest
+++ b/media-gfx/kgeotag/Manifest
@@ -1,6 +1,4 @@
 AUX kgeotag-1.3.1-cmake.patch 1101 BLAKE2B 04743a3e4aa12542075bd958b558999ad17e3f88b1e275eda4ebb3ff13b96f99aa8081e9e2b3c13fcf4700450a2ad08142662ad44ff2448885cc3304dd608109 SHA512 9f6407e27ea1318f0c6cf92530eced9d0dd3b63f098018871e8f866e6dd2e5e27ed892de3270a2aca7d87b84696e48a011123515a6849c13515332bf98c2f64d
-DIST kgeotag-1.2.0.tar.xz 284708 BLAKE2B b4d44a9a2210c20ae0caaf51913958c4d0b0e15f622727aacf7c50a6a76f8228bada2c7b2f3c87f97866b8acc5c9abf4fc2e3963e623f7865a13ec1d190d230a SHA512 818a89babe613602b9843109c10632b09dfe0bba5e28d5332eb17c1c3841a30049dbe298a4b3c8123d72751dfa29eb5994d9d4e683a85f9b121161005c4fee65
 DIST kgeotag-1.3.1.tar.xz 365648 BLAKE2B 7d3ac33f2439072700582dbd4bfd0091728b8546865521b6a1e69a34f3a3180854026fdac67a74f053095788c3d0d1fdff94b3c923d7393b6bc453497aff5b64 SHA512 62cbf568e749a8345e8d145d0850381fcb3140bea10b02626c609c4f1bf0d0fafac23b82a796e0e4c8b293c9fcf65b2ad7c66b7354822426e56826e5b25df46e
-EBUILD kgeotag-1.2.0.ebuild 837 BLAKE2B 07604082a7fce27aa8b1ec5c302aa9e3e823188ea70f86d73ab06b33519b967458ecba533f19aa4c3fde3f57cd71655805a0184546842f12273e0a8fd8aef8f5 SHA512 77df24a4a158919b9c860085d236d2c21b658a0073c67f84c5159949ca3a1227577627643b99228b5a3e702a87ff0034670702d49fa55934c75845344a8e6f4c
 EBUILD kgeotag-1.3.1.ebuild 930 BLAKE2B 7897269952813d22bb6918ce2cefb18008cd2ec42232f1016e219f6017c6ec4d8ba24fafbe617e1dcec5893276af683bd9050b02a2eae9131ef8a3b8a30fcd2d SHA512 49681aa1494fd5306bf648ec057f5123f763f20433e9469df0a95d652fd7677866acf6b2b5806a95de096b41cc636e8297a0f3b58dc488aeccf254237f8e6498
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kgeotag/kgeotag-1.2.0.ebuild b/media-gfx/kgeotag/kgeotag-1.2.0.ebuild
deleted file mode 100644
index 2e4f29ade5e5..000000000000
--- a/media-gfx/kgeotag/kgeotag-1.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.82.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Photo geotagging program"
-HOMEPAGE="https://kgeotag.kde.org/ https://apps.kde.org/kgeotag/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3+"
-SLOT="5"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	kde-apps/libkexiv2:5
-	kde-apps/marble:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog.rst README.md )
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index e859b69f9e37..932356b2b8e0 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,5 +1,3 @@
-DIST kphotoalbum-5.8.1.tar.xz 11792320 BLAKE2B 0f9404bdb0713f824c1e8a448eee48255c1649281a720dac36d46065a8f65bae7eef9fe4057686d25df837411930b03ddc479082c433039f47d3af7539bdbf27 SHA512 3a9eec3a12cd95c7bb0806185d7937346acd68ff29858f3cbbe5d4c0c350ff84f55282231dd3800fc5393d72d5563aa7207ec68122057079ba20e82239c6181c
 DIST kphotoalbum-5.9.1.tar.xz 11786912 BLAKE2B f772aebc84689cafa869ec368f0079884ea71d4e2dac61baedc50c3764489993992dde6a260daf328d4489645f87de403b47255a5e710a8c125dc621c5f8a623 SHA512 e273671bcb0501d62f911a127f63dbdbc94be2f9ef9073d769ecc97d737edf189a4c61c1216184a68528d0562e2287b23c8d6738bcafa3faf4cb724d57666476
-EBUILD kphotoalbum-5.8.1.ebuild 1621 BLAKE2B 319b7eca13c524566236b7691d36d1710a55d43e55a108563ad62e5b319d0b64854b5a5981eb3bdd358d79739cb60e0e5ed790f97f28ba742d0c9d12fc5d52be SHA512 14f99f6d63622c1211e465abded6ea0723a19d8a2458f6dabd6cd2c8a7caa7a9098c0d89ef44012764b973265b8e702ff04245c185957e0f4246dc441d2703c3
-EBUILD kphotoalbum-5.9.1-r1.ebuild 1888 BLAKE2B d8985702916f4d9165a212c89b85b04e91b8d69b2521deeb69d3234522239d8a20a0b3c946e40dde2d290f97e853111b41de28b7c7ef55de99a13c245d0839aa SHA512 b41e580ebb8df1ba4917d05ce30e0b1285081c3302ec85c952d7c1ed0d6c5c66d80c2a98121632cad68a52b2feddaf60299edb3596cb960483473bc3135f79c4
+EBUILD kphotoalbum-5.9.1-r1.ebuild 1887 BLAKE2B a3f0c436524f1ccb2d5dd595bac669071e0886efcd09402cc7d4b22f7fac3aadbbcee41c492ffeecd9ccd96b09e0513356044266558e678c2bd22259df2d23b5 SHA512 5bc97bdaeb835abe97460ec57071893a7f20e6b4765f2fd82ed3af42309b005eb1ee924a54d95b2385da6a1d8d22635addc2469533ef4764f1a751aeb6b34e34
 MISC metadata.xml 846 BLAKE2B d14f1b149c97f8abaf62de3073cfc0a997268ba872ee7bbf27f19a8008feaa24e3a5828e887535f8e5e73bc6e8abafed4ad2a8a535f3adb6dd80e1ce29cd73fb SHA512 e3016152d9976296589f7187c455f78d3bd2ce13f68fdb8b3d141bbedbceda809b59b071768d35eb1437717cce8c19ef6f9a6dced7274949beb161ec301ee0f8
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
deleted file mode 100644
index 495d19aff9cb..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://kphotoalbum.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="5"
-IUSE="map +raw share"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	>=media-libs/phonon-4.11.0
-	virtual/jpeg:0
-	map? ( kde-apps/marble:5 )
-	raw? ( kde-apps/libkdcraw:5 )
-	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	media-video/ffmpeg
-"
-
-DOCS=( ChangeLog README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package map Marble)
-		$(cmake_use_find_package raw KF5KDcraw)
-		$(cmake_use_find_package share KF5Purpose)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
index 5113885d9a7e..4f3157a6a7d6 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kphotoalbum.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index afc52464f830..30afade5b3e4 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,4 @@
 AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
-DIST krita-5.0.8.tar.xz 179344256 BLAKE2B f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682 SHA512 652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777
 DIST krita-5.1.1.tar.xz 185119812 BLAKE2B c59a6431d8711dd5e00c2c7c91e50a9e218acc08c4ddbb33d10f315bbb09f0cbcf57961a56c0b36a5a5fe8815d88d3788b257bddd0c76d730f3e0a4b6abddf5a SHA512 6878e022f1bae183f7565cdeadc3f229d3c0d3997557208b351c5128c4c499b53a120c965760c41ad075b09f017d66ca11046ab34765cccf5463fce7df64bf14
-EBUILD krita-5.0.8-r1.ebuild 3424 BLAKE2B 6a73e394c2d418b52a61fa065b0633fac3c219fa13fc9e4d0ec31aa6fafc0b729743b0554690c2c984871d94939f6e53979a3d3f04bcc438f2378fe547e10894 SHA512 0b602ed9fe2b2e7220825fd23d078375cbe4e5543717553c3627119c41eb381cc19da5b9c5b1137f98e60f74339d299a0f0fb8fae3e32914e77ee8fb883ec464
-EBUILD krita-5.1.1.ebuild 3495 BLAKE2B 60609e71158363cf8bba04599ce42cee9ac1d4c66c5d843ac65fd26a3577c114d36e2339893e0c0dbb3b4ae79764019144fbad80f635d47566fe3b545e14d414 SHA512 ce9b0425cca056b662eb6836cf696c8902d639ca163946039c0700e4ca5ba88bc855bb92867b43832fff33144fd6fdda47579298adf42c6fe704728c4f040b9f
-MISC metadata.xml 939 BLAKE2B cc3728b1d571cf3ac57d07e3c1ef13ba9dd17a7f9efc1cc4755066de96fd9f62c1e031b0ede4f2a2422467118fe35c63f0ddcd35a0e6e981b6ba492dc0ab6d49 SHA512 9001680d354e19d21112608eef725a24978d91d55e6061fd48c8acff451f9a14d379f410d079011dce19142eff534b34c7d8b70ea4c57c7bff71b5c1de1a28a6
+EBUILD krita-5.1.1.ebuild 3494 BLAKE2B 91064d9fbd45d79f2b14f8e128c9b9782e96b90149760932aaa6565f258da76c554b8fb49b015ff89dc08a461a3a14045986aeaaf68542ed0c95a4c4b861f7ab SHA512 c5f5c17fe376fad4cc2b1a26efdb95636ff11fd45d79b09eb323f185888419966df0401734a98f7a9c9874b7f0dfe6c91566502d8b773b97f0823eb03507c9cc
+MISC metadata.xml 836 BLAKE2B 65b987895464bd55fa59611396638b4826c858d3a0ad8cbe2f9b24dea7e32465b43974a967d2a766faa3128dd5ceb7a5b161a79ec3e179976d31478a2f52fbbb SHA512 a3b74e3f3de6500651308d4820e2d5e6504000085d634c561821bcd3f454aa1b89926a6ef9dac63378627e86d337b946e469af944dbd68e4a6349bfb8a76dc3a
diff --git a/media-gfx/krita/krita-5.0.8-r1.ebuild b/media-gfx/krita/krita-5.0.8-r1.ebuild
deleted file mode 100644
index 5d78d631d14f..000000000000
--- a/media-gfx/krita/krita-5.0.8-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{8..10} )
-KFMIN=5.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg +mypaint-brush-engine openexr pdf qtmedia +raw vc webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip:0=[qt5(+)]
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-	')
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( >=media-libs/opencolorio-2.0.0 )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	heif? ( >=media-libs/libheif-1.11:= )
-	mypaint-brush-engine? ( media-libs/libmypaint:= )
-	openexr? ( media-libs/openexr:= )
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	webp? ( >=media-libs/libwebp-1.2.0:= )
-"
-DEPEND="${RDEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-DENABLE_UPDATERS=OFF
-		-DFETCH_TRANSLATIONS=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
-		$(cmake_use_find_package color-management OpenColorIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package vc Vc)
-		$(cmake_use_find_package webp WebP)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/krita/krita-5.1.1.ebuild b/media-gfx/krita/krita-5.1.1.ebuild
index 767fb155def2..fe5ac2ec59ae 100644
--- a/media-gfx/krita/krita-5.1.1.ebuild
+++ b/media-gfx/krita/krita-5.1.1.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index 3ce3466cdd1d..27c873d15e6a 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -14,6 +14,5 @@
 		<flag name="jpegxl">Support for JPEG XL image format</flag>
 		<flag name="mypaint-brush-engine">Enable MyPaint brush engine support <pkg>media-libs/libmypaint</pkg></flag>
 		<flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag>
-		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost</flag>
 	</use>
 </pkgmetadata>