gentoo resync : 15.12.2019

4 files changed, 116 insertions, 110 deletions

diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 50cef98db0f8..ac8b691a51d0 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.3.tar.xz 7068828 BLAKE2B 8805936e7be73d3eb937fed0fe77d535c0d40fe839c9923466cada7f8cbf0f37253348d608d52eaaa7780c22db5f792ccb9bbbc474d35663e58b5b542b40fd13 SHA512 2fffce8023d9b0d08ec03cc51d21827772ed07c3004fcf8a23589211e7f676b61253dc39c8a41da5d9c4764ac9895c1a0e16c72c7157213b2e79ccaf35db77fa
-EBUILD okular-19.04.3.ebuild 2965 BLAKE2B 246b458a5537e0a8af2bb500639beb124d3897bbcc4c155569c0ed5fd71058ca3ae5b96ac336a9829d716dec7957c9baf9315a7ac1e5da7b1293e5b0d9abfe56 SHA512 b91e2322f0061fc9b81bb16ed9ea799fff31fa739a09ed1f3eb00e5d3a4969ef490cdf7ce7d9480227d44d112031c53e5ff8b6cc52e11387586ba25d0405b1ec
-EBUILD okular-19.08.3.ebuild 3219 BLAKE2B 0f0fca5aec8320a5ed8da49e57141ab5138568a7de764ad9f3d31309042a3b3a419b3b35317003422e7c49f97c6980ee775d0c493dc007ae05483866d6994657 SHA512 e4cd8e74d0412ecf6bad50875f9f04cf4d72c09f311de6bd4b0042a5a2ee162a3a44f12f5bc10c24023541c155b1fcacca652cf23877a1ba22a15319ea3f39f6
+DIST okular-19.12.0.tar.xz 7200656 BLAKE2B eea7be1e36a699de689bdb7bd0c4c96ac417a10cee129dd6d306105c5b2b0c857a5f6a070b833ecb08dd29ad0d0c52aef4167b045cbe57e1e3cd9b49ebd0dd6b SHA512 93fb134f18b00ce84e9b2ce84974562a5d22f956b459e540750d0c67a980f66383ec13fa8f3bb52f196ce7fabe468de4fe63b0fa6678df840d2defb0e22fc30b
+EBUILD okular-19.08.3.ebuild 3216 BLAKE2B d4d3b278dad01cfc4a074b8ef51fbc2326b7665aca2c8b2d1fb8c4e12be7cdfedc6d14869a430cae097f268868cb37e7f6a6c44e51b9ee8384bba404e7100182 SHA512 ba8b5cfdd1e1f60718b4c5d55558ef9a208d6923cd461088a0c1d38843f8e9949f6cd5194935305b9b5daea9bb633ee096e5149b4d369e9cd375e2bfc97e7f61
+EBUILD okular-19.12.0.ebuild 3148 BLAKE2B 48e395ca46f78be8fc757afdd18b98cb7074759ddfa0372812f277a63316bf37e39d2d85b0ca62cf48a1f8f22781a46e6e44cbc68c388939962176c65d12cb6f SHA512 7013f7f9ddcc45e309e36a7c4b35bf8713703ea71b695c37ac520a413b47b721f0dcb27906da57bdc02f08b2b6c2c4034cb8442c3ba97abb86e39d04cf03700d
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
diff --git a/kde-apps/okular/okular-19.04.3.ebuild b/kde-apps/okular/okular-19.04.3.ebuild
deleted file mode 100644
index 5fdb05b96215..000000000000
--- a/kde-apps/okular/okular-19.04.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Universal document viewer based on KDE Frameworks"
-HOMEPAGE="https://okular.kde.org https://kde.org/applications/graphics/okular"
-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)
-	media-libs/freetype
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	chm? (
-		$(add_frameworks_dep khtml)
-		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')
-	)
-	markdown? ( app-text/discount )
-	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-	pdf? ( app-text/poppler[qt5] )
-	plucker? ( virtual/jpeg:0 )
-	postscript? ( app-text/libspectre )
-	share? ( $(add_frameworks_dep purpose) )
-	speech? ( $(add_qt_dep qtspeech) )
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	image-backend? ( $(add_frameworks_dep kimageformats) )
-	mobile? (
-		$(add_frameworks_dep kirigami)
-		$(add_qt_dep qtquickcontrols)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-18.08.0-tests.patch"
-	"${FILESDIR}/${PN}-18.12.0-tests.patch"
-)
-
-src_prepare() {
-	kde5_src_prepare
-	use mobile || cmake_comment_add_subdirectory mobile
-	use test || cmake_comment_add_subdirectory conf/autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package chm CHM)
-		$(cmake-utils_use_find_package crypt Qca-qt5)
-		$(cmake-utils_use_find_package djvu DjVuLibre)
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package image-backend KF5KExiv2)
-		$(cmake-utils_use_find_package markdown Discount)
-		$(cmake-utils_use_find_package mobi QMobipocket)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package plucker JPEG)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tiff TIFF)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	# parttest hangs, bug #641728
-	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/okular/okular-19.08.3.ebuild b/kde-apps/okular/okular-19.08.3.ebuild
index 458f2be94e27..8856309f0299 100644
--- a/kde-apps/okular/okular-19.08.3.ebuild
+++ b/kde-apps/okular/okular-19.08.3.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
 
 DEPEND="
diff --git a/kde-apps/okular/okular-19.12.0.ebuild b/kde-apps/okular/okular-19.12.0.ebuild
new file mode 100644
index 000000000000..c4bf77aa9c46
--- /dev/null
+++ b/kde-apps/okular/okular-19.12.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
+HOMEPAGE="https://okular.kde.org https://kde.org/applications/office/org.kde.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="
+	>=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? (
+		>=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? (
+		>=kde-apps/libkexiv2-${PVCUT}:5
+		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
+	)
+	markdown? ( app-text/discount )
+	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
+	pdf? ( app-text/poppler[qt5] )
+	plucker? ( virtual/jpeg:0 )
+	postscript? ( app-text/libspectre )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
+	mobile? (
+		>=kde-frameworks/kirigami-${KFMIN}:5
+		>=dev-qt/qtquickcontrols-${QTMIN}:5
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-18.08.0-tests.patch"
+	"${FILESDIR}/${PN}-18.12.0-tests.patch"
+)
+
+src_prepare() {
+	ecm_src_prepare
+	use mobile || cmake_comment_add_subdirectory mobile
+	use test || cmake_comment_add_subdirectory conf/autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package chm CHM)
+		$(cmake_use_find_package crypt Qca-qt5)
+		$(cmake_use_find_package djvu DjVuLibre)
+		$(cmake_use_find_package epub EPub)
+		$(cmake_use_find_package image-backend KF5KExiv2)
+		$(cmake_use_find_package markdown Discount)
+		$(cmake_use_find_package mobi QMobipocket)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package plucker JPEG)
+		$(cmake_use_find_package postscript LibSpectre)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package tiff TIFF)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# mainshelltest hangs, chmgeneratortest fails, bug #603116
+	# parttest hangs, bug #641728
+	local myctestargs=(
+		-E "(mainshelltest|chmgeneratortest|parttest)"
+	)
+
+	ecm_src_test
+}