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 4B838138334 for ; Tue, 13 Nov 2018 11:56:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33050E08FC; Tue, 13 Nov 2018 11:56:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E01A8E08FC for ; Tue, 13 Nov 2018 11:56:35 +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 1BCE6335D0C for ; Tue, 13 Nov 2018 11:56:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1CAC4453 for ; Tue, 13 Nov 2018 11:56:31 +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: <1542110163.547c2522da68129f7b7a68976f0433044fcfc28e.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.3.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: 547c2522da68129f7b7a68976f0433044fcfc28e X-VCS-Branch: master Date: Tue, 13 Nov 2018 11:56:31 +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: 63baeaee-28a8-413d-b2ba-f5099d225028 X-Archives-Hash: 919b8c553f5444e05905fc72dfd976e3 commit: 547c2522da68129f7b7a68976f0433044fcfc28e Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 13 11:56:03 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Nov 13 11:56:03 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=547c2522 kde-plasma/discover: Fix RDEPENDs, fix cmake options Closes: https://bugs.gentoo.org/670980 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/discover/discover-5.14.3.ebuild | 12 ++++++++---- kde-plasma/discover/discover-5.14.49.9999.ebuild | 12 ++++++++---- kde-plasma/discover/discover-9999.ebuild | 12 ++++++++---- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/kde-plasma/discover/discover-5.14.3.ebuild b/kde-plasma/discover/discover-5.14.3.ebuild index 6d93a8e15d..4e573f4e57 100644 --- a/kde-plasma/discover/discover-5.14.3.ebuild +++ b/kde-plasma/discover/discover-5.14.3.ebuild @@ -35,7 +35,9 @@ DEPEND=" $(add_qt_dep qtxml) firmware? ( sys-apps/fwupd ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + $(add_frameworks_dep kirigami) +" src_prepare() { kde5_src_prepare @@ -45,9 +47,11 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=OFF - $(cmake-utils_use_find_package firmware LIBFWUPD) + -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON + -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON + -DBUILD_FlatpakBackend=OFF + -DBUILD_FwupdBackend=$(usex firmware) ) kde5_src_configure diff --git a/kde-plasma/discover/discover-5.14.49.9999.ebuild b/kde-plasma/discover/discover-5.14.49.9999.ebuild index ae629a159c..3cbe733e91 100644 --- a/kde-plasma/discover/discover-5.14.49.9999.ebuild +++ b/kde-plasma/discover/discover-5.14.49.9999.ebuild @@ -35,7 +35,9 @@ DEPEND=" $(add_qt_dep qtxml) firmware? ( sys-apps/fwupd ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + $(add_frameworks_dep kirigami) +" src_prepare() { kde5_src_prepare @@ -45,9 +47,11 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=OFF - $(cmake-utils_use_find_package firmware LIBFWUPD) + -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON + -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON + -DBUILD_FlatpakBackend=OFF + -DBUILD_FwupdBackend=$(usex firmware) ) kde5_src_configure diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild index ae629a159c..3cbe733e91 100644 --- a/kde-plasma/discover/discover-9999.ebuild +++ b/kde-plasma/discover/discover-9999.ebuild @@ -35,7 +35,9 @@ DEPEND=" $(add_qt_dep qtxml) firmware? ( sys-apps/fwupd ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + $(add_frameworks_dep kirigami) +" src_prepare() { kde5_src_prepare @@ -45,9 +47,11 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=OFF - $(cmake-utils_use_find_package firmware LIBFWUPD) + -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON + -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON + -DBUILD_FlatpakBackend=OFF + -DBUILD_FwupdBackend=$(usex firmware) ) kde5_src_configure