| 1 |
commit: b67a3521dc88c44b87b662f309e0d76ebb95352b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 23 12:58:56 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 23 13:02:19 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b67a3521 |
| 7 |
|
| 8 |
kde-plasma/discover: Drop IUSE share, it is not optional |
| 9 |
|
| 10 |
Fix IUSE webengine dependencies too. |
| 11 |
|
| 12 |
Follow-up to 5e93abc7759960fa0e802f3cf299915473b7e1cb. |
| 13 |
|
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
kde-plasma/discover/discover-5.25.90.ebuild | 6 ++---- |
| 17 |
kde-plasma/discover/discover-5.26.49.9999.ebuild | 6 ++---- |
| 18 |
kde-plasma/discover/discover-9999.ebuild | 5 ++--- |
| 19 |
kde-plasma/discover/metadata.xml | 1 - |
| 20 |
4 files changed, 6 insertions(+), 12 deletions(-) |
| 21 |
|
| 22 |
diff --git a/kde-plasma/discover/discover-5.25.90.ebuild b/kde-plasma/discover/discover-5.25.90.ebuild |
| 23 |
index 1f6fd4255c..8c56793f50 100644 |
| 24 |
--- a/kde-plasma/discover/discover-5.25.90.ebuild |
| 25 |
+++ b/kde-plasma/discover/discover-5.25.90.ebuild |
| 26 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover" |
| 27 |
LICENSE="GPL-2" # TODO: CHECK |
| 28 |
SLOT="5" |
| 29 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
| 30 |
-IUSE="+firmware flatpak share telemetry webengine" |
| 31 |
+IUSE="+firmware flatpak telemetry webengine" |
| 32 |
|
| 33 |
# libmarkdown (app-text/discount) only used in PackageKitBackend |
| 34 |
DEPEND=" |
| 35 |
@@ -24,7 +24,6 @@ DEPEND=" |
| 36 |
>=dev-qt/qtdeclarative-${QTMIN}:5 |
| 37 |
>=dev-qt/qtgui-${QTMIN}:5 |
| 38 |
>=dev-qt/qtnetwork-${QTMIN}:5 |
| 39 |
- >=dev-qt/qtwebview-${QTMIN}:5 |
| 40 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
| 41 |
>=dev-qt/qtxml-${QTMIN}:5 |
| 42 |
>=kde-frameworks/attica-${KFMIN}:5 |
| 43 |
@@ -43,12 +42,12 @@ DEPEND=" |
| 44 |
>=kde-frameworks/knotifications-${KFMIN}:5 |
| 45 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
| 46 |
>=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 47 |
+ >=kde-frameworks/purpose-${KFMIN}:5 |
| 48 |
firmware? ( >=sys-apps/fwupd-1.5.0 ) |
| 49 |
flatpak? ( |
| 50 |
>=dev-libs/appstream-0.15.3:= |
| 51 |
sys-apps/flatpak |
| 52 |
) |
| 53 |
- share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) |
| 54 |
telemetry? ( dev-libs/kuserfeedback:5 ) |
| 55 |
webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 ) |
| 56 |
" |
| 57 |
@@ -76,7 +75,6 @@ src_configure() { |
| 58 |
-DBUILD_FlatpakBackend=$(usex flatpak) |
| 59 |
$(cmake_use_find_package flatpak AppStreamQt) |
| 60 |
-DBUILD_FwupdBackend=$(usex firmware) |
| 61 |
- $(cmake_use_find_package share KF5Purpose) |
| 62 |
$(cmake_use_find_package telemetry KUserFeedback) |
| 63 |
$(cmake_use_find_package webengine Qt5WebView) |
| 64 |
) |
| 65 |
|
| 66 |
diff --git a/kde-plasma/discover/discover-5.26.49.9999.ebuild b/kde-plasma/discover/discover-5.26.49.9999.ebuild |
| 67 |
index dc5b90d983..0a20cdb949 100644 |
| 68 |
--- a/kde-plasma/discover/discover-5.26.49.9999.ebuild |
| 69 |
+++ b/kde-plasma/discover/discover-5.26.49.9999.ebuild |
| 70 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover" |
| 71 |
LICENSE="GPL-2" # TODO: CHECK |
| 72 |
SLOT="5" |
| 73 |
KEYWORDS="" |
| 74 |
-IUSE="+firmware flatpak share telemetry webengine" |
| 75 |
+IUSE="+firmware flatpak telemetry webengine" |
| 76 |
|
| 77 |
# libmarkdown (app-text/discount) only used in PackageKitBackend |
| 78 |
DEPEND=" |
| 79 |
@@ -24,7 +24,6 @@ DEPEND=" |
| 80 |
>=dev-qt/qtdeclarative-${QTMIN}:5 |
| 81 |
>=dev-qt/qtgui-${QTMIN}:5 |
| 82 |
>=dev-qt/qtnetwork-${QTMIN}:5 |
| 83 |
- >=dev-qt/qtwebview-${QTMIN}:5 |
| 84 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
| 85 |
>=dev-qt/qtxml-${QTMIN}:5 |
| 86 |
>=kde-frameworks/attica-${KFMIN}:5 |
| 87 |
@@ -43,12 +42,12 @@ DEPEND=" |
| 88 |
>=kde-frameworks/knotifications-${KFMIN}:5 |
| 89 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
| 90 |
>=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 91 |
+ >=kde-frameworks/purpose-${KFMIN}:5 |
| 92 |
firmware? ( >=sys-apps/fwupd-1.5.0 ) |
| 93 |
flatpak? ( |
| 94 |
>=dev-libs/appstream-0.15.3:= |
| 95 |
sys-apps/flatpak |
| 96 |
) |
| 97 |
- share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) |
| 98 |
telemetry? ( dev-libs/kuserfeedback:5 ) |
| 99 |
webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 ) |
| 100 |
" |
| 101 |
@@ -76,7 +75,6 @@ src_configure() { |
| 102 |
-DBUILD_FlatpakBackend=$(usex flatpak) |
| 103 |
$(cmake_use_find_package flatpak AppStreamQt) |
| 104 |
-DBUILD_FwupdBackend=$(usex firmware) |
| 105 |
- $(cmake_use_find_package share KF5Purpose) |
| 106 |
$(cmake_use_find_package telemetry KUserFeedback) |
| 107 |
$(cmake_use_find_package webengine Qt5WebView) |
| 108 |
) |
| 109 |
|
| 110 |
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild |
| 111 |
index 9d527966ea..e407ff9972 100644 |
| 112 |
--- a/kde-plasma/discover/discover-9999.ebuild |
| 113 |
+++ b/kde-plasma/discover/discover-9999.ebuild |
| 114 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover" |
| 115 |
LICENSE="GPL-2" # TODO: CHECK |
| 116 |
SLOT="5" |
| 117 |
KEYWORDS="" |
| 118 |
-IUSE="+firmware flatpak share telemetry webengine" |
| 119 |
+IUSE="+firmware flatpak telemetry webengine" |
| 120 |
|
| 121 |
# libmarkdown (app-text/discount) only used in PackageKitBackend |
| 122 |
DEPEND=" |
| 123 |
@@ -42,12 +42,12 @@ DEPEND=" |
| 124 |
>=kde-frameworks/knotifications-${KFMIN}:5 |
| 125 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
| 126 |
>=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 127 |
+ >=kde-frameworks/purpose-${KFMIN}:5 |
| 128 |
firmware? ( >=sys-apps/fwupd-1.5.0 ) |
| 129 |
flatpak? ( |
| 130 |
>=dev-libs/appstream-0.15.3:= |
| 131 |
sys-apps/flatpak |
| 132 |
) |
| 133 |
- share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) |
| 134 |
telemetry? ( dev-libs/kuserfeedback:5 ) |
| 135 |
webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 ) |
| 136 |
" |
| 137 |
@@ -75,7 +75,6 @@ src_configure() { |
| 138 |
-DBUILD_FlatpakBackend=$(usex flatpak) |
| 139 |
$(cmake_use_find_package flatpak AppStreamQt) |
| 140 |
-DBUILD_FwupdBackend=$(usex firmware) |
| 141 |
- $(cmake_use_find_package share KF5Purpose) |
| 142 |
$(cmake_use_find_package telemetry KUserFeedback) |
| 143 |
$(cmake_use_find_package webengine Qt5WebView) |
| 144 |
) |
| 145 |
|
| 146 |
diff --git a/kde-plasma/discover/metadata.xml b/kde-plasma/discover/metadata.xml |
| 147 |
index cac82ca8e8..b084e3eb06 100644 |
| 148 |
--- a/kde-plasma/discover/metadata.xml |
| 149 |
+++ b/kde-plasma/discover/metadata.xml |
| 150 |
@@ -9,7 +9,6 @@ |
| 151 |
<bugs-to>https://bugs.kde.org/</bugs-to> |
| 152 |
</upstream> |
| 153 |
<use> |
| 154 |
- <flag name="share">Enable support for a sharing application URLs <pkg>kde-frameworks/purpose</pkg></flag> |
| 155 |
<flag name="firmware">Enable support for firmware upgrades using <pkg>sys-apps/fwupd</pkg></flag> |
| 156 |
<flag name="flatpak">Enable support for flatpak repositories using <pkg>sys-apps/flatpak</pkg></flag> |
| 157 |
<flag name="webengine">Enable webflow support using <pkg>dev-qt/qtwebview</pkg> and <pkg>dev-qt/qtwebengine</pkg> instead of default URL handler</flag> |
Archives