Merge updates from master

4 files changed, 94 insertions, 14 deletions

diff --git a/kde-plasma/kscreen/kscreen-6.4.49.9999.ebuild b/kde-plasma/kscreen/kscreen-6.4.49.9999.ebuild
index b7c43eaba25..68d3e67d7dd 100644
--- a/kde-plasma/kscreen/kscreen-6.4.49.9999.ebuild
+++ b/kde-plasma/kscreen/kscreen-6.4.49.9999.ebuild
@@ -16,16 +16,15 @@ SLOT="6"
 KEYWORDS=""
 IUSE="X"
 
-# bug #580440, last checked 5.6.3
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+# slot op: Uses Qt6GuiPrivate and Qt6WaylandClientPrivate
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,wayland,widgets]
 	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
 	>=dev-qt/qtsensors-${QTMIN}:6
 	>=kde-frameworks/kcmutils-${KFMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/kdbusaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/ksvg-${KFMIN}:6
@@ -41,11 +40,27 @@ DEPEND="
 		x11-libs/libXi
 	)
 "
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qt5compat-${QTMIN}:6[qml]
 	>=kde-plasma/kglobalacceld-${KDE_CATV}:6
 "
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/wayland-protocols-1.41
+"
+BDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[wayland]
+	dev-util/wayland-scanner
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	virtual/pkgconfig
+"
+BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
+
+CMAKE_SKIP_TESTS=(
+	# last checked 2025-07-17, also fails upstream
+	# FAIL!  : TestConfig::testDisabledScreenConfig() Compared values are not the same
+	kscreen-kded-configtest
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-plasma/kscreen/kscreen-9999.ebuild b/kde-plasma/kscreen/kscreen-9999.ebuild
index d1499be4dda..f55293ca8e2 100644
--- a/kde-plasma/kscreen/kscreen-9999.ebuild
+++ b/kde-plasma/kscreen/kscreen-9999.ebuild
@@ -16,16 +16,15 @@ SLOT="6"
 KEYWORDS=""
 IUSE="X"
 
-# bug #580440, last checked 5.6.3
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+# slot op: Uses Qt6GuiPrivate and Qt6WaylandClientPrivate
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,wayland,widgets]
 	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
 	>=dev-qt/qtsensors-${QTMIN}:6
 	>=kde-frameworks/kcmutils-${KFMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/kdbusaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/ksvg-${KFMIN}:6
@@ -41,11 +40,27 @@ DEPEND="
 		x11-libs/libXi
 	)
 "
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qt5compat-${QTMIN}:6[qml]
 	>=kde-plasma/kglobalacceld-${KDE_CATV}:6
 "
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/wayland-protocols-1.41
+"
+BDEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[wayland]
+	dev-util/wayland-scanner
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	virtual/pkgconfig
+"
+BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
+
+CMAKE_SKIP_TESTS=(
+	# last checked 2025-07-17, also fails upstream
+	# FAIL!  : TestConfig::testDisabledScreenConfig() Compared values are not the same
+	kscreen-kded-configtest
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-plasma/plasma-vault/plasma-vault-6.4.49.9999.ebuild b/kde-plasma/plasma-vault/plasma-vault-6.4.49.9999.ebuild
index 0c99ec919e2..43e45ba969d 100644
--- a/kde-plasma/plasma-vault/plasma-vault-6.4.49.9999.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-6.4.49.9999.ebuild
@@ -51,3 +51,28 @@ src_configure() {
 
 	ecm_src_configure
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	local has_deprecated_backend
+	dropping_backend() {
+		if has_version ${2}; then
+			elog "${CATEGORY}/${PN} will drop support for ${1} in the future."
+			elog "Migrate away from any ${2} vaults before that happens."
+			elog
+			has_deprecated_backend=1
+		fi
+	}
+
+	dropping_backend CryFS sys-fs/cryfs
+	dropping_backend EncFS sys-fs/encfs
+
+	if [[ has_deprecated_backend ]]; then
+		elog "The only supported backend going forward will be app-crypt/gocryptfs."
+		elog
+		elog "See also:"
+		elog "https://invent.kde.org/plasma/plasma-vault/-/merge_requests/57"
+		elog "https://invent.kde.org/plasma/plasma-vault/-/merge_requests/62"
+	fi
+}
diff --git a/kde-plasma/plasma-vault/plasma-vault-9999.ebuild b/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
index e0d4dcf10fc..7d23b325436 100644
--- a/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-9999.ebuild
@@ -51,3 +51,28 @@ src_configure() {
 
 	ecm_src_configure
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	local has_deprecated_backend
+	dropping_backend() {
+		if has_version ${2}; then
+			elog "${CATEGORY}/${PN} will drop support for ${1} in the future."
+			elog "Migrate away from any ${2} vaults before that happens."
+			elog
+			has_deprecated_backend=1
+		fi
+	}
+
+	dropping_backend CryFS sys-fs/cryfs
+	dropping_backend EncFS sys-fs/encfs
+
+	if [[ has_deprecated_backend ]]; then
+		elog "The only supported backend going forward will be app-crypt/gocryptfs."
+		elog
+		elog "See also:"
+		elog "https://invent.kde.org/plasma/plasma-vault/-/merge_requests/57"
+		elog "https://invent.kde.org/plasma/plasma-vault/-/merge_requests/62"
+	fi
+}