gentoo resync : 24.12.2018

3 files changed, 23 insertions, 16 deletions

diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 6d81a3aa2273..cb60cd4c2294 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,6 +1,6 @@
 AUX gwenview-18.07.90-activities-optional.patch 5078 BLAKE2B 692a743c319a9498de88af97b113e123ec445322f55513fcae58d4c556b29c23f0b2586e292900fb8e233c5cd2b33a7f76cf759b0c0ad119efb7daa7c290263c SHA512 2afd6fe89d1b455723d15f38866a476f8872e45d0548c36432f4b08d6404d02c4c03f78bfa60ec7dbddad022fef32283155b3ce27a9a8b16c4b753246b301106
-DIST gwenview-18.04.3.tar.xz 6055876 BLAKE2B 5202dcfe597ad1da7d5b18124ec357239a26a30c20d83c37bc7258e0ad4232b53081a8e050017850ea6eeb02fe0d88f90b90b0029e364929375d3e09dc8bf7fd SHA512 a1c36a05e4ae3ee9aff74f4a56eb10c2c27aa89e10886d14dd6753e42329653550e8716965156ec5f50915e320224757bf52d1178986ef10d039e3c622c01a7f
 DIST gwenview-18.08.3.tar.xz 6178192 BLAKE2B 0b25bdd64398f7ef1310598daad07374ca56383578fd67a8e36e348e78e1d818335fe4d630cc733e7a1eb13eaafca268426aea5afbb44195106742c50587c74d SHA512 0889b3388311b8c2b5a2ff98eea55dbae69ec6a27b5f27defc884077d937006d184c08a9daf31df0d9fb096b1a53fc70e844d46c4e3577d21e8f6ab83cca06ce
-EBUILD gwenview-18.04.3.ebuild 2413 BLAKE2B fec0d82754f8e01f85946c5d9dd3aaeba2d4b7b934327f8bfd37e3c7cc910dd675d3d5583110088a21a07e780e3a25cfa25f03cf4d866a0d0d05b535922b0ddf SHA512 2dc8646d06e47db59f8ca63b89d73a50b70e00ff33e9f8a04043017cf84579ab0406dfc44ca258fc8d722a2e3eb00da00583ac42895985280e380b9322366d64
-EBUILD gwenview-18.08.3.ebuild 2790 BLAKE2B bb12f1c92eea28826023841e4601d65b24d392a0d7f93eeca6c930be4b9ac6007512347f00762825e662d2ccb6ec9b72e181071c4c58c602ba7e4fc6f0be765b SHA512 f68422bc89f24b66981061a92efb882effeb2f35c76e4b61c9fe43230d69ffc43a625bf51cb2c98e51e91ed077b1618530e8aafefc87ee96c11f197b77643a97
+DIST gwenview-18.12.0.tar.xz 6178072 BLAKE2B 4066165db148987c606e85c47cb6a47f236c07938d3819ca76ce6c083764874360cbba82c6b9cbe9a7d72771269a8b66a7894634a55f3d9a2d6db027c982aa2e SHA512 ef7f706c3c3278ca4f826518824f7457948b5fdac2d49cdb55977d55829cc90852745833fd86b94a5ce2cc7b55286c864b05f9a51d546e29538bf0f32bec2ec4
+EBUILD gwenview-18.08.3.ebuild 2788 BLAKE2B c77ccacf146ac431a6e604c6a69107c54a5af2c50c907dafcdad900527aa5dbfdc4cc1405920d7502feff53309bbfce8cbbd244483a8c7842862839367518759 SHA512 4652f7225a398412bfe6737adf2fc437376640cdaff0d3976ebaaca8de15eacb9c9e99b0f950e0a589bce01ea38fdafbd3ddef3dc09b5a07c0d24688179a4b8c
+EBUILD gwenview-18.12.0.ebuild 2646 BLAKE2B 8608898cf943791816ed3cc3010276258bc3a259a829173b5ec43854c80da12ebb03e4958303588928995df5e607fad28df18fc0056565fed385c850adc56c09 SHA512 651a53414e2c9d6cb35283fe99eb469ab3e30a148a67f984dd82a812e79ab8b7dea5d4f030b8fb60f9d3cca6ace9cfd3297d01b4f3294b612a3b6bf9e7355a30
 MISC metadata.xml 608 BLAKE2B 19b5fd4798750b2efd9d68a6271cb7c0c1c63e82075f2ac68fdf12bf57c5e695d3d9ee08f49d7cc22e0b15931eed086690b3af478486a858c4c233ee23b34ab0 SHA512 bc0c98d5420300aa4f17b0f544bc9cd44d8755ac716c099a5787769705e72eab9aae5d4b9a653434234dc605362f3c0d3d362121ab8c75978cdbde8f5fc774de
diff --git a/kde-apps/gwenview/gwenview-18.08.3.ebuild b/kde-apps/gwenview/gwenview-18.08.3.ebuild
index 1d60e093c7e1..f82a3952a33b 100644
--- a/kde-apps/gwenview/gwenview-18.08.3.ebuild
+++ b/kde-apps/gwenview/gwenview-18.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 "
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="activities fits kipi +mpris raw semantic-desktop X"
 
 # requires running environment
diff --git a/kde-apps/gwenview/gwenview-18.04.3.ebuild b/kde-apps/gwenview/gwenview-18.12.0.ebuild
index b353cb2bd0b3..a580d5a58ccd 100644
--- a/kde-apps/gwenview/gwenview-18.04.3.ebuild
+++ b/kde-apps/gwenview/gwenview-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,21 +7,20 @@ KDE_HANDBOOK="true"
 KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="KDE image viewer"
+DESCRIPTION="Image viewer by KDE"
 HOMEPAGE="
 	https://www.kde.org/applications/graphics/gwenview/
 	https://userbase.kde.org/Gwenview
 "
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
-IUSE="fits kipi raw semantic-desktop X"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities fits kipi +mpris raw semantic-desktop X"
 
 # requires running environment
 RESTRICT+=" test"
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -48,8 +47,10 @@ COMMON_DEPEND="
 	media-libs/libpng:0=
 	media-libs/phonon[qt5(+)]
 	virtual/jpeg:0
+	activities? ( $(add_frameworks_dep kactivities) )
 	fits? ( sci-libs/cfitsio )
 	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
+	mpris? ( $(add_qt_dep qtdbus) )
 	raw? ( $(add_kdeapps_dep libkdcraw) )
 	semantic-desktop? (
 		$(add_frameworks_dep baloo)
@@ -67,10 +68,20 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kimageformats)
 	$(add_qt_dep qtimageformats)
+	kipi? ( media-plugins/kipi-plugins:5 )
 "
 
+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 raw KF5KDcraw)
@@ -78,9 +89,9 @@ src_configure() {
 	)
 
 	if use semantic-desktop; then
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
+		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
 	else
-		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
+		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
 	fi
 
 	kde5_src_configure
@@ -89,11 +100,7 @@ src_configure() {
 pkg_postinst() {
 	kde5_pkg_postinst
 
-	if ! has_version kde-apps/svgpart:${SLOT} ; then
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version kde-apps/svgpart:${SLOT} ; then
 		elog "For SVG support, install kde-apps/svgpart:${SLOT}"
 	fi
-
-	if use kipi && ! has_version media-plugins/kipi-plugins ; then
-		elog "Plugins for the KIPI interface can be found in media-plugins/kipi-plugins"
-	fi
 }