gentoo resync : 13.10.2019

204 files changed, 897 insertions, 1528 deletions

diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index e46f01930887..bdb405df5178 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.60.0 b/metadata/md5-cache/kde-frameworks/attica-5.60.0
index 8819f0de10a7..f09b4b6f8961 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/attica-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad8a5a5d782f1c52809857de24cc1ae3
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.62.0 b/metadata/md5-cache/kde-frameworks/attica-5.63.0
index 90f97cf51ec9..451d5e714382 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtnetwork-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework providing access to Open Collaboration Services
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/attica-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/attica-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9fb89fb495dcc530b7cb82cc084a653e
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.60.0 b/metadata/md5-cache/kde-frameworks/baloo-5.60.0
index 197c9c091ae5..33f1900e99db 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kd
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/baloo-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef6adad1b8e14c003d20efae4eecb8bc
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.62.0 b/metadata/md5-cache/kde-frameworks/baloo-5.62.0
deleted file mode 100644
index fda9645c32c4..000000000000
--- a/metadata/md5-cache/kde-frameworks/baloo-5.62.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/kfilemetadata-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kidletime-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/solid-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-db/lmdb-0.9.17 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework for searching and managing metadata
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/kfilemetadata-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kidletime-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/solid-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/baloo-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=9a1e97a439a98aaeb8b5ad3463bca85d
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.63.0 b/metadata/md5-cache/kde-frameworks/baloo-5.63.0
new file mode 100644
index 000000000000..a085c93fe0ba
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.63.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/kfilemetadata-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kidletime-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/solid-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-db/lmdb-0.9.17 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework for searching and managing metadata
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/kfilemetadata-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kidletime-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/solid-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RESTRICT=test
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/baloo-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9a1e97a439a98aaeb8b5ad3463bca85d
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.60.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.60.0
index bded68912100..65578258fe17 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/bluez-qt-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af0f3808d23351a9c52bcc1abdedd346
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.62.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.63.0
index d3f5296868c2..97f04c655d88 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 ) virtual/pkgconfig
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Qt wrapper for Bluez 5 DBus API
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/bluez-qt-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/bluez-qt-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=059b8cd0f770a446f49421236cdea4d5
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.60.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.60.0
index c87a36feecdb..3541ba11a73f 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.60.0
@@ -9,9 +9,5 @@ KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-3
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/breeze-icons-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e9e17e48916375dc0df5dfd914e1a47
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.62.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.63.0
index f243d9e8b0df..5648d559bb30 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.62:5 >=dev-qt/qtcore-5.12.3:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.63:5 >=dev-qt/qtcore-5.12.3:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=test? ( >=dev-qt/qttest-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 )
 DESCRIPTION=Breeze SVG icon theme
@@ -7,11 +7,7 @@ HOMEPAGE=https://kde.org/
 IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-3
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/breeze-icons-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/breeze-icons-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=77318f6416e0e24764c1954679c40cc5
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.60.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.60.0
index 1397e6b6b8a4..145e717bf42a 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.60.0
@@ -9,9 +9,5 @@ KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-3
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/breeze-icons-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5600c953463d939afeb25a523b20742a
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.62.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.63.0
index 941616400218..5fb3af75fcf0 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.62:5 >=dev-qt/qtcore-5.12.3:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.63:5 >=dev-qt/qtcore-5.12.3:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=test? ( >=dev-qt/qttest-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 )
 DESCRIPTION=Breeze SVG icon theme binary resource
