commit: 09167db64b435df2d89d3b807d7fc7c864e726be Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Feb 25 10:28:07 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Feb 25 10:31:45 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=09167db6
kde-plasma/discover: Re-enable IUSE snap Bug: https://bugs.gentoo.org/919416 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/discover/discover-6.0.0.ebuild | 11 ++++++----- kde-plasma/discover/discover-6.0.49.9999.ebuild | 11 ++++++----- kde-plasma/discover/discover-9999.ebuild | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/kde-plasma/discover/discover-6.0.0.ebuild b/kde-plasma/discover/discover-6.0.0.ebuild index 41e908f858..7a4ff24ff1 100644 --- a/kde-plasma/discover/discover-6.0.0.ebuild +++ b/kde-plasma/discover/discover-6.0.0.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"; LICENSE="GPL-2" # TODO: CHECK SLOT="6" KEYWORDS="~amd64" -IUSE="+firmware flatpak telemetry webengine" # snap: bug #919416 +IUSE="+firmware flatpak snap telemetry webengine" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" @@ -42,12 +42,13 @@ DEPEND=" >=kde-frameworks/purpose-${KFMIN}:6 firmware? ( >=sys-apps/fwupd-1.9.4 ) flatpak? ( sys-apps/flatpak ) + snap? ( sys-libs/snapd-glib:=[qt6(-)] ) telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 ) " -# snap? ( sys-libs/snapd-glib:=[qt6(-)] ) -RDEPEND="${DEPEND}" -# snap? ( app-containers/snapd ) +RDEPEND="${DEPEND} + snap? ( app-containers/snapd ) +" BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" PATCHES=( "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" ) @@ -74,7 +75,7 @@ src_configure() { -DBUILD_FlatpakBackend=$(usex flatpak) -DBUILD_FwupdBackend=$(usex firmware) -DBUILD_RpmOstreeBackend=OFF - -DBUILD_SnapBackend=OFF + -DBUILD_SnapBackend=$(usex snap) -DBUILD_SteamOSBackend=OFF $(cmake_use_find_package telemetry KF6UserFeedback) $(cmake_use_find_package webengine Qt6WebView) diff --git a/kde-plasma/discover/discover-6.0.49.9999.ebuild b/kde-plasma/discover/discover-6.0.49.9999.ebuild index 726924a19a..1c45d1a593 100644 --- a/kde-plasma/discover/discover-6.0.49.9999.ebuild +++ b/kde-plasma/discover/discover-6.0.49.9999.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"; LICENSE="GPL-2" # TODO: CHECK SLOT="6" KEYWORDS="" -IUSE="+firmware flatpak telemetry webengine" # snap: bug #919416 +IUSE="+firmware flatpak snap telemetry webengine" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" @@ -42,12 +42,13 @@ DEPEND=" >=kde-frameworks/purpose-${KFMIN}:6 firmware? ( >=sys-apps/fwupd-1.9.4 ) flatpak? ( sys-apps/flatpak ) + snap? ( sys-libs/snapd-glib:=[qt6(-)] ) telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 ) " -# snap? ( sys-libs/snapd-glib:=[qt6(-)] ) -RDEPEND="${DEPEND}" -# snap? ( app-containers/snapd ) +RDEPEND="${DEPEND} + snap? ( app-containers/snapd ) +" BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" PATCHES=( "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" ) @@ -74,7 +75,7 @@ src_configure() { -DBUILD_FlatpakBackend=$(usex flatpak) -DBUILD_FwupdBackend=$(usex firmware) -DBUILD_RpmOstreeBackend=OFF - -DBUILD_SnapBackend=OFF + -DBUILD_SnapBackend=$(usex snap) -DBUILD_SteamOSBackend=OFF $(cmake_use_find_package telemetry KF6UserFeedback) $(cmake_use_find_package webengine Qt6WebView) diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild index 5eba0ea40a..12baab4d88 100644 --- a/kde-plasma/discover/discover-9999.ebuild +++ b/kde-plasma/discover/discover-9999.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"; LICENSE="GPL-2" # TODO: CHECK SLOT="6" KEYWORDS="" -IUSE="+firmware flatpak telemetry webengine" # snap: bug #919416 +IUSE="+firmware flatpak snap telemetry webengine" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" @@ -42,12 +42,13 @@ DEPEND=" >=kde-frameworks/purpose-${KFMIN}:6 firmware? ( >=sys-apps/fwupd-1.9.4 ) flatpak? ( sys-apps/flatpak ) + snap? ( sys-libs/snapd-glib:=[qt6(-)] ) telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 ) " -# snap? ( sys-libs/snapd-glib:=[qt6(-)] ) -RDEPEND="${DEPEND}" -# snap? ( app-containers/snapd ) +RDEPEND="${DEPEND} + snap? ( app-containers/snapd ) +" BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" PATCHES=( "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" ) @@ -74,7 +75,7 @@ src_configure() { -DBUILD_FlatpakBackend=$(usex flatpak) -DBUILD_FwupdBackend=$(usex firmware) -DBUILD_RpmOstreeBackend=OFF - -DBUILD_SnapBackend=OFF + -DBUILD_SnapBackend=$(usex snap) -DBUILD_SteamOSBackend=OFF $(cmake_use_find_package telemetry KF6UserFeedback) $(cmake_use_find_package webengine Qt6WebView)
