From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 835AF138334 for ; Sat, 13 Oct 2018 17:42:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A19E4E098F; Sat, 13 Oct 2018 17:42:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 67309E098F for ; Sat, 13 Oct 2018 17:42:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15F10335C7F for ; Sat, 13 Oct 2018 17:42:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1ECD6437 for ; Sat, 13 Oct 2018 17:42:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1539451980.98510d2d278385aa220d725ae680294d9e24689f.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/discover/discover-5.14.0.ebuild kde-plasma/discover/discover-5.14.49.9999.ebuild kde-plasma/discover/discover-9999.ebuild X-VCS-Directories: kde-plasma/discover/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 98510d2d278385aa220d725ae680294d9e24689f X-VCS-Branch: master Date: Sat, 13 Oct 2018 17:42:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bf245bf0-f3e2-462f-9212-25f35261db7c X-Archives-Hash: 4d23c1372bccf6b1c4c3a38c21070ffc commit: 98510d2d278385aa220d725ae680294d9e24689f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 13 17:33:00 2018 +0000 Commit: Andreas Sturmlechner gentoo 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 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) )