[gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/

[Andreas Sturmlechner]

commit:     64478fbba66e1ff6a31b26351bd6ba38a2e35b61
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 10:05:03 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 10:09:45 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=64478fbb

kde-apps/gwenview: Fix USE=-mpris

Use a workaround, but this should be fixed upstream.

Closes: https://bugs.gentoo.org/663340
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 kde-apps/gwenview/gwenview-18.08.49.9999.ebuild | 9 ++++++++-
 kde-apps/gwenview/gwenview-9999.ebuild          | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-18.08.49.9999.ebuild b/kde-apps/gwenview/gwenview-18.08.49.9999.ebuild
index b9e1acde2a..c1bbff3d8d 100644
--- a/kde-apps/gwenview/gwenview-18.08.49.9999.ebuild
+++ b/kde-apps/gwenview/gwenview-18.08.49.9999.ebuild
@@ -72,12 +72,19 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=( "${FILESDIR}/${PN}-18.07.90-activities-optional.patch" )
 
+src_prepare() {
+	kde5_src_prepare
+	if ! use mpris; then
+		# FIXME: upstream a better solution
+		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package activities KF5Activities)
 		$(cmake-utils_use_find_package fits CFitsio)
 		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package mpris Qt5DBus)
 		$(cmake-utils_use_find_package raw KF5KDcraw)
 		$(cmake-utils_use_find_package X X11)
 	)

diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index b6342a3478..a0eb443c50 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-9999.ebuild
@@ -70,12 +70,19 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtimageformats)
 "
 
+src_prepare() {
+	kde5_src_prepare
+	if ! use mpris; then
+		# FIXME: upstream a better solution
+		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package activities KF5Activities)
 		$(cmake-utils_use_find_package fits CFitsio)
 		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package mpris Qt5DBus)
 		$(cmake-utils_use_find_package raw KF5KDcraw)
 		$(cmake-utils_use_find_package X X11)
 	)