gentoo resync : 18.11.2019

2 files changed, 37 insertions, 34 deletions

diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index ddb262395fa5..86c29312b243 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
 DIST marble-19.04.3.tar.xz 52188608 BLAKE2B 446078cdcff447e6e15b5be62a6169ba1a227fe189d4ff61cccc9b29a6fbf2fe500a57774f117759dd9a5371329e510fe862e68ce110e5c567108af30104d082 SHA512 4839ff6466accc920507ba032e7dea45a4fd22b6b93ca2f8d15526f0c8490f86271af0f109232f6f87dd00e090295b4ff17ec17b4592b90f13f26ce08fb2f4f4
-DIST marble-19.08.2.tar.xz 52327484 BLAKE2B 7f5f352fcec6467b6712526a7fa1af137f020b32c22e291d5a1145ea91cf54c0490cffcbcf28322fe158c5e0b2f996ecbcb116f122aa56d8812df709aa87283c SHA512 d18cfa59be6b360271afc711f61925a09dc4a304eaf41abbaeb6c7c6dc5aedff35eab658c47abba6fa5919940b6a7236292d38cc2e6eafe792c4188f090c1c61
+DIST marble-19.08.3.tar.xz 52406676 BLAKE2B c4836b451d0a13cf5de9f736063c7df9e093fa7f6f949aad35fb8f70f80a23c320d34beca5499f9c3bd2e4d43ab26149d6706b998a02bd20ec6088da4ddd0b56 SHA512 7c17b3015ed16d169f7bc2c2c633527a33818495b4894a571b0880011539f9c73eb787ff9705641ff1e4a58ec28418e6a495d6b216bd4807e407eb345cd4dc46
 EBUILD marble-19.04.3.ebuild 2326 BLAKE2B a80c94ee3d720d4ea6847420428d38ba3da4945d0a3a6fb4ff2de40b4dd2fe0cbcb97fd1c38f43a37e063449f450d42b3f045c5645c60899d11e0752b21af73b SHA512 13e84eaefe0a1e918ceb0c7ed8a7af6f3521d49c655ea6844bd9f5c2685e83f5dc8e5f93dd18985fbf8c9eb8310971d9b1167bb3ac484659959c01b575afd1b9
-EBUILD marble-19.08.2.ebuild 2462 BLAKE2B b9db98e0496295a579e548e5cb99ae832644b55f3da91b21c94be9524532e99fc29be9ce1908c2678a37d85c59f36eff1403d251d1172b385e83c8db01519036 SHA512 c9e2a5630a314482c472d409d4cb09c0e97b8bbc9194a127dca4ccd22cda89c1de9898be0c0bf5d4ef61bb4a0e2f81693727478b6f1d332bd42c9c46b50ff5e2
+EBUILD marble-19.08.3-r1.ebuild 2683 BLAKE2B 1178336b2abd0cd969b20be93b0b7829cd99ba3a7cda81408ff9556cfe5e4f5fe427bca7f46364500f99a9df9ad1a8f9d25a4c2a1709aad8f491cdddf4c040cd SHA512 fb7312a34bb984adc5db3b45bd947d5a8489f0508219a81a0bb1c6134a70548f0ea8904e465c75646c13dc37d01680a02b1cbd8d86c4cd163978d52e5e6b6ad6
 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473
diff --git a/kde-apps/marble/marble-19.08.2.ebuild b/kde-apps/marble/marble-19.08.3-r1.ebuild
index 7253e190f875..bc9f779ba6e1 100644
--- a/kde-apps/marble/marble-19.08.2.ebuild
+++ b/kde-apps/marble/marble-19.08.3-r1.ebuild
@@ -3,55 +3,58 @@
 
 EAPI=7
 
-KDE_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-KDE_SUBSLOT="true"
-KDE_TEST="forceoptional"
+ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
 HOMEPAGE="https://marble.kde.org/"
 
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine"
 
 # FIXME (new package): libwlocate, WLAN-based geolocation
 BDEPEND="
 	aprs? ( dev-lang/perl )
-	nls? ( $(add_qt_dep linguist-tools) )
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
 "
 DEPEND="
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	sys-libs/zlib
-	aprs? ( $(add_qt_dep qtserialport) )
-	dbus? ( $(add_qt_dep qtdbus) )
-	designer? ( $(add_qt_dep designer) )
-	geolocation? ( $(add_qt_dep qtpositioning) )
+	aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 )
+	dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+	designer? ( >=dev-qt/designer-${QTMIN}:5 )
+	geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
 	gps? ( sci-geosciences/gpsd )
 	kde? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kcrash)
-		$(add_frameworks_dep ki18n)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kparts)
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep kservice)
-		$(add_frameworks_dep kwallet)
+		>=kde-frameworks/kconfig-${KFMIN}:5
+		>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+		>=kde-frameworks/kcoreaddons-${KFMIN}:5
+		>=kde-frameworks/kcrash-${KFMIN}:5
+		>=kde-frameworks/ki18n-${KFMIN}:5
+		>=kde-frameworks/kio-${KFMIN}:5
+		>=kde-frameworks/knewstuff-${KFMIN}:5
+		>=kde-frameworks/kparts-${KFMIN}:5
+		>=kde-frameworks/krunner-${KFMIN}:5
+		>=kde-frameworks/kservice-${KFMIN}:5
+		>=kde-frameworks/kwallet-${KFMIN}:5
 	)
 	phonon? ( media-libs/phonon[qt5(+)] )
 	shapefile? ( sci-libs/shapelib:= )
-	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
 "
 RDEPEND="${DEPEND}"
 
@@ -59,7 +62,7 @@ RDEPEND="${DEPEND}"
 RESTRICT+=" test"
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
 
@@ -86,7 +89,7 @@ src_configure() {
 		-DKDE_INSTALL_CONFDIR="/etc/xdg"
 	)
 	if use kde; then
-		kde5_src_configure
+		ecm_src_configure
 	else
 		cmake-utils_src_configure
 	fi