| 1 |
commit: 98510d2d278385aa220d725ae680294d9e24689f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 13 17:33:00 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 13 17:33:00 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=98510d2d |
| 7 |
|
| 8 |
kde-plasma/discover: Fix DEPENDs, cmake options |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
kde-plasma/discover/discover-5.14.0.ebuild | 17 ++++++++++++----- |
| 14 |
kde-plasma/discover/discover-5.14.49.9999.ebuild | 17 ++++++++++++----- |
| 15 |
kde-plasma/discover/discover-9999.ebuild | 17 ++++++++++++----- |
| 16 |
3 files changed, 36 insertions(+), 15 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-plasma/discover/discover-5.14.0.ebuild b/kde-plasma/discover/discover-5.14.0.ebuild |
| 19 |
index 14966180f4..8f09c25175 100644 |
| 20 |
--- a/kde-plasma/discover/discover-5.14.0.ebuild |
| 21 |
+++ b/kde-plasma/discover/discover-5.14.0.ebuild |
| 22 |
@@ -13,17 +13,18 @@ IUSE="firmware" |
| 23 |
|
| 24 |
DEPEND=" |
| 25 |
$(add_frameworks_dep attica) |
| 26 |
- $(add_frameworks_dep karchive) |
| 27 |
$(add_frameworks_dep kconfig) |
| 28 |
+ $(add_frameworks_dep kconfigwidgets) |
| 29 |
$(add_frameworks_dep kcoreaddons) |
| 30 |
$(add_frameworks_dep kcrash) |
| 31 |
$(add_frameworks_dep kdbusaddons) |
| 32 |
$(add_frameworks_dep ki18n) |
| 33 |
- $(add_frameworks_dep kitemmodels) |
| 34 |
$(add_frameworks_dep kio) |
| 35 |
$(add_frameworks_dep kirigami) |
| 36 |
+ $(add_frameworks_dep kitemmodels) |
| 37 |
$(add_frameworks_dep knewstuff) |
| 38 |
$(add_frameworks_dep knotifications) |
| 39 |
+ $(add_frameworks_dep kwidgetsaddons) |
| 40 |
$(add_frameworks_dep kxmlgui) |
| 41 |
$(add_qt_dep qtconcurrent) |
| 42 |
$(add_qt_dep qtdbus) |
| 43 |
@@ -31,15 +32,21 @@ DEPEND=" |
| 44 |
$(add_qt_dep qtgui) |
| 45 |
$(add_qt_dep qtnetwork) |
| 46 |
$(add_qt_dep qtwidgets) |
| 47 |
+ $(add_qt_dep qtxml) |
| 48 |
firmware? ( sys-apps/fwupd ) |
| 49 |
" |
| 50 |
-# $(add_frameworks_dep kconfigwidgets) |
| 51 |
RDEPEND="${DEPEND}" |
| 52 |
|
| 53 |
+src_prepare() { |
| 54 |
+ kde5_src_prepare |
| 55 |
+ # we don't need it with PackageKitBackend off |
| 56 |
+ punt_bogus_dep KF5 Archive |
| 57 |
+} |
| 58 |
+ |
| 59 |
src_configure() { |
| 60 |
local mycmakeargs=( |
| 61 |
- -DCMAKE_FIND_PACKAGE_packagekitqt5=OFF |
| 62 |
- -DCMAKE_FIND_PACKAGE_AppStreamQt=OFF |
| 63 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=OFF |
| 64 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=OFF |
| 65 |
$(cmake-utils_use_find_package firmware LIBFWUPD) |
| 66 |
) |
| 67 |
|
| 68 |
|
| 69 |
diff --git a/kde-plasma/discover/discover-5.14.49.9999.ebuild b/kde-plasma/discover/discover-5.14.49.9999.ebuild |
| 70 |
index 602d92fe61..1eb798393b 100644 |
| 71 |
--- a/kde-plasma/discover/discover-5.14.49.9999.ebuild |
| 72 |
+++ b/kde-plasma/discover/discover-5.14.49.9999.ebuild |
| 73 |
@@ -13,17 +13,18 @@ IUSE="firmware" |
| 74 |
|
| 75 |
DEPEND=" |
| 76 |
$(add_frameworks_dep attica) |
| 77 |
- $(add_frameworks_dep karchive) |
| 78 |
$(add_frameworks_dep kconfig) |
| 79 |
+ $(add_frameworks_dep kconfigwidgets) |
| 80 |
$(add_frameworks_dep kcoreaddons) |
| 81 |
$(add_frameworks_dep kcrash) |
| 82 |
$(add_frameworks_dep kdbusaddons) |
| 83 |
$(add_frameworks_dep ki18n) |
| 84 |
- $(add_frameworks_dep kitemmodels) |
| 85 |
$(add_frameworks_dep kio) |
| 86 |
$(add_frameworks_dep kirigami) |
| 87 |
+ $(add_frameworks_dep kitemmodels) |
| 88 |
$(add_frameworks_dep knewstuff) |
| 89 |
$(add_frameworks_dep knotifications) |
| 90 |
+ $(add_frameworks_dep kwidgetsaddons) |
| 91 |
$(add_frameworks_dep kxmlgui) |
| 92 |
$(add_qt_dep qtconcurrent) |
| 93 |
$(add_qt_dep qtdbus) |
| 94 |
@@ -31,15 +32,21 @@ DEPEND=" |
| 95 |
$(add_qt_dep qtgui) |
| 96 |
$(add_qt_dep qtnetwork) |
| 97 |
$(add_qt_dep qtwidgets) |
| 98 |
+ $(add_qt_dep qtxml) |
| 99 |
firmware? ( sys-apps/fwupd ) |
| 100 |
" |
| 101 |
-# $(add_frameworks_dep kconfigwidgets) |
| 102 |
RDEPEND="${DEPEND}" |
| 103 |
|
| 104 |
+src_prepare() { |
| 105 |
+ kde5_src_prepare |
| 106 |
+ # we don't need it with PackageKitBackend off |
| 107 |
+ punt_bogus_dep KF5 Archive |
| 108 |
+} |
| 109 |
+ |
| 110 |
src_configure() { |
| 111 |
local mycmakeargs=( |
| 112 |
- -DCMAKE_FIND_PACKAGE_packagekitqt5=OFF |
| 113 |
- -DCMAKE_FIND_PACKAGE_AppStreamQt=OFF |
| 114 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=OFF |
| 115 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=OFF |
| 116 |
$(cmake-utils_use_find_package firmware LIBFWUPD) |
| 117 |
) |
| 118 |
|
| 119 |
|
| 120 |
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild |
| 121 |
index 602d92fe61..1eb798393b 100644 |
| 122 |
--- a/kde-plasma/discover/discover-9999.ebuild |
| 123 |
+++ b/kde-plasma/discover/discover-9999.ebuild |
| 124 |
@@ -13,17 +13,18 @@ IUSE="firmware" |
| 125 |
|
| 126 |
DEPEND=" |
| 127 |
$(add_frameworks_dep attica) |
| 128 |
- $(add_frameworks_dep karchive) |
| 129 |
$(add_frameworks_dep kconfig) |
| 130 |
+ $(add_frameworks_dep kconfigwidgets) |
| 131 |
$(add_frameworks_dep kcoreaddons) |
| 132 |
$(add_frameworks_dep kcrash) |
| 133 |
$(add_frameworks_dep kdbusaddons) |
| 134 |
$(add_frameworks_dep ki18n) |
| 135 |
- $(add_frameworks_dep kitemmodels) |
| 136 |
$(add_frameworks_dep kio) |
| 137 |
$(add_frameworks_dep kirigami) |
| 138 |
+ $(add_frameworks_dep kitemmodels) |
| 139 |
$(add_frameworks_dep knewstuff) |
| 140 |
$(add_frameworks_dep knotifications) |
| 141 |
+ $(add_frameworks_dep kwidgetsaddons) |
| 142 |
$(add_frameworks_dep kxmlgui) |
| 143 |
$(add_qt_dep qtconcurrent) |
| 144 |
$(add_qt_dep qtdbus) |
| 145 |
@@ -31,15 +32,21 @@ DEPEND=" |
| 146 |
$(add_qt_dep qtgui) |
| 147 |
$(add_qt_dep qtnetwork) |
| 148 |
$(add_qt_dep qtwidgets) |
| 149 |
+ $(add_qt_dep qtxml) |
| 150 |
firmware? ( sys-apps/fwupd ) |
| 151 |
" |
| 152 |
-# $(add_frameworks_dep kconfigwidgets) |
| 153 |
RDEPEND="${DEPEND}" |
| 154 |
|
| 155 |
+src_prepare() { |
| 156 |
+ kde5_src_prepare |
| 157 |
+ # we don't need it with PackageKitBackend off |
| 158 |
+ punt_bogus_dep KF5 Archive |
| 159 |
+} |
| 160 |
+ |
| 161 |
src_configure() { |
| 162 |
local mycmakeargs=( |
| 163 |
- -DCMAKE_FIND_PACKAGE_packagekitqt5=OFF |
| 164 |
- -DCMAKE_FIND_PACKAGE_AppStreamQt=OFF |
| 165 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=OFF |
| 166 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=OFF |
| 167 |
$(cmake-utils_use_find_package firmware LIBFWUPD) |
| 168 |
) |
Archives