@@ -7,11 +7,7 @@ HOMEPAGE=https://kde.org/
 IUSE=test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-3
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/breeze-icons-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/breeze-icons-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd36bd3d78ef066c466b018faa83bfd1
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.60.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.60.0
index b5ad9719875e..8fbd5521d0a4 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.60.0
@@ -5,14 +5,10 @@ DESCRIPTION=Extra modules and scripts for CMake
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
 IUSE=doc test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/extra-cmake-modules-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=2df2c3e6eda47fa5392574b3c0571014
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=040eff890c17120f89ec1723f42157e9
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.62.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.62.0
deleted file mode 100644
index 9d8c01ed8c21..000000000000
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=doc? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=dev-qt/qthelp-5.12.3:5 ) test? ( >=dev-qt/qtcore-5.12.3:5 >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Extra modules and scripts for CMake
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
-IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=BSD
-RDEPEND=app-arch/libarchive[bzip2]
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/extra-cmake-modules-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=b6f098d1e9e765deed5c798f20f05f98
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.63.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.63.0
new file mode 100644
index 000000000000..4cb7c21ab722
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=dev-qt/qthelp-5.12.3:5 ) test? ( >=dev-qt/qtcore-5.12.3:5 >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Extra modules and scripts for CMake
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/libarchive[bzip2]
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/extra-cmake-modules-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f4127fe686f49af8dd0e1e92b5789189
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.60.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.60.0
index 5089974a3dd4..d68a068b9bf0 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 >
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/frameworkintegration-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ae7ac84c281f1d41b349347b70b8c06
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.62.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.62.0
deleted file mode 100644
index faa11ed9c848..000000000000
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.62.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/knewstuff-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kpackage-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=appstream X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/knewstuff-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kpackage-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/frameworkintegration-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=0999e16227b02dc6342acda9113d6a30
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.63.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.63.0
new file mode 100644
index 000000000000..346f92101e7a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.63.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/knewstuff-5.63:5 >=kde-frameworks/knotifications-5.63:5 >=kde-frameworks/kpackage-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=appstream X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/knewstuff-5.63:5 >=kde-frameworks/knotifications-5.63:5 >=kde-frameworks/kpackage-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RESTRICT=test
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/frameworkintegration-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0999e16227b02dc6342acda9113d6a30
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.60.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.60.0
index 5d9cb0f098ec..ec1a41b1676f 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.60.0
@@ -10,9 +10,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-plasma/kactivitymanagerd-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kactivities-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc9e4f997c95971d171e629668c23625
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.62.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.63.0
index 7ca1a7464958..6ad686a9e0c0 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.63.0
@@ -1,18 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-libs/boost-1.54 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-libs/boost-1.54 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for working with KDE activities
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-plasma/kactivitymanagerd-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kactivities-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-plasma/kactivitymanagerd-5.15.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kactivities-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=216c9faa2388bfd43decaf9c078b0b64
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.60.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.60.0
index ce4da2efc7bf..d1c8047b2c43 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-frameworks/kactivities-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kactivities-stats-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5f33cc1b50d970ec59f4a31209d2523
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.62.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.63.0
index d96eb60ab9fc..e17c43ebaad4 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.63.0
@@ -1,18 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-frameworks/kactivities-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=dev-libs/boost-1.54 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-frameworks/kactivities-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=dev-libs/boost-1.54 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for getting the usage statistics collected by the activities service
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-frameworks/kactivities-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kactivities-stats-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-frameworks/kactivities-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kactivities-stats-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e018fbe6bd1c8ede77a8bd711ca4d9c7
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.60.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.60.0
index 584ce112a5c3..ff2d2df62b0f 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=python_targets_python2_7
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kapidox-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4912a9b2b030bcafe7fd8eb8ab78ab8e
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.62.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.62.0
deleted file mode 100644
index 26a30c1e018c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.62.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework for building KDE API documentation in a standard format and style
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=doc python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/graphviz[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] doc? ( >=dev-qt/qt-docs-5.12.3:5 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kapidox-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=248e45c85cb75177c7fadf22fae6a5ba
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.63.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.63.0
new file mode 100644
index 000000000000..8656f07b7605
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.63.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework for building KDE API documentation in a standard format and style
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/graphviz[python,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] doc? ( >=dev-qt/qt-docs-5.12.3:5 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kapidox-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=16bc7626eff5e8722abeb8dcf3864157
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.60.0 b/metadata/md5-cache/kde-frameworks/karchive-5.60.0
index 43e22095f7b8..1220e604def1 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.60.0
@@ -10,9 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/karchive-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f886182dee9a2d56aa2c6c70e1ef6af
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.62.0 b/metadata/md5-cache/kde-frameworks/karchive-5.63.0
index d2f688798594..8f1dd7ec061f 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=+bzip2 +lzma debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/karchive-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/karchive-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d774c3353253c647f3c3c9566cc366de
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.60.0 b/metadata/md5-cache/kde-frameworks/kauth-5.60.0
index a6da71045bfe..08a12b14e1e0 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.60.0
@@ -11,9 +11,5 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kauth-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7dd5f999d432100eb2d571fbc8be244e
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.62.0 b/metadata/md5-cache/kde-frameworks/kauth-5.63.0
index 374d022aa8e8..f98b6a0ca73d 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.63.0
@@ -1,6 +1,6 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework to let applications perform actions as a privileged user
 EAPI=7
 HOMEPAGE=https://kde.org/
@@ -8,12 +8,8 @@ IUSE=nls +policykit test debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kauth-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kauth-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec793f9f42f7401c2632c646371fe672
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.60.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.60.0
index e257ace6649c..fd173d1693f4 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kbookmarks-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38476b89607906bc2e037c877d20b7f2
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.62.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.62.0
deleted file mode 100644
index e2f0ef1a177c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kconfigwidgets-5.62:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework for managing bookmarks stored in XBEL format
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kbookmarks-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=e00a0ff377feb4e39a915ccfbbfd8770
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.63.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.63.0
new file mode 100644
index 000000000000..8f1ee77e37bd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kconfigwidgets-5.63:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework for managing bookmarks stored in XBEL format
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kbookmarks-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e00a0ff377feb4e39a915ccfbbfd8770
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.63.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.63.0
new file mode 100644
index 000000000000..5ee8232e9494
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.63.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 dev-libs/libical:= dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Library for interfacing with calendars
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ test? ( LGPL-3+ )
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 dev-libs/libical:= !kde-apps/kcalcore:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RESTRICT=test
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kcalendarcore-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9f28aa343ce83b472496deb96c6c7280
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.60.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.60.0
index e83c2cc37e3d..2b0e8db50c4c 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kdeclarative-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kitemviews-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kcmutils-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b56c127c2071cbfd2f27ec36d03d18f
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.62.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.62.0
deleted file mode 100644
index 245cc6ceed2e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kdeclarative-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework to work with KDE System Settings modules
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kdeclarative-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kcmutils-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=8c63b9908b3ef80e5eda3b28ac954de5
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.63.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.63.0
new file mode 100644
index 000000000000..62bd02ac6577
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kdeclarative-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework to work with KDE System Settings modules
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/kauth-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kdeclarative-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kcmutils-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8c63b9908b3ef80e5eda3b28ac954de5
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.60.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.60.0
index 18b016b66e06..ee2bfbf3b203 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.60.0
@@ -10,9 +10,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kcodecs-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=821f7ab92eac40e01750a109d522f214
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.62.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.63.0
index 9e8e601692be..301e7c67b646 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for manipulating strings using various encodings
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=nls debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kcodecs-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kcodecs-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f49eefd55b27d6659d1c4309428c82df
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.60.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.60.0
index d62c0fbbf637..c437174b4571 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.60.0
@@ -10,9 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kcompletion-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6aba4576e1399ef76478af7a96d6463
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.62.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.63.0
index 7592fd4cc4e2..3a28ed157e69 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.63.0
@@ -1,18 +1,14 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for common completion tasks such as filename or URL completion
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls test debug designer doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kcompletion-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kcompletion-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c86314b01fff142cbbc444dac53760a9
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.60.0-r1 b/metadata/md5-cache/kde-frameworks/kconfig-5.60.0-r1
index 5e91afa17ed8..fa044d5bb087 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.60.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.60.0-r1
@@ -11,9 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dbus? ( >=dev-qt/qtdbus-
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kconfig-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52bdc57d8897123b0c510dc0300d4ab9
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.62.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.63.0
index 59833a374e98..73d6b94b6d0d 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dbus? ( >=dev-qt/qtdbus-5.12.3:5 ) test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for reading and writing configuration
@@ -7,13 +7,9 @@ HOMEPAGE=https://kde.org/
 IUSE=dbus nls test debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dbus? ( >=dev-qt/qtdbus-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dbus? ( >=dev-qt/qtdbus-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kconfig-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kconfig-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f52a3f289ab0e1cee671f67a539d5ebf
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.60.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.60.0
index bc1db4d1b6cf..3841b2dcc392 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.60:5 >=kde-frameworks/kcodecs-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kguiaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kconfigwidgets-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51a75ac1e190699246c02d6f3d27caaf
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.62.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.62.0
deleted file mode 100644
index f4ffb6099ef9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.62:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kguiaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework providing an assortment of configuration-related widgets
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+man test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kguiaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kconfigwidgets-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=8787b2ef19f844005d62ab88114e2960
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.63.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.63.0
new file mode 100644
index 000000000000..427adbf557a5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.63:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.63:5 >=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kguiaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework providing an assortment of configuration-related widgets
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+man test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.63:5 >=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kguiaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kconfigwidgets-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8787b2ef19f844005d62ab88114e2960
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.63.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.63.0
new file mode 100644
index 000000000000..10e2cf1429b7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcontacts-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=dev-qt/qtgui-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Address book API based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=dev-qt/qtgui-5.12.3:5 !kde-apps/kcontacts:5 !kde-apps/kdepim-l10n app-text/iso-codes >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kcontacts-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5618c1ae3b00b2e877237a89436ecc5c
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.60.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.60.0
index 105abe1068ef..a46815e176ab 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.12.3:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kcoreaddons-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c9f51f12599118cbb1d1ebd4754b1b96
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.62.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.63.0
index 1039ed3890ef..f093424f6b34 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtcore-5.12.3:5[icu] fam? ( virtual/fam ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=fam nls debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.12.3:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kcoreaddons-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=dev-qt/qtcore-5.12.3:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kcoreaddons-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=001eeca222359496c710f95107e2ac67
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.60.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.60.0
index 9d0e8ee2d791..c53acfe785fd 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kcrash-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57a343700f6ff87b446422889de77ab3
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.62.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.63.0
index 9fc4478d5566..e940b2a39d16 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.63.0
@@ -1,19 +1,15 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-base/xorg-proto test? ( >=dev-qt/qtwidgets-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-base/xorg-proto test? ( >=dev-qt/qtwidgets-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for intercepting and handling application crashes
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls test debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kcrash-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kcrash-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e11b34b68e723df56e9c1809ad36db9
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.60.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.60.0
index e3cf39b43e39..820a061eaa5f 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kdbusaddons-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=466f8e982ad9ec3f17a657b3c2673337
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.62.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.63.0
index 72e86ff19432..85329820b04c 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtdbus-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for registering services and applications per freedesktop standards
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=nls X debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kdbusaddons-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kdbusaddons-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a536e6c6546591f54a4ee11a47773a6
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.60.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.60.0
index 0a8ca8414f73..94fe2a040213 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kglobalaccel-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kpackage-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kdeclarative-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ccbc586ddb91346c2ddf2b4bc4acc193
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.62.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.62.0
deleted file mode 100644
index a7e38b9516c1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kglobalaccel-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kpackage-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libepoxy dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework providing integration of QML and KDE work spaces
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kglobalaccel-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kpackage-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kdeclarative-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=d2caf1a8f981eab59d3758e8d8fc89c3
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.63.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.63.0
new file mode 100644
index 000000000000..f0f35ccaa952
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kglobalaccel-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kpackage-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libepoxy dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework providing integration of QML and KDE work spaces
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kglobalaccel-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kpackage-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kdeclarative-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2caf1a8f981eab59d3758e8d8fc89c3
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.60.0 b/metadata/md5-cache/kde-frameworks/kded-5.60.0
index 5f0309f4a879..c31d816b4651 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kcrash-5.60:5 >=kde-frameworks/kdbusaddons-5.60:5 >=kde-frameworks/kinit-5.60:5 >=kde-frameworks/kservice-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kded-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=870302729c385b12c410ddfc67b221c0
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.62.0 b/metadata/md5-cache/kde-frameworks/kded-5.62.0
deleted file mode 100644
index 5245211296cf..000000000000
--- a/metadata/md5-cache/kde-frameworks/kded-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.62:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/kinit-5.62:5 >=kde-frameworks/kservice-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Central daemon of KDE workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+man debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/kinit-5.62:5 >=kde-frameworks/kservice-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kded-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=09d9033fbd9c7f792420f382a2ebe33f
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.63.0 b/metadata/md5-cache/kde-frameworks/kded-5.63.0
new file mode 100644
index 000000000000..d765fe495c0d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kded-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.63:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/kinit-5.63:5 >=kde-frameworks/kservice-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Central daemon of KDE workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+man debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/kinit-5.63:5 >=kde-frameworks/kservice-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kded-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=09d9033fbd9c7f792420f382a2ebe33f
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.60.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.60.0
index d43a8e9cb482..18905aea1861 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=kde-frameworks/kauth-5.60:5 >=kde-frameworks/kcodecs-5.60:5 >=kde-fram
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/kdelibs4support-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b19a16a052094ce4e744a3a65089178b
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.62.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.62.0
deleted file mode 100644
index 79af9944ca5f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.62.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/URI dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 handbook? ( >=kde-frameworks/kdoctools-5.62:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/kded-5.62:5 >=kde-frameworks/kdesignerplugin-5.62:5 >=kde-frameworks/kdoctools-5.62:5 >=kde-frameworks/kemoticons-5.62:5 >=kde-frameworks/kglobalaccel-5.62:5 >=kde-frameworks/kguiaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kunitconversion-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=kde-frameworks/solid-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/designer-5.12.3:5 test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=libressl X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/kded-5.62:5 >=kde-frameworks/kdesignerplugin-5.62:5 >=kde-frameworks/kdoctools-5.62:5 >=kde-frameworks/kemoticons-5.62:5 >=kde-frameworks/kglobalaccel-5.62:5 >=kde-frameworks/kguiaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kunitconversion-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=kde-frameworks/solid-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kinit-5.62:5 >=kde-frameworks/kitemmodels-5.62:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kdelibs4support-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=274f0f71d0ff96227d808a508be2416b
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.63.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.63.0
new file mode 100644
index 000000000000..8058dba00a8b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.63.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/URI dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 handbook? ( >=kde-frameworks/kdoctools-5.63:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.63:5 >=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/kded-5.63:5 >=kde-frameworks/kdesignerplugin-5.63:5 >=kde-frameworks/kdoctools-5.63:5 >=kde-frameworks/kemoticons-5.63:5 >=kde-frameworks/kglobalaccel-5.63:5 >=kde-frameworks/kguiaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kjobwidgets-5.63:5 >=kde-frameworks/knotifications-5.63:5 >=kde-frameworks/kparts-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/ktextwidgets-5.63:5 >=kde-frameworks/kunitconversion-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=kde-frameworks/solid-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/designer-5.12.3:5 test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=libressl X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.63:5 >=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/kded-5.63:5 >=kde-frameworks/kdesignerplugin-5.63:5 >=kde-frameworks/kdoctools-5.63:5 >=kde-frameworks/kemoticons-5.63:5 >=kde-frameworks/kglobalaccel-5.63:5 >=kde-frameworks/kguiaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kjobwidgets-5.63:5 >=kde-frameworks/knotifications-5.63:5 >=kde-frameworks/kparts-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/ktextwidgets-5.63:5 >=kde-frameworks/kunitconversion-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=kde-frameworks/solid-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kinit-5.63:5 >=kde-frameworks/kitemmodels-5.63:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RESTRICT=test
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/portingAids/kdelibs4support-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=274f0f71d0ff96227d808a508be2416b
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.60.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.60.0
index 9227242c69d2..b2f52b9a7015 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 designer? ( >=dev-qt/designer-5.12.3:5 >=kde-frameworks/kcompletion-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kitemviews-5.60:5 >=kde-frameworks/kplotting-5.60:5 >=kde-frameworks/ktextwidgets-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=kde-frameworks/sonnet-5.60:5 ) webkit? ( >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/kdewebkit-5.60:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kdesignerplugin-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=482336d87f71da8cfab3fb84a22a8af8
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.62.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.62.0
deleted file mode 100644
index 4988aab17907..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 handbook? ( >=kde-frameworks/kdoctools-5.62:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=nls debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kdesignerplugin-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=f291a005edd5301f2fb33015645fbc51
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.63.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.63.0
new file mode 100644
index 000000000000..a2ff275e672a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 handbook? ( >=kde-frameworks/kdoctools-5.63:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=nls debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/portingAids/kdesignerplugin-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f291a005edd5301f2fb33015645fbc51
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.60.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.60.0
index 24c47ddff671..777411e1c4e7 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kpty-5.60:5 >=kde-frameworks/kservice-5.60:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kdesu-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a843ff06b485fd1268dba52a452b4b27
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.62.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.62.0
deleted file mode 100644
index 3854b7b40527..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kpty-5.62:5 >=kde-frameworks/kservice-5.62:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework to handle super user actions
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kpty-5.62:5 >=kde-frameworks/kservice-5.62:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kdesu-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=74f1b357bcce6af614dcbae4db8b35ce
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.63.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.63.0
new file mode 100644
index 000000000000..602595dfc054
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kpty-5.63:5 >=kde-frameworks/kservice-5.63:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework to handle super user actions
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kpty-5.63:5 >=kde-frameworks/kservice-5.63:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kdesu-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=74f1b357bcce6af614dcbae4db8b35ce
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.60.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.60.0
index ed9b6a0fd671..47df3f04f4f7 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kjobwidgets-5.60:5 >=kde-frameworks/kparts-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwallet-5.60:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/kdewebkit-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b349897e5c8f00d74cd5c730ac88ebb6
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.62.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.62.0
deleted file mode 100644
index 01463204240d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwallet-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 designer? ( >=kde-frameworks/kdesignerplugin-5.62:5 ) >=dev-qt/qtnetwork-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Framework providing KDE integration of QtWebKit
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=designer debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwallet-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 designer? ( >=kde-frameworks/kdesignerplugin-5.62:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kdewebkit-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=bdc4ee7eea422cdfa9a6677f950ca45f
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.63.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.63.0
new file mode 100644
index 000000000000..0cb08e7ff369
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kjobwidgets-5.63:5 >=kde-frameworks/kparts-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwallet-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 designer? ( >=kde-frameworks/kdesignerplugin-5.63:5 ) >=dev-qt/qtnetwork-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Framework providing KDE integration of QtWebKit
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=designer debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kjobwidgets-5.63:5 >=kde-frameworks/kparts-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwallet-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 designer? ( >=kde-frameworks/kdesignerplugin-5.63:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/portingAids/kdewebkit-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bdc4ee7eea422cdfa9a6677f950ca45f
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.60.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.60.0
index 7b9924327ae2..126e350b102c 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 zeroconf? ( >=dev-qt/qtdbus-5.12.3:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kdnssd-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=02a8e747ba7197e6cb535ff0ae51c08c
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.62.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.63.0
index 889eeb9becde..cbbd83f3ec73 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtnetwork-5.12.3:5 zeroconf? ( >=dev-qt/qtdbus-5.12.3:5 net-dns/avahi[mdnsresponder-compat] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for network service discovery using Zeroconf
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=nls zeroconf debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 zeroconf? ( >=dev-qt/qtdbus-5.12.3:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kdnssd-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 zeroconf? ( >=dev-qt/qtdbus-5.12.3:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kdnssd-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25b4c81b056eb1719fc9794a67fd0589
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.60.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.60.0
index f986e309f8e8..84432071e1b0 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.60.0
@@ -10,9 +10,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.60:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kdoctools-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=386eae76ad658b7c761e1bca232dca6c
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.62.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.63.0
index 97448d73919c..f099784fa491 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.63.0
@@ -1,18 +1,14 @@
-BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.62:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5
+BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.63:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.62:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/karchive-5.63:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Tools to generate documentation in various formats from DocBook files
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=>=kde-frameworks/karchive-5.62:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kdoctools-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/karchive-5.63:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kdoctools-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d95d170ebf1774fc1561a2ea18636255
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.60.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.60.0
index 57a73e27e713..6b92396c2f14 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kemoticons-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d68718b87f3472feb0e14d936e92b30a
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.62.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.62.0
deleted file mode 100644
index ba5b4f8e034c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.62.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kservice-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework for converting text emoticons to graphical representations
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kservice-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kemoticons-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=7b0cd911da5599294663b4b2940615eb
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.63.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.63.0
new file mode 100644
index 000000000000..f0ec035ed88f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.63.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kservice-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework for converting text emoticons to graphical representations
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kservice-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RESTRICT=test
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kemoticons-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7b0cd911da5599294663b4b2940615eb
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.60.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.60.0
index a7254cc5d002..56487a3c7861 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=dev-
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kfilemetadata-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=206acc27eda2a6520e609f5dc8a6ea5f
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.62.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.62.0
deleted file mode 100644
index e59eabefe6d8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.62.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=dev-qt/qtxml-5.12.3:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.62:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Library for extracting file metadata
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=epub exif ffmpeg kernel_linux libav office pdf taglib debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=dev-qt/qtxml-5.12.3:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.62:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kfilemetadata-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=1b92ccda68775dc04fa0bc9f7671318c
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.63.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.63.0
new file mode 100644
index 000000000000..2e5b0ee0d270
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.63.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=dev-qt/qtxml-5.12.3:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.63:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Library for extracting file metadata
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=epub exif ffmpeg kernel_linux libav office pdf taglib debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=dev-qt/qtxml-5.12.3:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.63:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RESTRICT=test
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kfilemetadata-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1a882c2c10682ea799dedad082244b3a
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.60.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.60.0
index 57613e0e25fc..2dec6b10483a 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kcrash-5.60:5 >=kde-frameworks/kdbusaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5[X] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kglobalaccel-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff75edf9183d782d7005de0c083603a9
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.62.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.63.0
index 5af78077a689..e7cb76da7ec6 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.63.0
@@ -1,18 +1,14 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5[X] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5[X] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework to handle global shortcuts
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls test debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5[X] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kglobalaccel-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5[X] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kglobalaccel-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15f37f6e51557e6db84ff59d1d091001
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.60.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.60.0
index d73174ff68f9..fe9def8149c9 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kguiaddons-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffe7338cf0c159ebdb4983e35c3c5b3f
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.62.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.63.0
index 1af56df72d13..e8d020a76d7e 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-base/xorg-proto x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework providing assorted high-level user interface components
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kguiaddons-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kguiaddons-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a68d4de6e8ceba16142fb4002ab72ed
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.60.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.60.0
index 31954fdd8f25..2f6299f9a1dc 100644
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kholidays-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70351dade8a8ff25de6501948d51afc4
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.62.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.63.0
index 6853636f5e87..b6cc1e88499b 100644
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Library to determine holidays and other special events for a geographical region
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=nls debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kholidays-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kholidays-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f2ea1db3e37ab62928940f7369f4aa48
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.60.0 b/metadata/md5-cache/kde-frameworks/khtml-5.60.0
index 3bf5652cfee9..6693c5b9bc8b 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.60:5 >=kde-frameworks/kcodecs-5.60:5 >=kde-frameworks/kcompletion-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kglobalaccel-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kjobwidgets-5.60:5 >=kde-frameworks/kjs-5.60:5 >=kde-frameworks/knotifications-5.60:5 >=kde-frameworks/kparts-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/ktextwidgets-5.60:5 >=kde-frameworks/kwallet-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=kde-frameworks/sonnet-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/khtml-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac16953ea26b3557fcf9563c464782a0
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.62.0 b/metadata/md5-cache/kde-frameworks/khtml-5.62.0
deleted file mode 100644
index 92c43b5a72ee..000000000000
--- a/metadata/md5-cache/kde-frameworks/khtml-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/gperf dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kglobalaccel-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/kjs-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwallet-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=kde-frameworks/sonnet-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.12.3:5 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KHTML web rendering engine
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=libressl X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kglobalaccel-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/kjs-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwallet-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=kde-frameworks/sonnet-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/khtml-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=ce0d8e127c13a5a5827485a4108268fc
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.63.0 b/metadata/md5-cache/kde-frameworks/khtml-5.63.0
new file mode 100644
index 000000000000..4dfc473eaea2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl dev-util/gperf dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kglobalaccel-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kjobwidgets-5.63:5 >=kde-frameworks/kjs-5.63:5 >=kde-frameworks/knotifications-5.63:5 >=kde-frameworks/kparts-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/ktextwidgets-5.63:5 >=kde-frameworks/kwallet-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=kde-frameworks/sonnet-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.12.3:5 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KHTML web rendering engine
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=libressl X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kglobalaccel-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kjobwidgets-5.63:5 >=kde-frameworks/kjs-5.63:5 >=kde-frameworks/knotifications-5.63:5 >=kde-frameworks/kparts-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/ktextwidgets-5.63:5 >=kde-frameworks/kwallet-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=kde-frameworks/sonnet-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/portingAids/khtml-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce0d8e127c13a5a5827485a4108268fc
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.60.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.60.0
index f82e2dfa5df2..f34957b5dc59 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/ki18n-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9dbeb082f7f23e15006b46356b160a2e
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.62.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.62.0
deleted file mode 100644
index 05d359a27564..000000000000
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.62.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtdeclarative-5.12.3:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework based on Gettext for internationalizing user interface text
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtdeclarative-5.12.3:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/ki18n-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=3af0be3dcf9ff5b697ca461378d18ded
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.63.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.63.0
new file mode 100644
index 000000000000..7690c780b16b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.63.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtdeclarative-5.12.3:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework based on Gettext for internationalizing user interface text
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtdeclarative-5.12.3:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/ki18n-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01d72f27d1c3313f94c1f441239152a9
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.60.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.60.0
index fe80f314c1aa..f898da200190 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kiconthemes-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=792fad6dbeb3ea7483add4246a6b6253
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.62.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.62.0
deleted file mode 100644
index 818bb6537251..000000000000
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.62.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework for icon theming and configuration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kiconthemes-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=abc0396d524871501ee8814ea18cddbb
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.63.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.63.0
new file mode 100644
index 000000000000..b0a4baa83b3a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.63.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework for icon theming and configuration
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RESTRICT=test
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kiconthemes-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=abc0396d524871501ee8814ea18cddbb
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.60.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.60.0
index 0779f0bea4c4..dd2bd3404d21 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11e
 REQUIRED_USE=xscreensaver? ( X )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kidletime-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0093197a0af65ab5a7390d01be870fb5
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.62.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.63.0
index d8e88d3f7556..b037c7ac7b77 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.12.3:5 x11-libs/libXScrnSaver ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for detection and notification of device idle time
@@ -7,13 +7,9 @@ HOMEPAGE=https://kde.org/
 IUSE=X xscreensaver debug doc
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.12.3:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.12.3:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 REQUIRED_USE=xscreensaver? ( X )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kidletime-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kidletime-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4c34d848994bc5839c0f42307210b74
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.60.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.60.0
index 20e809368f27..89b8db66cfe4 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.60:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt/qtprintsupport-5.12.3:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kimageformats-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95da2c725e572842a9664c35ba6cb35a
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.62.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.63.0
index a70f48eac10c..412dc54ef670 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.63.0
@@ -1,18 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.62:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt/qtprintsupport-5.12.3:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/karchive-5.63:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt/qtprintsupport-5.12.3:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=eps openexr test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.62:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt/qtprintsupport-5.12.3:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kimageformats-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/karchive-5.63:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt/qtprintsupport-5.12.3:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kimageformats-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=63619573ef7b5ba4ae98730eca0f5251
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.60.0 b/metadata/md5-cache/kde-frameworks/kinit-5.60.0
index a9b88117c7ff..dbfe1173ee1d 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kcrash-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kinit-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3adc8909605206784dd5add43a2929a9
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.62.0 b/metadata/md5-cache/kde-frameworks/kinit-5.62.0
deleted file mode 100644
index 0887045cdd1d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kinit-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.62:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+caps +man X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kinit-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=aff6251190aa59bccdb7d556cefe4feb
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.63.0 b/metadata/md5-cache/kde-frameworks/kinit-5.63.0
new file mode 100644
index 000000000000..59dea923f7ea
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.63:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+caps +man X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kinit-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aff6251190aa59bccdb7d556cefe4feb
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.60.0 b/metadata/md5-cache/kde-frameworks/kio-5.60.0
index e72b1b38383a..a020de66e6ff 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.60.0
@@ -12,9 +12,5 @@ RDEPEND=>=kde-frameworks/kauth-5.60:5 >=kde-frameworks/karchive-5.60:5 >=kde-fra
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kio-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=506b4db80aaa151a3a9c9a925518518d
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.62.0 b/metadata/md5-cache/kde-frameworks/kio-5.62.0
deleted file mode 100644
index 0ad23128189e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.62.0
+++ /dev/null
@@ -1,20 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kbookmarks-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=kde-frameworks/solid-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5=[ssl] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.62:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.62:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=dev-qt/qtconcurrent-5.12.3:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.62:5
-RDEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kbookmarks-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=kde-frameworks/solid-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5=[ssl] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.62:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.62:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kio-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=c8ce8301fc09ace49dd243db52e2aefd
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.62.1 b/metadata/md5-cache/kde-frameworks/kio-5.62.1
deleted file mode 100644
index 274dce192eb1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.62.1
+++ /dev/null
@@ -1,20 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kbookmarks-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=kde-frameworks/solid-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5=[ssl] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.62:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.62:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=dev-qt/qtconcurrent-5.12.3:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.62:5
-RDEPEND=>=kde-frameworks/kauth-5.62:5 >=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kbookmarks-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=kde-frameworks/solid-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5=[ssl] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.62:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.62:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kio-5.62.1.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=c8ce8301fc09ace49dd243db52e2aefd
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.63.0 b/metadata/md5-cache/kde-frameworks/kio-5.63.0
new file mode 100644
index 000000000000..f53ec1b8c8ac
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.63.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.63:5 >=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kbookmarks-5.63:5 >=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kjobwidgets-5.63:5 >=kde-frameworks/knotifications-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/ktextwidgets-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=kde-frameworks/solid-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.63:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.63:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=dev-qt/qtconcurrent-5.12.3:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.63:5
+RDEPEND=>=kde-frameworks/kauth-5.63:5 >=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kbookmarks-5.63:5 >=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kjobwidgets-5.63:5 >=kde-frameworks/knotifications-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/ktextwidgets-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=kde-frameworks/solid-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.63:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.63:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RESTRICT=test
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kio-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3b044617c9127f5d6dc5629f649bfe76
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.60.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.60.0
index 795cb3c74e0b..895ed46f23df 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgrap
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kirigami2-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15ffed2aa6ec94e248eb683701372259
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.62.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.62.0
deleted file mode 100644
index 52e5cf376588..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.62.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.12.3:5 dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
-EAPI=7
-HOMEPAGE=https://techbase.kde.org/Kirigami
-IUSE=debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kirigami2-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=41bd2af8cc3029a8afb1fc300e1af882
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.63.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.63.0
new file mode 100644
index 000000000000..64612d1486ba
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.63.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-qt/linguist-tools-5.12.3:5 dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
+EAPI=7
+HOMEPAGE=https://techbase.kde.org/Kirigami
+IUSE=debug examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RESTRICT=test
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kirigami2-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=13b7b41a5dcf169f05eaf08774209a99
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.60.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.60.0
index 5baed4fd2339..12c2e7502afc 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kitemmodels-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=58d1bea6109fff2bc6b3b0565d2f9d29
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.62.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.63.0
index 35d202ab518c..e345bd13fbe9 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=test? ( >=dev-qt/qtwidgets-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kitemmodels-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kitemmodels-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=871b7639fd8f384730c2241b9b8e0ba2
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.60.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.60.0
index a6f1b832ab4a..f36fec4652f8 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kitemviews-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=702a65a9760ec373383266c337261635
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.62.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.62.0
deleted file mode 100644
index 805a19504e75..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework providing additional widgets for item models
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kitemviews-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=31c970bde384a1bb12fbf489d02eaad2
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.63.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.63.0
new file mode 100644
index 000000000000..4ce626feef56
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework providing additional widgets for item models
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kitemviews-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e924bc8509a2a6b4d443b6589c94fc50
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.60.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.60.0
index 6b0aebf7d669..ab79341c578e 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kjobwidgets-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd7c780fed1d0c12ae93b59208c161b4
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.62.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.63.0
index 606be32495a0..ff4261b07095 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.63.0
@@ -1,18 +1,14 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls X debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kjobwidgets-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kjobwidgets-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac21ea6e74edd031ef2b7bf1d0a531f2
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.60.0 b/metadata/md5-cache/kde-frameworks/kjs-5.60.0
index 172939dd86cc..4bfff8a88435 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.60.0
@@ -10,9 +10,5 @@ LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/kjs-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=91c3176af205d32df2731b94ed511548
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.62.0 b/metadata/md5-cache/kde-frameworks/kjs-5.63.0
index 066de806e9de..7d95a47f0470 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 handbook? ( >=kde-frameworks/kdoctools-5.62:5 )
+BDEPEND=dev-lang/perl dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 handbook? ( >=kde-frameworks/kdoctools-5.63:5 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-libs/libpcre dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=ECMAScipt compatible parser and engine
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD-2 LGPL-2+
-RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kjs-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/portingAids/kjs-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a0eed06e62e28834400e65704a31081
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.60.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.60.0
index d4d178526dbf..e665e516b5fc 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kjs-5.60:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/kjsembed-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c9690f3ebe4642513459a81adcfb790
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.62.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.63.0
index 44dd59a1ccdd..2ecc11af97a9 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.63.0
@@ -1,18 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 handbook? ( >=kde-frameworks/kdoctools-5.62:5 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 handbook? ( >=kde-frameworks/kdoctools-5.63:5 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kjs-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/designer-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kjs-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/designer-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Framework binding JavaScript objects to QObjects
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kjs-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kjsembed-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kjs-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/portingAids/kjsembed-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b922ba849f5df07598f031a87b0b631b
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.60.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.60.0
index 7d66a35aea9b..7fbdf62547ab 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.60.0
@@ -10,9 +10,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/kmediaplayer-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d725bf6277d797c32a3f1d90e79642da
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.62.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.62.0
deleted file mode 100644
index d0e30098f43a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Framework providing a common interface for KParts that can play media files
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kmediaplayer-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=53bb73b1c43bc0cf83744a45c00b31a0
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.63.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.63.0
new file mode 100644
index 000000000000..feb3b03f8559
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kparts-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Framework providing a common interface for KParts that can play media files
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/kparts-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/portingAids/kmediaplayer-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=53bb73b1c43bc0cf83744a45c00b31a0
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.60.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.60.0
index 671bf747b82b..b58be1580a90 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.60:5 >=kde-frameworks/karchive-5.60:5 >=kde-frameworks/kcompletion-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kitemviews-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/ktextwidgets-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kirigami-5.60:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/knewstuff-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=48669c605da5b3e468b7c2467ef62bb4
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.62.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.62.0
deleted file mode 100644
index 56aeeec07593..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.62:5 >=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework for downloading and sharing additional application data
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/attica-5.62:5 >=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kirigami-5.62:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/knewstuff-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=e6096df047d5eb3a1ab83b48b1195d29
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.63.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.63.0
new file mode 100644
index 000000000000..e728617c797e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.63:5 >=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/ktextwidgets-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework for downloading and sharing additional application data
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/attica-5.63:5 >=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/ktextwidgets-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kirigami-5.63:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/knewstuff-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e6096df047d5eb3a1ab83b48b1195d29
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.60.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.60.0
index bfe97c193a05..0b1c891f3500 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/knotifications-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=33b4b5b93cdc1ed2da31d83699dd6cb9
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.62.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.63.0
index 9e6009720343..e68fef364821 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.63.0
@@ -1,18 +1,14 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DEPEND=>=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for notifying the user of an event
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=dbus nls phonon speech X debug doc
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/knotifications-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/knotifications-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5345b60ee0e246a8a1df953ebe0243e5
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.60.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.60.0
index c1a05c16bbaf..79a69f3dd369 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kio-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/knotifyconfig-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c38c2f3e1226d25f2fd5c2972b166e3d
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.62.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.62.0
deleted file mode 100644
index 25917cadbc0a..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 phonon? ( media-libs/phonon[qt5(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework for configuring desktop notifications
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=phonon debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/knotifyconfig-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=7e56c4d4ee885056931fe839aa6fbae5
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.63.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.63.0
new file mode 100644
index 000000000000..fa8eee862f97
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kio-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 phonon? ( media-libs/phonon[qt5(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework for configuring desktop notifications
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=phonon debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kio-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/knotifyconfig-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7e56c4d4ee885056931fe839aa6fbae5
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.60.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.60.0
index 3c7ea6032e76..cb9d5118c81b 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kpackage-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ef2a59e9e53e4f2a0bedb39a2b82556
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.62.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.62.0
deleted file mode 100644
index 702963bb76c6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.62:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework to install and load packages of non binary content
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kpackage-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=cabbdcc92ae000804e1c07889777d040
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.63.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.63.0
new file mode 100644
index 000000000000..89795dcd6ccc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.63:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework to install and load packages of non binary content
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kpackage-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cabbdcc92ae000804e1c07889777d040
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.60.0 b/metadata/md5-cache/kde-frameworks/kparts-5.60.0
index 547c733b8ff3..90d6c87f90d9 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kjobwidgets-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kparts-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b5d02ea0c87530f28b9f33fbb5623706
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.62.0 b/metadata/md5-cache/kde-frameworks/kparts-5.62.0
deleted file mode 100644
index de2dd1ef0a6e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kparts-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/ktextwidgets-5.62:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework providing elaborate user-interface components
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kparts-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=4883d5a35a32d54c34370274d5fcce84
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.63.0 b/metadata/md5-cache/kde-frameworks/kparts-5.63.0
new file mode 100644
index 000000000000..898533ee36c2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kjobwidgets-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/ktextwidgets-5.63:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework providing elaborate user-interface components
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kjobwidgets-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kparts-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4883d5a35a32d54c34370274d5fcce84
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.60.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.60.0
index 33bc9aaaef09..afdca8e43d1d 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kitemviews-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kpeople-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f65a931c9f491c6b690c23f01923701
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.62.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.62.0
deleted file mode 100644
index a894d9ef83c8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=KDE contact person abstraction library
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/kpeople.git
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kpeople-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=78cd97d7fcddb4540cbce2778f308dce
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.63.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.63.0
new file mode 100644
index 000000000000..cb162fd386d6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=KDE contact person abstraction library
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/kpeople.git
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kpeople-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=78cd97d7fcddb4540cbce2778f308dce
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.60.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.60.0
index cf8bc4f3aecb..f948cb417593 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kplotting-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=125961b7e643c462d2b29060b16fcf0a
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.62.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.63.0
index 6b2f16eb4fc6..87a074ec9133 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework providing easy data-plotting functions
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=test debug designer doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kplotting-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kplotting-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f9c0fb653817f56bc35e2d91629c9ba9
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.60.0 b/metadata/md5-cache/kde-frameworks/kpty-5.60.0
index 089550df2a6c..358bfd3d0ab4 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kpty-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3a379fe38744a1c5314bea149339e44
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.62.0 b/metadata/md5-cache/kde-frameworks/kpty-5.62.0
deleted file mode 100644
index c4b5d7108127..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpty-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 sys-libs/libutempter dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework for pseudo terminal devices and running child processes
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kpty-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=9296bc5641c78fc1fd9a4410e72a8ec7
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.63.0 b/metadata/md5-cache/kde-frameworks/kpty-5.63.0
new file mode 100644
index 000000000000..2ba8d7d02c22
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 sys-libs/libutempter dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework for pseudo terminal devices and running child processes
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kpty-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9296bc5641c78fc1fd9a4410e72a8ec7
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.60.0 b/metadata/md5-cache/kde-frameworks/kross-5.60.0
index 546d9c93836a..353119c1c131 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kparts-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kxmlgui-5.60:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/portingAids/kross-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=46259dbc21cf36b2040bab5c4f0a34ee
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.62.0 b/metadata/md5-cache/kde-frameworks/kross-5.62.0
deleted file mode 100644
index 1d7b2454cf48..000000000000
--- a/metadata/md5-cache/kde-frameworks/kross-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 handbook? ( >=kde-frameworks/kdoctools-5.62:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/designer-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Framework for embedding scripting into applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kparts-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/portingAids/kross-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=281b005dcd85ed889ae9a1133215ffcd
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.63.0 b/metadata/md5-cache/kde-frameworks/kross-5.63.0
new file mode 100644
index 000000000000..f77b275f8609
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kross-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 handbook? ( >=kde-frameworks/kdoctools-5.63:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kparts-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/designer-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Framework for embedding scripting into applications
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kparts-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/portingAids/kross-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=281b005dcd85ed889ae9a1133215ffcd
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.60.0 b/metadata/md5-cache/kde-frameworks/krunner-5.60.0
index 3b3dff0d4137..1e4413ede2f1 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kio-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/plasma-5.60:5 >=kde-frameworks/solid-5.60:5 >=kde-frameworks/threadweaver-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/krunner-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16cd4abf6666ff533ace822d8a5e6136
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.62.0 b/metadata/md5-cache/kde-frameworks/krunner-5.62.0
deleted file mode 100644
index 38cdd4eff6c2..000000000000
--- a/metadata/md5-cache/kde-frameworks/krunner-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/plasma-5.62:5 >=kde-frameworks/solid-5.62:5 >=kde-frameworks/threadweaver-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework for providing different actions given a string query
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/plasma-5.62:5 >=kde-frameworks/solid-5.62:5 >=kde-frameworks/threadweaver-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/krunner-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=8f16ac34f4b421a3d9fd463f0a8369c1
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.63.0 b/metadata/md5-cache/kde-frameworks/krunner-5.63.0
new file mode 100644
index 000000000000..7fcbe253ce4e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/plasma-5.63:5 >=kde-frameworks/solid-5.63:5 >=kde-frameworks/threadweaver-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework for providing different actions given a string query
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/plasma-5.63:5 >=kde-frameworks/solid-5.63:5 >=kde-frameworks/threadweaver-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/krunner-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8f16ac34f4b421a3d9fd463f0a8369c1
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.60.0 b/metadata/md5-cache/kde-frameworks/kservice-5.60.0
index 953c18892d12..a08788bf9bae 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kd
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kservice-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e27ed9374cf9a2179891862e05e80de
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.62.0 b/metadata/md5-cache/kde-frameworks/kservice-5.62.0
deleted file mode 100644
index b1bcd5b72800..000000000000
--- a/metadata/md5-cache/kde-frameworks/kservice-5.62.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.62:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Advanced plugin and service introspection
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2 LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kcrash-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kservice-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=62b451ea58e805fec73d677921e7ae13
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.63.0 b/metadata/md5-cache/kde-frameworks/kservice-5.63.0
new file mode 100644
index 000000000000..4f3d7b46b5ed
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.63.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.63:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Advanced plugin and service introspection
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2 LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kcrash-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RESTRICT=test
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kservice-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=62b451ea58e805fec73d677921e7ae13
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.60.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.60.0
index a66df6297c52..48afd8764969 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.60:5 >=kde-frameworks/kauth-5.60:5 >=kde-fra
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/ktexteditor-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97ffcf0f180fe43616f8b8f270228846
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.62.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.62.0
deleted file mode 100644
index 2031bb46502b..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.62.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=test? ( >=kde-frameworks/kservice-5.62:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kauth-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kguiaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/kparts-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=kde-frameworks/sonnet-5.62:5 >=kde-frameworks/syntax-highlighting-5.62:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework providing a full text editor component
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=editorconfig git test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kauth-5.62:5 >=kde-frameworks/kcodecs-5.62:5 >=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kguiaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/kjobwidgets-5.62:5 >=kde-frameworks/kparts-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=kde-frameworks/sonnet-5.62:5 >=kde-frameworks/syntax-highlighting-5.62:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/ktexteditor-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=4fc6b4448fd83a1706923558fcb469fa
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.63.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.63.0
new file mode 100644
index 000000000000..d4f6ece08e84
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.63.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=kde-frameworks/kservice-5.63:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kauth-5.63:5 >=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kguiaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kjobwidgets-5.63:5 >=kde-frameworks/kparts-5.63:5 >=kde-frameworks/ktextwidgets-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=kde-frameworks/sonnet-5.63:5 >=kde-frameworks/syntax-highlighting-5.63:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework providing a full text editor component
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=editorconfig git test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kauth-5.63:5 >=kde-frameworks/kcodecs-5.63:5 >=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kguiaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/kjobwidgets-5.63:5 >=kde-frameworks/kparts-5.63:5 >=kde-frameworks/ktextwidgets-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=kde-frameworks/sonnet-5.63:5 >=kde-frameworks/syntax-highlighting-5.63:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RESTRICT=test
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/ktexteditor-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4fc6b4448fd83a1706923558fcb469fa
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.60.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.60.0
index 8ea07bf7a787..de41e53e6fb5 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.60:5 >=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=kde-frameworks/sonnet-5.60:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/ktextwidgets-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d19072f46fbf740052f6f45717f7882
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.62.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.62.0
deleted file mode 100644
index 133257d2aadb..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/sonnet-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=speech test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/sonnet-5.62:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/ktextwidgets-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=b64d42daeb885aea5278d8b90df03603
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.63.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.63.0
new file mode 100644
index 000000000000..fe5bad4e9131
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=kde-frameworks/sonnet-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=speech test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=kde-frameworks/sonnet-5.63:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/ktextwidgets-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b64d42daeb885aea5278d8b90df03603
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.60.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.60.0
index 56988cea96de..b88e84fd47dd 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.60:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kunitconversion-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bbb1e5eb8312ee849ff67b846d7b3ed
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.62.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.63.0
index 4d2deb136577..15de7e60acc2 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.63.0
@@ -1,18 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.62:5 >=dev-qt/qtnetwork-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DEPEND=>=kde-frameworks/ki18n-5.63:5 >=dev-qt/qtnetwork-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for converting units
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.62:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kunitconversion-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/ki18n-5.63:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kunitconversion-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ba11d07023757f402965a792d7dcbcc
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.60.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.60.0
index 87756427814b..eae6d0c79b0a 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kdbusaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/knotifications-5.60:5 >=kde-frameworks/kservice-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kwallet-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=62f890378ec76e82dc27d4e97b3c0509
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.62.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.62.0
deleted file mode 100644
index 4980389a215f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.62:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework providing desktop-wide storage for passwords
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=gpg +man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kdbusaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kwallet-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=19c7d9ec78081b56925bd49b5e4a0f4a
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.63.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.63.0
new file mode 100644
index 000000000000..da6ef344f7e1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.63:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/knotifications-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework providing desktop-wide storage for passwords
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=gpg +man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kdbusaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/knotifications-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kwallet-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c437e1fe4cec7ac08f23f5cb808a2d99
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.60.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.60.0
index b4750b9a01c3..6d30ad7efc56 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[egl] >=dev-libs/w
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kwayland-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1334a5382ab7f470702b4b9dca3a6e66
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.62.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.63.0
index b420117a6cb3..4856ab8aadd5 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[egl] >=dev-libs/wayland-1.15.0 media-libs/mesa[egl] >=dev-libs/wayland-protocols-1.15 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
@@ -7,13 +7,9 @@ HOMEPAGE=https://cgit.kde.org/kwayland.git
 IUSE=debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[egl] >=dev-libs/wayland-1.15.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[egl] >=dev-libs/wayland-1.15.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kwayland-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kwayland-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c149d0ee480bd64b96b389047fe3f8ae
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.60.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.60.0
index 27c28519f325..62944a96fb1b 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kwidgetsaddons-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=abbff0774b4ba0e293b35741b661395f
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.62.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.62.0
deleted file mode 100644
index 007658842b22..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=An assortment of high-level widgets for common tasks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kwidgetsaddons-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=5e12afa32064f07495b63b33a975cd2b
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.63.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.63.0
new file mode 100644
index 000000000000..12d950ed2378
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=An assortment of high-level widgets for common tasks
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kwidgetsaddons-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=63b6ead5d2e31962e107e9292e720f0a
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.60.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.60.0
index 5374f549fa44..57142ea264da 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11e
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kwindowsystem-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0885490603b8700b58e9f23fe7402b7
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.62.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.63.0
index 60e058ca9548..b05f514c265e 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework providing access to properties and features of the window manager
@@ -7,13 +7,9 @@ HOMEPAGE=https://kde.org/
 IUSE=nls X test debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kwindowsystem-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kwindowsystem-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8a1f4008c2f068d86e731385ef5bccf
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.60.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.60.0
index 795bca112c6d..441d6fda0a6f 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.60:5 >=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/kglobalaccel-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kitemviews-5.60:5 >=kde-frameworks/ktextwidgets-5.60:5 >=kde-frameworks/kwidgetsaddons-5.60:5 >=kde-frameworks/kwindowsystem-5.60:5 >=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 attica? ( >=kde-frameworks/attica-5.60:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kxmlgui-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6be1ee2212b0f516319ab7914a9fe65c
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.62.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.62.0
deleted file mode 100644
index 15393394b7cc..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kglobalaccel-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 attica? ( >=kde-frameworks/attica-5.62:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=attica test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kglobalaccel-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kitemviews-5.62:5 >=kde-frameworks/ktextwidgets-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 attica? ( >=kde-frameworks/attica-5.62:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kxmlgui-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=39a6a39690a60cece426647fb97a9f59
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.63.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.63.0
new file mode 100644
index 000000000000..6060f63bdddb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kglobalaccel-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/ktextwidgets-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 attica? ( >=kde-frameworks/attica-5.63:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=attica test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kglobalaccel-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kitemviews-5.63:5 >=kde-frameworks/ktextwidgets-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 attica? ( >=kde-frameworks/attica-5.63:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kxmlgui-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=39a6a39690a60cece426647fb97a9f59
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.60.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.60.0
index fd0b5ab64412..be97cc608832 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.60.0
@@ -10,9 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-frameworks/kio-5.60:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/kxmlrpcclient-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f609e16d03f09a43f4833207763eb77
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.62.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.62.0
deleted file mode 100644
index 4bbad7ece159..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/kxmlrpcclient-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=fcb92ecbe4b1266177036cb0b9701305
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.63.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.63.0
new file mode 100644
index 000000000000..ae15f0aa19c8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kio-5.63:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kio-5.63:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/kxmlrpcclient-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fcb92ecbe4b1266177036cb0b9701305
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.60.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.60.0
index b18297a317af..d4a4ddb2e8f4 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-misc/modemmanager >
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/modemmanager-qt-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57dc2c72d0eb5c79690bc7c18e144277
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.62.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.63.0
index ebc0ba6a965c..09392c951ceb 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-misc/modemmanager dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=ModemManager bindings for Qt
@@ -7,13 +7,9 @@ HOMEPAGE=https://kde.org/
 IUSE=debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/modemmanager-qt-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/modemmanager-qt-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=831b5b64ca44199fa49dcf0ae2236f4f
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.60.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.60.0
index e13a63661b55..395f772372eb 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] !net-libs/libnm-qt:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit] >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/networkmanager-qt-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4205581b4fc59a570373f1330c09a1d5
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.62.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.62.0
deleted file mode 100644
index a122cb5c234d..000000000000
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.62.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=NetworkManager bindings for Qt
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=teamd debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] !net-libs/libnm-qt:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit] >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/networkmanager-qt-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=fd2f7b0aea0a301467124b91c09ee1e3
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.63.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.63.0
new file mode 100644
index 000000000000..53b906ba2b3b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.63.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=NetworkManager bindings for Qt
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=teamd debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[consolekit] >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/networkmanager-qt-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a8c09f4179bf131a437ee1ded8958457
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.60.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.60.0
index 6ff9d1eeb48e..294894c11a13 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=!kde-frameworks/oxygen-icons:4
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/oxygen-icons5-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4752b0708b985bb477696a83380c3803
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.62.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.63.0
index b3c6b2fc4c2f..5b4b190ae112 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.62:5 >=dev-qt/qtcore-5.12.3:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.63:5 >=dev-qt/qtcore-5.12.3:5 test? ( app-misc/fdupes ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=test? ( >=dev-qt/qttest-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 )
 DESCRIPTION=Oxygen SVG icon theme
@@ -8,11 +8,7 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-3
 RDEPEND=!kde-frameworks/oxygen-icons:4
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/oxygen-icons5-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/oxygen-icons5-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97310d661c31532588775c149ef06dad
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.60.0 b/metadata/md5-cache/kde-frameworks/plasma-5.60.0
index 53936de1a7ee..72c8b795f519 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.60:5 >=kde-frameworks/karchive-5.60:5 >=k
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/plasma-framework-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a5224a61961f610f0196eb1d2e75780c
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.62.0 b/metadata/md5-cache/kde-frameworks/plasma-5.62.0
deleted file mode 100644
index e4c05118708c..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.62.0
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=>=kde-frameworks/kdoctools-5.62:5 dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.62:5 >=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kdeclarative-5.62:5 >=kde-frameworks/kglobalaccel-5.62:5 >=kde-frameworks/kguiaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kirigami-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kpackage-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[gles2=] >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.62:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-DESCRIPTION=Plasma framework
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=gles2 wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.62:5 >=kde-frameworks/karchive-5.62:5 >=kde-frameworks/kconfig-5.62:5 >=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/kdeclarative-5.62:5 >=kde-frameworks/kglobalaccel-5.62:5 >=kde-frameworks/kguiaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kirigami-5.62:5 >=kde-frameworks/knotifications-5.62:5 >=kde-frameworks/kpackage-5.62:5 >=kde-frameworks/kservice-5.62:5 >=kde-frameworks/kwidgetsaddons-5.62:5 >=kde-frameworks/kwindowsystem-5.62:5 >=kde-frameworks/kxmlgui-5.62:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[gles2=] >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.62:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/plasma-framework-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
-_md5_=ba850f4c341a42db2a1e6d7d0a03076e
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.63.0 b/metadata/md5-cache/kde-frameworks/plasma-5.63.0
new file mode 100644
index 000000000000..e7de0fb2b866
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.63.0
@@ -0,0 +1,15 @@
+BDEPEND=>=kde-frameworks/kdoctools-5.63:5 dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.63:5 >=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kdeclarative-5.63:5 >=kde-frameworks/kglobalaccel-5.63:5 >=kde-frameworks/kguiaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kirigami-5.63:5 >=kde-frameworks/knotifications-5.63:5 >=kde-frameworks/kpackage-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[gles2=] >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.63:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DESCRIPTION=Plasma framework
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=gles2 wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kactivities-5.63:5 >=kde-frameworks/karchive-5.63:5 >=kde-frameworks/kconfig-5.63:5 >=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/kdeclarative-5.63:5 >=kde-frameworks/kglobalaccel-5.63:5 >=kde-frameworks/kguiaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kirigami-5.63:5 >=kde-frameworks/knotifications-5.63:5 >=kde-frameworks/kpackage-5.63:5 >=kde-frameworks/kservice-5.63:5 >=kde-frameworks/kwidgetsaddons-5.63:5 >=kde-frameworks/kwindowsystem-5.63:5 >=kde-frameworks/kxmlgui-5.63:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[gles2=] >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.63:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RESTRICT=test
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/plasma-framework-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ba850f4c341a42db2a1e6d7d0a03076e
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.60.0 b/metadata/md5-cache/kde-frameworks/prison-5.60.0
index 28e62704e504..df6c37ff5e14 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.60.0
@@ -10,9 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/prison-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=367cae885cb95873f1c57faeaee8c7d7
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.62.0 b/metadata/md5-cache/kde-frameworks/prison-5.63.0
index 9436fd9dd338..488b2570aa06 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.12.3:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=QRCode and data matrix barcode library
@@ -7,12 +7,8 @@ HOMEPAGE=https://cgit.kde.org/prison.git
 IUSE=qml debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/prison-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/prison-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=33db6b8759d040c4296565934463f72a
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.60.0 b/metadata/md5-cache/kde-frameworks/purpose-5.60.0
index 12af4b3acdd7..4ff7239db3d1 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.60.0
@@ -11,9 +11,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.60:5 >=kde-frameworks/ki18n-5.60:5 >=kde-
 RESTRICT=test
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/purpose-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41036cd65fc46b57faf80a4258ea69e5
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.62.0 b/metadata/md5-cache/kde-frameworks/purpose-5.63.0
index 039d10cd5ca2..7785a087f1e6 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.63.0
@@ -1,19 +1,15 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kirigami-5.62:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kirigami-5.63:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=+kaccounts debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.62:5 >=kde-frameworks/ki18n-5.62:5 >=kde-frameworks/kio-5.62:5 >=kde-frameworks/kirigami-5.62:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63:5 >=kde-frameworks/ki18n-5.63:5 >=kde-frameworks/kio-5.63:5 >=kde-frameworks/kirigami-5.63:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 RESTRICT=test
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/purpose-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/purpose-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c7cda65d54008c6125e1df3eca8164f
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.60.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.60.0
index 494ab3acd8ae..ef27e238aab0 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.60.0
@@ -10,9 +10,5 @@ LICENSE=|| ( GPL-2+ LGPL-3+ )
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.60:5 >=kde-frameworks/kiconthemes-5.60:5 >=kde-frameworks/kirigami-5.60:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/qqc2-desktop-style-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94fc72bae3022e1a8e5b8317950ded2f
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.62.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.63.0
index e72099e46ccd..3b877b001626 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.63.0
@@ -1,18 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kirigami-5.62:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kirigami-5.63:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2+ LGPL-3+ )
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.62:5 >=kde-frameworks/kiconthemes-5.62:5 >=kde-frameworks/kirigami-5.62:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/qqc2-desktop-style-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.63:5 >=kde-frameworks/kiconthemes-5.63:5 >=kde-frameworks/kirigami-5.63:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/qqc2-desktop-style-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f75add89ab7dcdc67a8b1e02bf60de0f
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.60.0 b/metadata/md5-cache/kde-frameworks/solid-5.60.0
index 2957e0670a76..5b820585fc3a 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-fs/udisks:2 virtual/libudev:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/solid-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=625c0e9d2c3f1b47d25fa509ddc5fd3e
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.62.0 b/metadata/md5-cache/kde-frameworks/solid-5.63.0
index 948a2e4d1ad2..fd44c777c6e6 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-fs/udisks:2 virtual/libudev:= test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=nls test debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-fs/udisks:2 virtual/libudev:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/solid-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-fs/udisks:2 virtual/libudev:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/solid-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a24da3af6306a572aeb9165973269c1
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.60.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.60.0
index aa56e54d0e70..e0773311e2c8 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/sonnet-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd7ee658dc8b1d017125f7783ca5894a
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.62.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.63.0
index 9a5626e73286..365e8fd4b5e2 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.62:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63:5 designer? ( >=dev-qt/designer-5.12.3:5 ) doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=aspell +hunspell nls test debug designer doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/sonnet-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/sonnet-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98802b15923a403ec4212ee0dde0019e
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.60.0 b/metadata/md5-cache/kde-frameworks/syndication-5.60.0
index c1ec4cd4265a..9d1ec6c5aca7 100644
--- a/metadata/md5-cache/kde-frameworks/syndication-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.60:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/syndication-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=62d0dde3569cebcf7fb07ef73b0d5424
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.62.0 b/metadata/md5-cache/kde-frameworks/syndication-5.63.0
index 4b4f91a51f98..d3bc1ce905f7 100644
--- a/metadata/md5-cache/kde-frameworks/syndication-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.63.0
@@ -1,18 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.62:5 >=dev-qt/qtxml-5.12.3:5 test? ( >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DEPEND=>=kde-frameworks/kcodecs-5.63:5 >=dev-qt/qtxml-5.12.3:5 test? ( >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Library for parsing RSS and Atom feeds
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug doc test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.62:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/syndication-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/kcodecs-5.63:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/syndication-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b13ec3f095699da5d354fedf1249b0e0
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.60.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.60.0
index 34ec01459576..4d490874b2d9 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/syntax-highlighting-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68492c8d951471b732c3826a0c1348df
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.62.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.63.0
index 7e2e0fb66193..3f750877eca9 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for syntax highlighting
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=nls debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/syntax-highlighting-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/syntax-highlighting-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0bb0bcca5e221b206b98d6a4044e7bb0
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.60.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.60.0
index 5754970c802c..6af8b373091b 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.60.0
@@ -10,9 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/threadweaver-5.60.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc9d6396b36c219b189061d9bc6465bb
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.62.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.63.0
index 0c25b5861cc0..d6408f6cc359 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.62.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.63.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.62:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.63:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Framework for managing threads using job and queue-based interfaces
@@ -7,12 +7,8 @@ HOMEPAGE=https://kde.org/
 IUSE=debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.62:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
-SLOT=5/5.62
-SRC_URI=mirror://kde/stable/frameworks/5.62/threadweaver-5.62.0.tar.xz
-<<<<<<< HEAD
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-=======
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
->>>>>>> next
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.63:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+SLOT=5/5.63
+SRC_URI=mirror://kde/stable/frameworks/5.63/threadweaver-5.63.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	kde5	e9642fa5c53197b7ba3d9e2c8460d5c5	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=719649c57268d7347a5f24b6cc16a47c