Merge updates from master

87 files changed, 99 insertions, 39 deletions

diff --git a/Documentation/maintainers/cmake_dep_check.py b/Documentation/maintainers/cmake_dep_check.py
index edc877626a1..e9a8fd20b8a 100755
--- a/Documentation/maintainers/cmake_dep_check.py
+++ b/Documentation/maintainers/cmake_dep_check.py
@@ -280,7 +280,7 @@ PACKAGE_MAP = {
 	'XCBXCB': 'x11-libs/libxcb',
 	'XCBXFIXES': 'x11-libs/libxcb',
 	'XCBXTEST': 'x11-libs/libxcb',
-	'ZLIB': 'sys-libs/zlib',
+	'ZLIB': 'virtual/zlib:=',
 }
 
 
diff --git a/app-editors/ghostwriter/ghostwriter-25.08.49.9999.ebuild b/app-editors/ghostwriter/ghostwriter-25.08.49.9999.ebuild
index b44b566be56..b3a3fdf5139 100644
--- a/app-editors/ghostwriter/ghostwriter-25.08.49.9999.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-25.08.49.9999.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 	>=dev-qt/qtsvg-${QTMIN}:6
 	>=dev-qt/qtwebchannel-${QTMIN}:6
 	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
diff --git a/app-editors/ghostwriter/ghostwriter-9999.ebuild b/app-editors/ghostwriter/ghostwriter-9999.ebuild
index b44b566be56..b3a3fdf5139 100644
--- a/app-editors/ghostwriter/ghostwriter-9999.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-9999.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 	>=dev-qt/qtsvg-${QTMIN}:6
 	>=dev-qt/qtwebchannel-${QTMIN}:6
 	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 453b8270bf1..f5d3e243e04 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -58,8 +58,8 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=kde-frameworks/sonnet-${KFMIN}:6
-	sys-libs/zlib
 	virtual/libiconv
+	virtual/zlib:=
 	charts? ( dev-libs/kdiagram:6 )
 	fontconfig? ( media-libs/fontconfig )
 	gsl? ( sci-libs/gsl:= )
diff --git a/dev-libs/kirigami-addons/kirigami-addons-9999.ebuild b/dev-libs/kirigami-addons/kirigami-addons-9999.ebuild
index ee983496efd..69aeb20d3ef 100644
--- a/dev-libs/kirigami-addons/kirigami-addons-9999.ebuild
+++ b/dev-libs/kirigami-addons/kirigami-addons-9999.ebuild
@@ -28,11 +28,14 @@ RESTRICT="test"
 COMMON_DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/kglobalaccel-${KFMIN}:6
 	>=kde-frameworks/kguiaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
 	>=kde-frameworks/kirigami-${KFMIN}:6
 "
 RDEPEND="${COMMON_DEPEND}
