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 0E4B813835B for ; Sun, 25 Oct 2020 00:26:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DD6CE0919; Sun, 25 Oct 2020 00:26:47 +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 241D3E0919 for ; Sun, 25 Oct 2020 00:26:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1116E33BEF2 for ; Sun, 25 Oct 2020 00:26:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58EFC3BF for ; Sun, 25 Oct 2020 00:26:43 +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: <1603580166.ecb7ec7c08576bca3dd345a7873aff86de8fe75b.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.20.49.9999.ebuild kde-plasma/discover/discover-9999.ebuild kde-plasma/discover/metadata.xml X-VCS-Directories: kde-plasma/discover/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ecb7ec7c08576bca3dd345a7873aff86de8fe75b X-VCS-Branch: master Date: Sun, 25 Oct 2020 00:26:43 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 899ba5b3-8496-4c1e-8fec-8e6ab0781f71 X-Archives-Hash: deee47b07e22ffe21a0fbacbfd798f59 commit: ecb7ec7c08576bca3dd345a7873aff86de8fe75b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 24 22:56:06 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 24 22:56:06 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ecb7ec7c kde-plasma/discover: Add IUSE=flatpak Closes: https://bugs.gentoo.org/750008 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/discover/discover-5.20.49.9999.ebuild | 11 +++++++---- kde-plasma/discover/discover-9999.ebuild | 11 +++++++---- kde-plasma/discover/metadata.xml | 1 + 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/kde-plasma/discover/discover-5.20.49.9999.ebuild b/kde-plasma/discover/discover-5.20.49.9999.ebuild index ed26fce67b..4b7a156ff9 100644 --- a/kde-plasma/discover/discover-5.20.49.9999.ebuild +++ b/kde-plasma/discover/discover-5.20.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=7 ECM_TEST="forceoptional" KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) QTMIN=5.15.1 VIRTUALX_REQUIRED="test" inherit ecm kde.org @@ -16,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="+firmware telemetry" +IUSE="+firmware flatpak telemetry" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" @@ -43,6 +42,10 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 firmware? ( sys-apps/fwupd ) + flatpak? ( + dev-libs/appstream:= + sys-apps/flatpak + ) telemetry? ( dev-libs/kuserfeedback:5 ) " RDEPEND="${DEPEND} @@ -59,9 +62,9 @@ src_prepare() { src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON - -DBUILD_FlatpakBackend=OFF + -DBUILD_FlatpakBackend=$(usex flatpak) + $(cmake_use_find_package flatpak AppStreamQt) -DBUILD_FwupdBackend=$(usex firmware) $(cmake_use_find_package telemetry KUserFeedback) ) diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild index 752e64f18e..c0d1ff6ce5 100644 --- a/kde-plasma/discover/discover-9999.ebuild +++ b/kde-plasma/discover/discover-9999.ebuild @@ -5,7 +5,6 @@ EAPI=7 ECM_TEST="forceoptional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=5.15.1 VIRTUALX_REQUIRED="test" inherit ecm kde.org @@ -16,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="+firmware telemetry" +IUSE="+firmware flatpak telemetry" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" @@ -43,6 +42,10 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 firmware? ( sys-apps/fwupd ) + flatpak? ( + dev-libs/appstream:= + sys-apps/flatpak + ) telemetry? ( dev-libs/kuserfeedback:5 ) " RDEPEND="${DEPEND} @@ -59,9 +62,9 @@ src_prepare() { src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON - -DBUILD_FlatpakBackend=OFF + -DBUILD_FlatpakBackend=$(usex flatpak) + $(cmake_use_find_package flatpak AppStreamQt) -DBUILD_FwupdBackend=$(usex firmware) $(cmake_use_find_package telemetry KUserFeedback) ) diff --git a/kde-plasma/discover/metadata.xml b/kde-plasma/discover/metadata.xml index 59d0ace33b..2b2527d412 100644 --- a/kde-plasma/discover/metadata.xml +++ b/kde-plasma/discover/metadata.xml @@ -7,5 +7,6 @@ Enable support for firmware upgrades using sys-apps/fwupd + Enable support for flatpak repositories using sys-apps/flatpak