commit: 98510d2d278385aa220d725ae680294d9e24689f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 17:33:00 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 17:33:00 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=98510d2d
kde-plasma/discover: Fix DEPENDs, cmake options
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
kde-plasma/discover/discover-5.14.0.ebuild | 17 ++++++++++++-----
kde-plasma/discover/discover-5.14.49.9999.ebuild | 17 ++++++++++++-----
kde-plasma/discover/discover-9999.ebuild | 17 ++++++++++++-----
3 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/kde-plasma/discover/discover-5.14.0.ebuild
b/kde-plasma/discover/discover-5.14.0.ebuild
index 14966180f4..8f09c25175 100644
--- a/kde-plasma/discover/discover-5.14.0.ebuild
+++ b/kde-plasma/discover/discover-5.14.0.ebuild
@@ -13,17 +13,18 @@ IUSE="firmware"
DEPEND="
$(add_frameworks_dep attica)
- $(add_frameworks_dep karchive)
$(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep ki18n)
- $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep kio)
$(add_frameworks_dep kirigami)
+ $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
@@ -31,15 +32,21 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
firmware? ( sys-apps/fwupd )
"
-# $(add_frameworks_dep kconfigwidgets)
RDEPEND="${DEPEND}"
+src_prepare() {
+ kde5_src_prepare
+ # we don't need it with PackageKitBackend off
+ punt_bogus_dep KF5 Archive
+}
+
src_configure() {
local mycmakeargs=(
- -DCMAKE_FIND_PACKAGE_packagekitqt5=OFF
- -DCMAKE_FIND_PACKAGE_AppStreamQt=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=OFF
$(cmake-utils_use_find_package firmware LIBFWUPD)
)
diff --git a/kde-plasma/discover/discover-5.14.49.9999.ebuild
b/kde-plasma/discover/discover-5.14.49.9999.ebuild
index 602d92fe61..1eb798393b 100644
--- a/kde-plasma/discover/discover-5.14.49.9999.ebuild
+++ b/kde-plasma/discover/discover-5.14.49.9999.ebuild
@@ -13,17 +13,18 @@ IUSE="firmware"
DEPEND="
$(add_frameworks_dep attica)
- $(add_frameworks_dep karchive)
$(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep ki18n)
- $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep kio)
$(add_frameworks_dep kirigami)
+ $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
@@ -31,15 +32,21 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
firmware? ( sys-apps/fwupd )
"
-# $(add_frameworks_dep kconfigwidgets)
RDEPEND="${DEPEND}"
+src_prepare() {
+ kde5_src_prepare
+ # we don't need it with PackageKitBackend off
+ punt_bogus_dep KF5 Archive
+}
+
src_configure() {
local mycmakeargs=(
- -DCMAKE_FIND_PACKAGE_packagekitqt5=OFF
- -DCMAKE_FIND_PACKAGE_AppStreamQt=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=OFF
$(cmake-utils_use_find_package firmware LIBFWUPD)
)
diff --git a/kde-plasma/discover/discover-9999.ebuild
b/kde-plasma/discover/discover-9999.ebuild
index 602d92fe61..1eb798393b 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -13,17 +13,18 @@ IUSE="firmware"
DEPEND="
$(add_frameworks_dep attica)
- $(add_frameworks_dep karchive)
$(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep ki18n)
- $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep kio)
$(add_frameworks_dep kirigami)
+ $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
@@ -31,15 +32,21 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
firmware? ( sys-apps/fwupd )
"
-# $(add_frameworks_dep kconfigwidgets)
RDEPEND="${DEPEND}"
+src_prepare() {
+ kde5_src_prepare
+ # we don't need it with PackageKitBackend off
+ punt_bogus_dep KF5 Archive
+}
+
src_configure() {
local mycmakeargs=(
- -DCMAKE_FIND_PACKAGE_packagekitqt5=OFF
- -DCMAKE_FIND_PACKAGE_AppStreamQt=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=OFF
$(cmake-utils_use_find_package firmware LIBFWUPD)
)
