gentoo resync : 18.11.2019

2 files changed, 46 insertions, 42 deletions

diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index fa207cd85427..d5b13a16b5e1 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,5 @@
 DIST gwenview-19.04.3.tar.xz 5713352 BLAKE2B b56cf65e76e7c2e580f615c995d636476e50478d7b53ca9814bd103a887eb94a12f26a78bd1fed6058dd596ad0a213a648cebba99cac5eabf6bcef16bf70e497 SHA512 03368de984dba8125d7cb1c49fb643bc313684621bf3e06ffc34258591673fdb180769657a5318412acc68c33b219df04148a8b4271640adca621a844f3b8103
-DIST gwenview-19.08.2.tar.xz 5724040 BLAKE2B 14d16f5492aa17040fe57fd17ac8df069c55cea9f623591f2192f33825096c948a08874fab6c5884b34bc6a48839682a8cbe06ecb2ae4252a727d19fd8df2fed SHA512 089bb97a79b2f6853710805d19084334972c86f8c89ddb2e80c7bf30d5a82c8edd5a0be5b68a7ad9e63c1a2b86d75dbd20dccfefe2859a660cd60cfbcbb5d843
+DIST gwenview-19.08.3.tar.xz 5723104 BLAKE2B fe369a5be382eb431dde1289bed53cb53dc06a273b99f313b4bb8cfd57f95d85ade5be4799267fc3b6164bef93bb3e5bb8fcde3fccc570eb78ca396d76b944fa SHA512 5db117a5975ee09b8b40fa420cc129fc6cb786a19d67dd391f12a560049134328977f3ed1dbf3f6ba379d46d0d8c00fb2290dda84fb44e90055037818cce84bf
 EBUILD gwenview-19.04.3.ebuild 2650 BLAKE2B 48bdc918dc36909120525b6c28e74df867d7fdac161e5195da77e2dfc4b4d9b0a47da22c51584f458ee729971b24724a12b3693c41538ae18123d5f507ac4630 SHA512 d261ccab4612aa8e5fbdfc2d536776bebd08d36bb0df34b99d30e24635955071ff3442986b67c01986e37c297d6e1e3d732e15e0a0bfe37ab8b8058110b9727a
-EBUILD gwenview-19.08.2.ebuild 2760 BLAKE2B ac1a6c17dc5635136f4ae3a422908414bbb4ca9b2aef1d82e7357da1f2d5c907daca4744dd3b79d28ed16c7c9fa96de4337d974836c73769947d2b682cdc68ba SHA512 763e075c328124851236b159ab446503b77659c640afb0feca11300dca051d3c897bde7a6886184e7334e0bfe65bfd1b4561abbb9d4dda2ca0fb6cf2d9e30e61
+EBUILD gwenview-19.08.3.ebuild 3005 BLAKE2B 096d3f84eea25b34ec40ab46acd1d422952dbbc4b5aad36775e7588e483ad9d90e26795407f1cf0301dea3f48b01176da7d535211cf8b63251eb250246f80cca SHA512 bff6b038b2bbd02c09109cfc25969f58d0434add155af091bf41039134dfec774ebbe40e563931bbac77e1b75cb5691418fb1a3726ad6ee901d10715f96a6013
 MISC metadata.xml 708 BLAKE2B cde335a32954748c28475a1620aac2e6733490fd8e6126f8963c6b5b0b6e8e87065dbab17e1723945e8f5646815acdf9fdfbf89c4dc57639663567fdcab0b5c9 SHA512 b8fffc87db328df9c5dafb6d72b954ce052678810375278adb390c832bec11f419000fcdd08bd73b9dbcc3e475b7e7b927663c9886b6eb92b7caca7e311015e6
diff --git a/kde-apps/gwenview/gwenview-19.08.2.ebuild b/kde-apps/gwenview/gwenview-19.08.3.ebuild
index ea2389376623..4398c866bcbd 100644
--- a/kde-apps/gwenview/gwenview-19.08.2.ebuild
+++ b/kde-apps/gwenview/gwenview-19.08.3.ebuild
@@ -3,9 +3,12 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Image viewer by KDE"
 HOMEPAGE="
@@ -14,6 +17,7 @@ HOMEPAGE="
 "
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 
@@ -21,59 +25,59 @@ IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 RESTRICT+=" test"
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtopengl-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	media-gfx/exiv2:=
 	media-libs/lcms:2
 	media-libs/libpng:0=
 	media-libs/phonon[qt5(+)]
 	virtual/jpeg:0
-	activities? ( $(add_frameworks_dep kactivities) )
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	fits? ( sci-libs/cfitsio )
-	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
-	mpris? ( $(add_qt_dep qtdbus) )
-	raw? ( $(add_kdeapps_dep libkdcraw) )
+	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
+	mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+	raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
 	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
+		>=kde-frameworks/baloo-${KFMIN}:5
+		>=kde-frameworks/kfilemetadata-${KFMIN}:5
 	)
-	share? ( $(add_frameworks_dep purpose) )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	X? (
-		$(add_qt_dep qtx11extras)
+		>=dev-qt/qtx11extras-${QTMIN}:5
 		x11-libs/libX11
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtconcurrent)
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kimageformats)
-	$(add_qt_dep qtimageformats)
-	kipi? ( $(add_kdeapps_dep kipi-plugins) )
+	>=kde-frameworks/kimageformats-${KFMIN}:5
+	>=dev-qt/qtimageformats-${QTMIN}:5
+	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
 "
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 	if ! use mpris; then
 		# FIXME: upstream a better solution
 		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
@@ -96,11 +100,11 @@ src_configure() {
 		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
 	fi
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version kde-apps/svgpart:${SLOT} ; then
 		elog "For SVG support, install kde-apps/svgpart:${SLOT}"