commit: ecb7ec7c08576bca3dd345a7873aff86de8fe75b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Oct 24 22:56:06 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Oct 24 22:56:06 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ecb7ec7c
kde-plasma/discover: Add IUSE=flatpak Closes: https://bugs.gentoo.org/750008 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/discover/discover-5.20.49.9999.ebuild | 11 +++++++---- kde-plasma/discover/discover-9999.ebuild | 11 +++++++---- kde-plasma/discover/metadata.xml | 1 + 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/kde-plasma/discover/discover-5.20.49.9999.ebuild b/kde-plasma/discover/discover-5.20.49.9999.ebuild index ed26fce67b..4b7a156ff9 100644 --- a/kde-plasma/discover/discover-5.20.49.9999.ebuild +++ b/kde-plasma/discover/discover-5.20.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=7 ECM_TEST="forceoptional" KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) QTMIN=5.15.1 VIRTUALX_REQUIRED="test" inherit ecm kde.org @@ -16,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="+firmware telemetry" +IUSE="+firmware flatpak telemetry" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" @@ -43,6 +42,10 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 firmware? ( sys-apps/fwupd ) + flatpak? ( + dev-libs/appstream:= + sys-apps/flatpak + ) telemetry? ( dev-libs/kuserfeedback:5 ) " RDEPEND="${DEPEND} @@ -59,9 +62,9 @@ src_prepare() { src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON - -DBUILD_FlatpakBackend=OFF + -DBUILD_FlatpakBackend=$(usex flatpak) + $(cmake_use_find_package flatpak AppStreamQt) -DBUILD_FwupdBackend=$(usex firmware) $(cmake_use_find_package telemetry KUserFeedback) ) diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild index 752e64f18e..c0d1ff6ce5 100644 --- a/kde-plasma/discover/discover-9999.ebuild +++ b/kde-plasma/discover/discover-9999.ebuild @@ -5,7 +5,6 @@ EAPI=7 ECM_TEST="forceoptional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=5.15.1 VIRTUALX_REQUIRED="test" inherit ecm kde.org @@ -16,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="+firmware telemetry" +IUSE="+firmware flatpak telemetry" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" @@ -43,6 +42,10 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 firmware? ( sys-apps/fwupd ) + flatpak? ( + dev-libs/appstream:= + sys-apps/flatpak + ) telemetry? ( dev-libs/kuserfeedback:5 ) " RDEPEND="${DEPEND} @@ -59,9 +62,9 @@ src_prepare() { src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON - -DBUILD_FlatpakBackend=OFF + -DBUILD_FlatpakBackend=$(usex flatpak) + $(cmake_use_find_package flatpak AppStreamQt) -DBUILD_FwupdBackend=$(usex firmware) $(cmake_use_find_package telemetry KUserFeedback) ) diff --git a/kde-plasma/discover/metadata.xml b/kde-plasma/discover/metadata.xml index 59d0ace33b..2b2527d412 100644 --- a/kde-plasma/discover/metadata.xml +++ b/kde-plasma/discover/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <use> <flag name="firmware">Enable support for firmware upgrades using <pkg>sys-apps/fwupd</pkg></flag> + <flag name="flatpak">Enable support for flatpak repositories using <pkg>sys-apps/flatpak</pkg></flag> </use> </pkgmetadata>
