diff --git a/recipes-kf5/obsolete/kdelibs4support_5.56.0.bb b/recipes-kf5/obsolete/kdelibs4support_5.58.0.bb
similarity index 100%
copy from recipes-kf5/obsolete/kdelibs4support_5.56.0.bb
copy to recipes-kf5/obsolete/kdelibs4support_5.58.0.bb
diff --git a/recipes-kf5/obsolete/kjs_5.56.0.bb b/recipes-kf5/obsolete/kjs_5.58.0.bb
similarity index 100%
rename from recipes-kf5/obsolete/kjs_5.56.0.bb
rename to recipes-kf5/obsolete/kjs_5.58.0.bb
diff --git a/recipes-kf5/obsolete/kjsembed_5.56.0.bb b/recipes-kf5/obsolete/kjsembed_5.58.0.bb
similarity index 100%
rename from recipes-kf5/obsolete/kjsembed_5.56.0.bb
rename to recipes-kf5/obsolete/kjsembed_5.58.0.bb
diff --git a/recipes-kf5/tier1/attica_5.56.0.bb b/recipes-kf5/tier1/attica_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/attica_5.56.0.bb
rename to recipes-kf5/tier1/attica_5.58.0.bb
diff --git a/recipes-kf5/tier1/bluez-qt_5.56.0.bb b/recipes-kf5/tier1/bluez-qt_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/bluez-qt_5.56.0.bb
rename to recipes-kf5/tier1/bluez-qt_5.58.0.bb
diff --git a/recipes-kf5/tier1/breeze-icons_5.56.0.bb b/recipes-kf5/tier1/breeze-icons_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/breeze-icons_5.56.0.bb
rename to recipes-kf5/tier1/breeze-icons_5.58.0.bb
diff --git a/recipes-kf5/tier1/extra-cmake-modules_5.56.0.bb b/recipes-kf5/tier1/extra-cmake-modules_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/extra-cmake-modules_5.56.0.bb
rename to recipes-kf5/tier1/extra-cmake-modules_5.58.0.bb
diff --git a/recipes-kf5/tier1/karchive_5.56.0.bb b/recipes-kf5/tier1/karchive_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/karchive_5.56.0.bb
rename to recipes-kf5/tier1/karchive_5.58.0.bb
diff --git a/recipes-kf5/tier1/kcodecs_5.56.0.bb b/recipes-kf5/tier1/kcodecs_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kcodecs_5.56.0.bb
rename to recipes-kf5/tier1/kcodecs_5.58.0.bb
diff --git a/recipes-kf5/tier1/kconfig_5.56.0.bb b/recipes-kf5/tier1/kconfig_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kconfig_5.56.0.bb
rename to recipes-kf5/tier1/kconfig_5.58.0.bb
diff --git a/recipes-kf5/tier1/kcoreaddons_5.56.0.bb b/recipes-kf5/tier1/kcoreaddons_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kcoreaddons_5.56.0.bb
rename to recipes-kf5/tier1/kcoreaddons_5.58.0.bb
diff --git a/recipes-kf5/tier1/kdbusaddons_5.56.0.bb b/recipes-kf5/tier1/kdbusaddons_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kdbusaddons_5.56.0.bb
rename to recipes-kf5/tier1/kdbusaddons_5.58.0.bb
diff --git a/recipes-kf5/tier1/kdnssd_5.56.0.bb b/recipes-kf5/tier1/kdnssd_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kdnssd_5.56.0.bb
rename to recipes-kf5/tier1/kdnssd_5.58.0.bb
diff --git a/recipes-kf5/tier1/kguiaddons_5.56.0.bb b/recipes-kf5/tier1/kguiaddons_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kguiaddons_5.56.0.bb
rename to recipes-kf5/tier1/kguiaddons_5.58.0.bb
diff --git a/recipes-kf5/tier1/kholidays_5.56.0.bb b/recipes-kf5/tier1/kholidays_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kholidays_5.56.0.bb
rename to recipes-kf5/tier1/kholidays_5.58.0.bb
diff --git a/recipes-kf5/tier1/ki18n_5.56.0.bb b/recipes-kf5/tier1/ki18n_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/ki18n_5.56.0.bb
rename to recipes-kf5/tier1/ki18n_5.58.0.bb
diff --git a/recipes-kf5/tier1/kidletime_5.56.0.bb b/recipes-kf5/tier1/kidletime_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kidletime_5.56.0.bb
rename to recipes-kf5/tier1/kidletime_5.58.0.bb
diff --git a/recipes-kf5/tier1/kimageformats_5.56.0.bb b/recipes-kf5/tier1/kimageformats_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kimageformats_5.56.0.bb
rename to recipes-kf5/tier1/kimageformats_5.58.0.bb
diff --git a/recipes-kf5/tier1/kitemmodels_5.56.0.bb b/recipes-kf5/tier1/kirigami_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kitemmodels_5.56.0.bb
rename to recipes-kf5/tier1/kirigami_5.58.0.bb
diff --git a/recipes-kf5/tier1/kitemviews_5.56.0.bb b/recipes-kf5/tier1/kitemmodels_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kitemviews_5.56.0.bb
rename to recipes-kf5/tier1/kitemmodels_5.58.0.bb
diff --git a/recipes-kf5/tier1/kplotting_5.56.0.bb b/recipes-kf5/tier1/kitemviews_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kplotting_5.56.0.bb
rename to recipes-kf5/tier1/kitemviews_5.58.0.bb
diff --git a/recipes-kf5/tier1/ksyntaxhighlighting_5.56.0.bb b/recipes-kf5/tier1/kplotting_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/ksyntaxhighlighting_5.56.0.bb
rename to recipes-kf5/tier1/kplotting_5.58.0.bb
diff --git a/recipes-kf5/tier1/kwayland_5.56.0.bb b/recipes-kf5/tier1/ksyntaxhighlighting_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kwayland_5.56.0.bb
rename to recipes-kf5/tier1/ksyntaxhighlighting_5.58.0.bb
diff --git a/recipes-kf5/tier1/kwidgetsaddons_5.56.0.bb b/recipes-kf5/tier1/kwayland_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kwidgetsaddons_5.56.0.bb
rename to recipes-kf5/tier1/kwayland_5.58.0.bb
diff --git a/recipes-kf5/tier1/kwindowsystem_5.56.0.bb b/recipes-kf5/tier1/kwidgetsaddons_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kwindowsystem_5.56.0.bb
rename to recipes-kf5/tier1/kwidgetsaddons_5.58.0.bb
diff --git a/recipes-kf5/tier1/modemmanager-qt_5.56.0.bb b/recipes-kf5/tier1/kwindowsystem_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/modemmanager-qt_5.56.0.bb
rename to recipes-kf5/tier1/kwindowsystem_5.58.0.bb
diff --git a/recipes-kf5/tier1/networkmanager-qt_5.56.0.bb b/recipes-kf5/tier1/modemmanager-qt_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/networkmanager-qt_5.56.0.bb
rename to recipes-kf5/tier1/modemmanager-qt_5.58.0.bb
diff --git a/recipes-kf5/tier1/oxygen-icons_5.56.0.bb b/recipes-kf5/tier1/networkmanager-qt_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/oxygen-icons_5.56.0.bb
rename to recipes-kf5/tier1/networkmanager-qt_5.58.0.bb
diff --git a/recipes-kf5/tier1/prison_5.56.0.bb b/recipes-kf5/tier1/oxygen-icons_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/prison_5.56.0.bb
rename to recipes-kf5/tier1/oxygen-icons_5.58.0.bb
diff --git a/recipes-kf5/tier1/solid_5.56.0.bb b/recipes-kf5/tier1/prison_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/solid_5.56.0.bb
rename to recipes-kf5/tier1/prison_5.58.0.bb
diff --git a/recipes-kf5/tier1/sonnet_5.56.0.bb b/recipes-kf5/tier1/solid_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/sonnet_5.56.0.bb
rename to recipes-kf5/tier1/solid_5.58.0.bb
diff --git a/recipes-kf5/tier1/threadweaver_5.56.0.bb b/recipes-kf5/tier1/sonnet_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier1/threadweaver_5.56.0.bb
rename to recipes-kf5/tier1/sonnet_5.58.0.bb
diff --git a/recipes-kf5/tier2/kactivities_5.56.0.bb b/recipes-kf5/tier1/threadweaver_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kactivities_5.56.0.bb
rename to recipes-kf5/tier1/threadweaver_5.58.0.bb
diff --git a/recipes-kf5/tier2/kauth_5.56.0.bb b/recipes-kf5/tier2/kactivities_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kauth_5.56.0.bb
rename to recipes-kf5/tier2/kactivities_5.58.0.bb
diff --git a/recipes-kf5/tier2/kcompletion_5.56.0.bb b/recipes-kf5/tier2/kauth_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kcompletion_5.56.0.bb
rename to recipes-kf5/tier2/kauth_5.58.0.bb
diff --git a/recipes-kf5/tier2/kcrash_5.56.0.bb b/recipes-kf5/tier2/kcompletion_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kcrash_5.56.0.bb
rename to recipes-kf5/tier2/kcompletion_5.58.0.bb
diff --git a/recipes-kf5/tier2/kdoctools_5.56.0.bb b/recipes-kf5/tier2/kcrash_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kdoctools_5.56.0.bb
rename to recipes-kf5/tier2/kcrash_5.58.0.bb
diff --git a/recipes-kf5/tier2/kfilemetadata_5.56.0.bb b/recipes-kf5/tier2/kdoctools_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kfilemetadata_5.56.0.bb
rename to recipes-kf5/tier2/kdoctools_5.58.0.bb
diff --git a/recipes-kf5/tier2/kjobwidgets_5.56.0.bb b/recipes-kf5/tier2/kfilemetadata_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kjobwidgets_5.56.0.bb
rename to recipes-kf5/tier2/kfilemetadata_5.58.0.bb
diff --git a/recipes-kf5/tier2/knotifications_5.56.0.bb b/recipes-kf5/tier2/kjobwidgets_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier2/knotifications_5.56.0.bb
rename to recipes-kf5/tier2/kjobwidgets_5.58.0.bb
diff --git a/recipes-kf5/tier2/kpackage_5.56.0.bb b/recipes-kf5/tier2/knotifications_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kpackage_5.56.0.bb
rename to recipes-kf5/tier2/knotifications_5.58.0.bb
diff --git a/recipes-kf5/tier2/kpackage.inc b/recipes-kf5/tier2/kpackage.inc
index 6488789..1e4c2de 100644
--- a/recipes-kf5/tier2/kpackage.inc
+++ b/recipes-kf5/tier2/kpackage.inc
@@ -1,22 +1,21 @@
 DESCRIPTION = "KPackage"
 HOMEPAGE = "https://api.kde.org/frameworks/kpackage/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     karchive \
     kcoreaddons \
     kpackage-native \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/kpackage;nobranch=1 \
-    file://0001-kf5-host-tooling-support.diff \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit ki18n
diff --git a/recipes-kf5/tier2/kpackage/0001-kf5-host-tooling-support.diff b/recipes-kf5/tier2/kpackage/0001-kf5-host-tooling-support.diff
deleted file mode 100644
index 939dd0d..0000000
--- a/recipes-kf5/tier2/kpackage/0001-kf5-host-tooling-support.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8cf8412..c2d9811 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -123,6 +123,11 @@ install(EXPORT KF5PackageTargets
-         FILE KF5PackageTargets.cmake
-         NAMESPACE KF5::
-         COMPONENT Devel)
-+install(EXPORT KF5PackageToolsTargets
-+        DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
-+        FILE KF5PackageToolsTargets.cmake
-+        NAMESPACE KF5::
-+        COMPONENT Devel)
- 
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kpackage_version.h
-         DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel )
-diff --git a/KF5PackageConfig.cmake.in b/KF5PackageConfig.cmake.in
-index 0009c46..40c7dfe 100644
---- a/KF5PackageConfig.cmake.in
-+++ b/KF5PackageConfig.cmake.in
-@@ -3,6 +3,13 @@
- # Any changes in this ".cmake" file will be overwritten by CMake, the source is the ".cmake.in" file.
- 
- include("${CMAKE_CURRENT_LIST_DIR}/KF5PackageTargets.cmake")
-+if (CMAKE_CROSSCOMPILING AND KF5_HOST_TOOLING)
-+    find_file(KPACKAGE_TARGETSFILE KF5Package/KF5PackageToolsTargets.cmake PATHS ${KF5_HOST_TOOLING} ${CMAKE_CURRENT_LIST_DIR} NO_DEFAULT_PATH)
-+    include("${KPACKAGE_TARGETSFILE}")
-+else()
-+    include("${CMAKE_CURRENT_LIST_DIR}/KF5PackageToolsTargets.cmake")
-+endif()
-+
- @PACKAGE_INCLUDE_QCHTARGETS@
- 
- set(Package_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
-diff --git a/src/kpackagetool/CMakeLists.txt b/src/kpackagetool/CMakeLists.txt
-index 58533f9..60e25dc 100644
---- a/src/kpackagetool/CMakeLists.txt
-+++ b/src/kpackagetool/CMakeLists.txt
-@@ -13,4 +13,4 @@ add_executable(KF5::kpackagetool5 ALIAS kpackagetool5)
- target_link_libraries(kpackagetool5 KF5::Archive KF5::Package KF5::I18n KF5::CoreAddons)
- ecm_mark_nongui_executable(kpackagetool5)
- 
--install(TARGETS kpackagetool5 EXPORT KF5PackageTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
-+install(TARGETS kpackagetool5 EXPORT KF5PackageToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/recipes-kf5/tier2/kpty_5.56.0.bb b/recipes-kf5/tier2/kpackage_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kpty_5.56.0.bb
rename to recipes-kf5/tier2/kpackage_5.58.0.bb
diff --git a/recipes-kf5/tier2/kunitconversion_5.56.0.bb b/recipes-kf5/tier2/kpty_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kunitconversion_5.56.0.bb
rename to recipes-kf5/tier2/kpty_5.58.0.bb
diff --git a/recipes-kf5/tier2/syndication_5.56.0.bb b/recipes-kf5/tier2/kunitconversion_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier2/syndication_5.56.0.bb
rename to recipes-kf5/tier2/kunitconversion_5.58.0.bb
diff --git a/recipes-kf5/tier3/baloo_5.56.0.bb b/recipes-kf5/tier2/syndication_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/baloo_5.56.0.bb
rename to recipes-kf5/tier2/syndication_5.58.0.bb
diff --git a/recipes-kf5/tier3/kactivitiesstats_5.56.0.bb b/recipes-kf5/tier3/baloo_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kactivitiesstats_5.56.0.bb
rename to recipes-kf5/tier3/baloo_5.58.0.bb
diff --git a/recipes-kf5/tier3/kbookmarks_5.56.0.bb b/recipes-kf5/tier3/kactivitiesstats_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kbookmarks_5.56.0.bb
rename to recipes-kf5/tier3/kactivitiesstats_5.58.0.bb
diff --git a/recipes-kf5/tier3/kcmutils_5.56.0.bb b/recipes-kf5/tier3/kbookmarks_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kcmutils_5.56.0.bb
rename to recipes-kf5/tier3/kbookmarks_5.58.0.bb
diff --git a/recipes-kf5/tier3/kconfigwidgets_5.56.0.bb b/recipes-kf5/tier3/kcmutils_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kconfigwidgets_5.56.0.bb
rename to recipes-kf5/tier3/kcmutils_5.58.0.bb
diff --git a/recipes-kf5/tier3/kdeclarative_5.56.0.bb b/recipes-kf5/tier3/kconfigwidgets_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kdeclarative_5.56.0.bb
rename to recipes-kf5/tier3/kconfigwidgets_5.58.0.bb
diff --git a/recipes-kf5/tier3/kded_5.56.0.bb b/recipes-kf5/tier3/kdeclarative_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kded_5.56.0.bb
rename to recipes-kf5/tier3/kdeclarative_5.58.0.bb
diff --git a/recipes-kf5/tier3/kdesignerplugin_5.56.0.bb b/recipes-kf5/tier3/kded_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kdesignerplugin_5.56.0.bb
rename to recipes-kf5/tier3/kded_5.58.0.bb
diff --git a/recipes-kf5/tier3/kdesu_5.56.0.bb b/recipes-kf5/tier3/kdesignerplugin_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kdesu_5.56.0.bb
rename to recipes-kf5/tier3/kdesignerplugin_5.58.0.bb
diff --git a/recipes-kf5/tier3/kemoticons_5.56.0.bb b/recipes-kf5/tier3/kdesu_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kemoticons_5.56.0.bb
rename to recipes-kf5/tier3/kdesu_5.58.0.bb
diff --git a/recipes-kf5/tier3/kglobalaccel_5.56.0.bb b/recipes-kf5/tier3/kemoticons_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kglobalaccel_5.56.0.bb
rename to recipes-kf5/tier3/kemoticons_5.58.0.bb
diff --git a/recipes-kf5/tier3/kiconthemes_5.56.0.bb b/recipes-kf5/tier3/kglobalaccel_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kiconthemes_5.56.0.bb
rename to recipes-kf5/tier3/kglobalaccel_5.58.0.bb
diff --git a/recipes-kf5/tier3/kinit_5.56.0.bb b/recipes-kf5/tier3/kiconthemes_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kinit_5.56.0.bb
rename to recipes-kf5/tier3/kiconthemes_5.58.0.bb
diff --git a/recipes-kf5/tier3/kio_5.56.0.bb b/recipes-kf5/tier3/kinit_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kio_5.56.0.bb
rename to recipes-kf5/tier3/kinit_5.58.0.bb
diff --git a/recipes-kf5/tier3/knewstuff_5.56.0.bb b/recipes-kf5/tier3/kio_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/knewstuff_5.56.0.bb
rename to recipes-kf5/tier3/kio_5.58.0.bb
diff --git a/recipes-kf5/tier3/knotifyconfig_5.56.0.bb b/recipes-kf5/tier3/knewstuff_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/knotifyconfig_5.56.0.bb
rename to recipes-kf5/tier3/knewstuff_5.58.0.bb
diff --git a/recipes-kf5/tier3/kparts_5.56.0.bb b/recipes-kf5/tier3/knotifyconfig_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kparts_5.56.0.bb
rename to recipes-kf5/tier3/knotifyconfig_5.58.0.bb
diff --git a/recipes-kf5/tier3/kpeople_5.56.0.bb b/recipes-kf5/tier3/kparts_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kpeople_5.56.0.bb
rename to recipes-kf5/tier3/kparts_5.58.0.bb
diff --git a/recipes-kf5/tier3/krunner_5.56.0.bb b/recipes-kf5/tier3/kpeople_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/krunner_5.56.0.bb
rename to recipes-kf5/tier3/kpeople_5.58.0.bb
diff --git a/recipes-kf5/tier3/kservice_5.56.0.bb b/recipes-kf5/tier3/krunner_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kservice_5.56.0.bb
rename to recipes-kf5/tier3/krunner_5.58.0.bb
diff --git a/recipes-kf5/tier3/ktexteditor_5.56.0.bb b/recipes-kf5/tier3/kservice_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/ktexteditor_5.56.0.bb
rename to recipes-kf5/tier3/kservice_5.58.0.bb
diff --git a/recipes-kf5/tier3/ktextwidgets_5.56.0.bb b/recipes-kf5/tier3/ktexteditor_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/ktextwidgets_5.56.0.bb
rename to recipes-kf5/tier3/ktexteditor_5.58.0.bb
diff --git a/recipes-kf5/tier3/kwallet_5.56.0.bb b/recipes-kf5/tier3/ktextwidgets_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kwallet_5.56.0.bb
rename to recipes-kf5/tier3/ktextwidgets_5.58.0.bb
diff --git a/recipes-kf5/tier3/kxmlgui_5.56.0.bb b/recipes-kf5/tier3/kwallet_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kxmlgui_5.56.0.bb
rename to recipes-kf5/tier3/kwallet_5.58.0.bb
diff --git a/recipes-kf5/tier3/kxmlrpcclient_5.56.0.bb b/recipes-kf5/tier3/kxmlgui_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kxmlrpcclient_5.56.0.bb
rename to recipes-kf5/tier3/kxmlgui_5.58.0.bb
diff --git a/recipes-kf5/tier3/purpose_5.56.0.bb b/recipes-kf5/tier3/kxmlrpcclient_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/purpose_5.56.0.bb
rename to recipes-kf5/tier3/kxmlrpcclient_5.58.0.bb
diff --git a/recipes-kf5/tier3/plasma-framework.inc b/recipes-kf5/tier3/plasma-framework.inc
index e92794d..37353e7 100644
--- a/recipes-kf5/tier3/plasma-framework.inc
+++ b/recipes-kf5/tier3/plasma-framework.inc
@@ -1,61 +1,62 @@
 DESCRIPTION = "Plama Framework"
 HOMEPAGE = "https://api.kde.org/plasma-framework/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     kactivities \
     karchive \
     kconfig \
     kconfig-native \
     kconfigwidgets \
     kdbusaddons \
     kdeclarative \
     kglobalaccel \
     kguiaddons \
     kiconthemes \
     kio \
     kcoreaddons-native \
     kauth-native \
     kservice \
     kwindowsystem \
     kxmlgui \
     knotifications \
     kpackage \
     kpackage-native \
     kwayland \
     kirigami \
+    gzip-native \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/plasma-framework;nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
 inherit ki18n
 inherit kdoctools
 
 FILES_${PN} += " \
     ${libdir}/plugins/*.so \
     ${libdir}/plugins/kpackage/packagestructure/*.so \
     ${libdir}/plugins/plasma/scriptengines/*.so \
     ${libdir}/qml/org/kde/plasma/accessdenied/* \
     ${libdir}/qml/org/kde/plasma  \
     ${libdir}/qml/org/kde/kirigami.2 \
     ${libdir}/qml/QtQuick/Controls.2/Plasma \
     ${libdir}/qml/QtQuick/Controls/Styles/Plasma \
     ${datadir}/plasma/services/*.operations \
     ${datadir}/plasma/desktoptheme/air/* \
     ${datadir}/plasma/desktoptheme/air/*/* \
     ${datadir}/plasma/desktoptheme/breeze-dark/* \
     ${datadir}/plasma/desktoptheme/breeze-dark/*/* \
     ${datadir}/plasma/desktoptheme/breeze-light/* \
     ${datadir}/plasma/desktoptheme/breeze-light/*/* \
     ${datadir}/plasma/desktoptheme/default/* \
     ${datadir}/plasma/desktoptheme/default/*/* \
     ${datadir}/plasma/desktoptheme/oxygen/* \
     ${datadir}/plasma/desktoptheme/oxygen/*/* \
 "
diff --git a/recipes-kf5/tier3/qqc2-desktop-style_5.56.0.bb b/recipes-kf5/tier3/plasma-framework_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier3/qqc2-desktop-style_5.56.0.bb
rename to recipes-kf5/tier3/plasma-framework_5.58.0.bb
diff --git a/recipes-kf5/tier4/frameworkintegration_5.56.0.bb b/recipes-kf5/tier3/purpose_5.58.0.bb
similarity index 100%
rename from recipes-kf5/tier4/frameworkintegration_5.56.0.bb
rename to recipes-kf5/tier3/purpose_5.58.0.bb
diff --git a/recipes-kf5/obsolete/kdelibs4support_5.56.0.bb b/recipes-kf5/tier3/qqc2-desktop-style_5.58.0.bb
similarity index 100%
copy from recipes-kf5/obsolete/kdelibs4support_5.56.0.bb
copy to recipes-kf5/tier3/qqc2-desktop-style_5.58.0.bb
diff --git a/recipes-kf5/obsolete/kdelibs4support_5.56.0.bb b/recipes-kf5/tier4/frameworkintegration_5.58.0.bb
similarity index 100%
rename from recipes-kf5/obsolete/kdelibs4support_5.56.0.bb
rename to recipes-kf5/tier4/frameworkintegration_5.58.0.bb