commit: 547c2522da68129f7b7a68976f0433044fcfc28e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Nov 13 11:56:03 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