diff --git a/dev-libs/kopeninghours/kopeninghours-25.08.49.9999.ebuild b/dev-libs/kopeninghours/kopeninghours-25.08.49.9999.ebuild
index 678a1d0c006..ae61a802fe0 100644
--- a/dev-libs/kopeninghours/kopeninghours-25.08.49.9999.ebuild
+++ b/dev-libs/kopeninghours/kopeninghours-25.08.49.9999.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=kde-frameworks/kholidays-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
-	sys-libs/zlib
+	virtual/zlib:=
 	python? (
 		$(python_gen_cond_dep '
 			>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
diff --git a/dev-libs/kopeninghours/kopeninghours-9999.ebuild b/dev-libs/kopeninghours/kopeninghours-9999.ebuild
index 678a1d0c006..ae61a802fe0 100644
--- a/dev-libs/kopeninghours/kopeninghours-9999.ebuild
+++ b/dev-libs/kopeninghours/kopeninghours-9999.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=kde-frameworks/kholidays-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
-	sys-libs/zlib
+	virtual/zlib:=
 	python? (
 		$(python_gen_cond_dep '
 			>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
diff --git a/dev-libs/kosmindoormap/kosmindoormap-25.08.49.9999.ebuild b/dev-libs/kosmindoormap/kosmindoormap-25.08.49.9999.ebuild
index 15b6ab0e40f..80b15e0a07a 100644
--- a/dev-libs/kosmindoormap/kosmindoormap-25.08.49.9999.ebuild
+++ b/dev-libs/kosmindoormap/kosmindoormap-25.08.49.9999.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-libs/kirigami-addons-1.6.0:6
 	dev-libs/protobuf:=
 	>=dev-qt/qtbase-${QTMIN}:6[gui?,network]
-	sys-libs/zlib
+	virtual/zlib:=
 	gui? (
 		>=dev-libs/kopeninghours-${PVCUT}:6=
 		>=dev-libs/kpublictransport-${PVCUT}:6=
diff --git a/dev-libs/kosmindoormap/kosmindoormap-9999.ebuild b/dev-libs/kosmindoormap/kosmindoormap-9999.ebuild
index 15b6ab0e40f..80b15e0a07a 100644
--- a/dev-libs/kosmindoormap/kosmindoormap-9999.ebuild
+++ b/dev-libs/kosmindoormap/kosmindoormap-9999.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-libs/kirigami-addons-1.6.0:6
 	dev-libs/protobuf:=
 	>=dev-qt/qtbase-${QTMIN}:6[gui?,network]
-	sys-libs/zlib
+	virtual/zlib:=
 	gui? (
 		>=dev-libs/kopeninghours-${PVCUT}:6=
 		>=dev-libs/kpublictransport-${PVCUT}:6=
diff --git a/dev-libs/kpublictransport/kpublictransport-25.08.49.9999.ebuild b/dev-libs/kpublictransport/kpublictransport-25.08.49.9999.ebuild
index 82109ffd61c..890009b0c5d 100644
--- a/dev-libs/kpublictransport/kpublictransport-25.08.49.9999.ebuild
+++ b/dev-libs/kpublictransport/kpublictransport-25.08.49.9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	sys-libs/zlib
+	virtual/zlib:=
 	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-libs/kpublictransport/kpublictransport-9999.ebuild b/dev-libs/kpublictransport/kpublictransport-9999.ebuild
index 82109ffd61c..890009b0c5d 100644
--- a/dev-libs/kpublictransport/kpublictransport-9999.ebuild
+++ b/dev-libs/kpublictransport/kpublictransport-9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kitemmodels-${KFMIN}:6
-	sys-libs/zlib
+	virtual/zlib:=
 	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-libs/ktextaddons/ktextaddons-9999.ebuild b/dev-libs/ktextaddons/ktextaddons-9999.ebuild
index f1a15f7997a..a259cabb8fc 100644
--- a/dev-libs/ktextaddons/ktextaddons-9999.ebuild
+++ b/dev-libs/ktextaddons/ktextaddons-9999.ebuild
@@ -33,6 +33,7 @@ DEPEND="
 	>=kde-frameworks/kcolorscheme-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
 	>=kde-frameworks/kitemviews-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
diff --git a/kde-apps/ark/ark-25.08.49.9999.ebuild b/kde-apps/ark/ark-25.08.49.9999.ebuild
index e77cd8da288..2e81cd8c2d6 100644
--- a/kde-apps/ark/ark-25.08.49.9999.ebuild
+++ b/kde-apps/ark/ark-25.08.49.9999.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kwindowsystem-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	sys-libs/zlib
+	virtual/zlib:=
 	zip? ( >=dev-libs/libzip-1.6.0:= )
 "
 DEPEND="${RDEPEND}
diff --git a/kde-apps/ark/ark-9999.ebuild b/kde-apps/ark/ark-9999.ebuild
index e77cd8da288..2e81cd8c2d6 100644
--- a/kde-apps/ark/ark-9999.ebuild
+++ b/kde-apps/ark/ark-9999.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kwindowsystem-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	sys-libs/zlib
+	virtual/zlib:=
 	zip? ( >=dev-libs/libzip-1.6.0:= )
 "
 DEPEND="${RDEPEND}
diff --git a/kde-apps/bomber/bomber-25.08.49.9999.ebuild b/kde-apps/bomber/bomber-25.08.49.9999.ebuild
index 2f67a88976e..ac7309ea3d4 100644
--- a/kde-apps/bomber/bomber-25.08.49.9999.ebuild
+++ b/kde-apps/bomber/bomber-25.08.49.9999.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/kdbusaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 "
diff --git a/kde-apps/bomber/bomber-9999.ebuild b/kde-apps/bomber/bomber-9999.ebuild
index 2f67a88976e..ac7309ea3d4 100644
--- a/kde-apps/bomber/bomber-9999.ebuild
+++ b/kde-apps/bomber/bomber-9999.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/kdbusaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 "
diff --git a/kde-apps/bovo/bovo-25.08.49.9999.ebuild b/kde-apps/bovo/bovo-25.08.49.9999.ebuild
index aa628b11dfb..a070c0c9243 100644
--- a/kde-apps/bovo/bovo-25.08.49.9999.ebuild
+++ b/kde-apps/bovo/bovo-25.08.49.9999.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/kdbusaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 "
diff --git a/kde-apps/bovo/bovo-9999.ebuild b/kde-apps/bovo/bovo-9999.ebuild
index aa628b11dfb..a070c0c9243 100644
--- a/kde-apps/bovo/bovo-9999.ebuild
+++ b/kde-apps/bovo/bovo-9999.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/kdbusaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 "
diff --git a/kde-apps/filelight/filelight-25.08.49.9999.ebuild b/kde-apps/filelight/filelight-25.08.49.9999.ebuild
index 34e35ce58d6..43185f3b33d 100644
--- a/kde-apps/filelight/filelight-25.08.49.9999.ebuild
+++ b/kde-apps/filelight/filelight-25.08.49.9999.ebuild
@@ -24,6 +24,7 @@ DEPEND="
 	>=kde-frameworks/kcompletion-${KFMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
 	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
diff --git a/kde-apps/filelight/filelight-9