| 1 |
commit: ecb7ec7c08576bca3dd345a7873aff86de8fe75b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 24 22:56:06 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 24 22:56:06 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ecb7ec7c |
| 7 |
|
| 8 |
kde-plasma/discover: Add IUSE=flatpak |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/750008 |
| 11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
kde-plasma/discover/discover-5.20.49.9999.ebuild | 11 +++++++---- |
| 15 |
kde-plasma/discover/discover-9999.ebuild | 11 +++++++---- |
| 16 |
kde-plasma/discover/metadata.xml | 1 + |
| 17 |
3 files changed, 15 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-plasma/discover/discover-5.20.49.9999.ebuild b/kde-plasma/discover/discover-5.20.49.9999.ebuild |
| 20 |
index ed26fce67b..4b7a156ff9 100644 |
| 21 |
--- a/kde-plasma/discover/discover-5.20.49.9999.ebuild |
| 22 |
+++ b/kde-plasma/discover/discover-5.20.49.9999.ebuild |
| 23 |
@@ -5,7 +5,6 @@ EAPI=7 |
| 24 |
|
| 25 |
ECM_TEST="forceoptional" |
| 26 |
KFMIN=5.74.0 |
| 27 |
-PVCUT=$(ver_cut 1-3) |
| 28 |
QTMIN=5.15.1 |
| 29 |
VIRTUALX_REQUIRED="test" |
| 30 |
inherit ecm kde.org |
| 31 |
@@ -16,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover" |
| 32 |
LICENSE="GPL-2" # TODO: CHECK |
| 33 |
SLOT="5" |
| 34 |
KEYWORDS="" |
| 35 |
-IUSE="+firmware telemetry" |
| 36 |
+IUSE="+firmware flatpak telemetry" |
| 37 |
|
| 38 |
# libmarkdown (app-text/discount) only used in PackageKitBackend |
| 39 |
DEPEND=" |
| 40 |
@@ -43,6 +42,10 @@ DEPEND=" |
| 41 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
| 42 |
>=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 43 |
firmware? ( sys-apps/fwupd ) |
| 44 |
+ flatpak? ( |
| 45 |
+ dev-libs/appstream:= |
| 46 |
+ sys-apps/flatpak |
| 47 |
+ ) |
| 48 |
telemetry? ( dev-libs/kuserfeedback:5 ) |
| 49 |
" |
| 50 |
RDEPEND="${DEPEND} |
| 51 |
@@ -59,9 +62,9 @@ src_prepare() { |
| 52 |
src_configure() { |
| 53 |
local mycmakeargs=( |
| 54 |
-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON |
| 55 |
- -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON |
| 56 |
-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON |
| 57 |
- -DBUILD_FlatpakBackend=OFF |
| 58 |
+ -DBUILD_FlatpakBackend=$(usex flatpak) |
| 59 |
+ $(cmake_use_find_package flatpak AppStreamQt) |
| 60 |
-DBUILD_FwupdBackend=$(usex firmware) |
| 61 |
$(cmake_use_find_package telemetry KUserFeedback) |
| 62 |
) |
| 63 |
|
| 64 |
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild |
| 65 |
index 752e64f18e..c0d1ff6ce5 100644 |
| 66 |
--- a/kde-plasma/discover/discover-9999.ebuild |
| 67 |
+++ b/kde-plasma/discover/discover-9999.ebuild |
| 68 |
@@ -5,7 +5,6 @@ EAPI=7 |
| 69 |
|
| 70 |
ECM_TEST="forceoptional" |
| 71 |
KFMIN=9999 |
| 72 |
-PVCUT=$(ver_cut 1-3) |
| 73 |
QTMIN=5.15.1 |
| 74 |
VIRTUALX_REQUIRED="test" |
| 75 |
inherit ecm kde.org |
| 76 |
@@ -16,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover" |
| 77 |
LICENSE="GPL-2" # TODO: CHECK |
| 78 |
SLOT="5" |
| 79 |
KEYWORDS="" |
| 80 |
-IUSE="+firmware telemetry" |
| 81 |
+IUSE="+firmware flatpak telemetry" |
| 82 |
|
| 83 |
# libmarkdown (app-text/discount) only used in PackageKitBackend |
| 84 |
DEPEND=" |
| 85 |
@@ -43,6 +42,10 @@ DEPEND=" |
| 86 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
| 87 |
>=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 88 |
firmware? ( sys-apps/fwupd ) |
| 89 |
+ flatpak? ( |
| 90 |
+ dev-libs/appstream:= |
| 91 |
+ sys-apps/flatpak |
| 92 |
+ ) |
| 93 |
telemetry? ( dev-libs/kuserfeedback:5 ) |
| 94 |
" |
| 95 |
RDEPEND="${DEPEND} |
| 96 |
@@ -59,9 +62,9 @@ src_prepare() { |
| 97 |
src_configure() { |
| 98 |
local mycmakeargs=( |
| 99 |
-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON |
| 100 |
- -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON |
| 101 |
-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON |
| 102 |
- -DBUILD_FlatpakBackend=OFF |
| 103 |
+ -DBUILD_FlatpakBackend=$(usex flatpak) |
| 104 |
+ $(cmake_use_find_package flatpak AppStreamQt) |
| 105 |
-DBUILD_FwupdBackend=$(usex firmware) |
| 106 |
$(cmake_use_find_package telemetry KUserFeedback) |
| 107 |
) |
| 108 |
|
| 109 |
diff --git a/kde-plasma/discover/metadata.xml b/kde-plasma/discover/metadata.xml |
| 110 |
index 59d0ace33b..2b2527d412 100644 |
| 111 |
--- a/kde-plasma/discover/metadata.xml |
| 112 |
+++ b/kde-plasma/discover/metadata.xml |
| 113 |
@@ -7,5 +7,6 @@ |
| 114 |
</maintainer> |
| 115 |
<use> |
| 116 |
<flag name="firmware">Enable support for firmware upgrades using <pkg>sys-apps/fwupd</pkg></flag> |
| 117 |
+ <flag name="flatpak">Enable support for flatpak repositories using <pkg>sys-apps/flatpak</pkg></flag> |
| 118 |
</use> |
| 119 |
</pkgmetadata> |
Archives