gentoo resync : 18.11.2019

2 files changed, 41 insertions, 36 deletions

diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 425deefbea00..50cef98db0f8 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,7 +1,7 @@
 AUX okular-18.08.0-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
 AUX okular-18.12.0-tests.patch 568 BLAKE2B ad0a70fb37b513df846b0831d2335917817e12f63dcdc46955618de6e07ccca72c9e8378f625deabd11ab174fddc5122f68237decd3402cb5b402e5b21fe55e9 SHA512 29d9271e4165fa4f3d1cf02cb00e32be662f5ae39b77fdf9f7d9ccfa24dcded5d38cd7b9fe1a1c6e65021faa77504663dd5030506baffdbc3f449bc67f6b21d8
 DIST okular-19.04.3.tar.xz 7021028 BLAKE2B fba1831390fe113be1b15c862441e1ec6bb456ab909512037cc6b758db2ddca02f5dd17ecaf0f544420cad4cb4af8a38ed953ba31a934a0e533c57f28ab7e2a1 SHA512 c8d2a79fe00b91f58376937ef57cbc20bc7363d9a046cf05fc34597d36f75009011c63589857270755f294adba5fc88ba980bd5affd08c4751bc9e3b908e3946
-DIST okular-19.08.2.tar.xz 7066232 BLAKE2B 426f9804381b3cec65b5e36432fd4e218308eaa0a4c9b627ec2387c02dbc620222a1d43e02950d73f9d2975f4f58ba28577d69aa48e051c838a9641cbb284a29 SHA512 fbf6285e65f45b2d49596169216ded2da26a73abec1d2279bc510db5df0bb6dbf9794e864de06837c5b7bf1db19de1774c38c18eb78c4b0c2d3ac49cb35bb9f7
+DIST okular-19.08.3.tar.xz 7068828 BLAKE2B 8805936e7be73d3eb937fed0fe77d535c0d40fe839c9923466cada7f8cbf0f37253348d608d52eaaa7780c22db5f792ccb9bbbc474d35663e58b5b542b40fd13 SHA512 2fffce8023d9b0d08ec03cc51d21827772ed07c3004fcf8a23589211e7f676b61253dc39c8a41da5d9c4764ac9895c1a0e16c72c7157213b2e79ccaf35db77fa
 EBUILD okular-19.04.3.ebuild 2965 BLAKE2B 246b458a5537e0a8af2bb500639beb124d3897bbcc4c155569c0ed5fd71058ca3ae5b96ac336a9829d716dec7957c9baf9315a7ac1e5da7b1293e5b0d9abfe56 SHA512 b91e2322f0061fc9b81bb16ed9ea799fff31fa739a09ed1f3eb00e5d3a4969ef490cdf7ce7d9480227d44d112031c53e5ff8b6cc52e11387586ba25d0405b1ec
-EBUILD okular-19.08.2.ebuild 2968 BLAKE2B c4f2d31b70a46ffce7d9c530991d51db3ce93cdb38176edbd222e6a2749266512fcc04a7798762018010df037768a30b6395e05558260ae8bff61387733595f9 SHA512 46843a41ded3ce4a2ecf6c9dfa53d9409d5514fde82921cda6df5c4464139d46fb5878ec42689b5d2e1cf01990adb9e10e4f1d8ff9e522724e6be2c1e3e952db
+EBUILD okular-19.08.3.ebuild 3219 BLAKE2B 0f0fca5aec8320a5ed8da49e57141ab5138568a7de764ad9f3d31309042a3b3a419b3b35317003422e7c49f97c6980ee775d0c493dc007ae05483866d6994657 SHA512 e4cd8e74d0412ecf6bad50875f9f04cf4d72c09f311de6bd4b0042a5a2ee162a3a44f12f5bc10c24023541c155b1fcacca652cf23877a1ba22a15319ea3f39f6
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
diff --git a/kde-apps/okular/okular-19.08.2.ebuild b/kde-apps/okular/okular-19.08.3.ebuild
index 64bf34f1cfc9..458f2be94e27 100644
--- a/kde-apps/okular/okular-19.08.2.ebuild
+++ b/kde-apps/okular/okular-19.08.3.ebuild
@@ -3,64 +3,69 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org https://kde.org/applications/graphics/okular"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
 
 DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjs-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	media-libs/freetype
 	media-libs/phonon[qt5(+)]
 	sys-libs/zlib
 	chm? (
-		$(add_frameworks_dep khtml)
+		>=kde-frameworks/khtml-${KFMIN}:5
 		dev-libs/chmlib
 	)
 	crypt? ( app-crypt/qca:2[qt5(+)] )
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
 	image-backend? (
-		$(add_kdeapps_dep libkexiv2)
-		$(add_qt_dep qtgui 'gif,jpeg,png')
+		>=kde-apps/libkexiv2-${PVCUT}:5
+		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
 	)
 	markdown? ( app-text/discount )
-	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
+	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( app-text/poppler[qt5] )
 	plucker? ( virtual/jpeg:0 )
 	postscript? ( app-text/libspectre )
-	share? ( $(add_frameworks_dep purpose) )
-	speech? ( $(add_qt_dep qtspeech) )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
 	tiff? ( media-libs/tiff:0 )
 "
 RDEPEND="${DEPEND}
-	image-backend? ( $(add_frameworks_dep kimageformats) )
+	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
 	mobile? (
-		$(add_frameworks_dep kirigami)
-		$(add_qt_dep qtquickcontrols)
+		>=kde-frameworks/kirigami-${KFMIN}:5
+		>=dev-qt/qtquickcontrols-${QTMIN}:5
 	)
 "
 
@@ -70,7 +75,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 	use mobile || cmake_comment_add_subdirectory mobile
 	use test || cmake_comment_add_subdirectory conf/autotests
 }
@@ -92,7 +97,7 @@ src_configure() {
 		$(cmake-utils_use_find_package tiff TIFF)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_test() {
@@ -102,5 +107,5 @@ src_test() {
 		-E "(mainshelltest|chmgeneratortest|parttest)"
 	)
 
-	kde5_src_test
+	ecm_src_test
 }