From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jun 2020 17:50:24 +0100 Subject: gentoo resync : 21.06.2020 --- kde-apps/okular/Manifest | 4 +- kde-apps/okular/okular-20.04.1.ebuild | 112 --------------------------------- kde-apps/okular/okular-20.04.2.ebuild | 115 ++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 114 deletions(-) delete mode 100644 kde-apps/okular/okular-20.04.1.ebuild create mode 100644 kde-apps/okular/okular-20.04.2.ebuild (limited to 'kde-apps/okular') diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest index c866ca66d68b..b34169447626 100644 --- a/kde-apps/okular/Manifest +++ b/kde-apps/okular/Manifest @@ -3,7 +3,7 @@ AUX okular-18.12.0-tests.patch 568 BLAKE2B ad0a70fb37b513df846b0831d2335917817e1 AUX okular-19.12.3-CVE-2020-9359.patch 902 BLAKE2B 644004775b9a66637ed75697524c6f0b2a8077fae7cfcf36a063b46e2f921946c285319740e6debef25b2ea93c18ad5dc8c9b739b8950af305416416517849b5 SHA512 2d8870f1aa63defcf2ecfd42c0dfb0d474af6885c2448566704795d7caa2e9c20e5ede284db58139ea5736d5d0074d23c023a89f359d09fd6051d1f03f561903 AUX okular-20.03.70-tests.patch 6613 BLAKE2B 46bbb80b1b97bc92ed0c17ae352a977710d7234eb85c647356d9593a138f6c872960511c7f8d8eb24e060b2ffecb0cc5b1bf79ed198ba10e43fb341c1cdc6e5a SHA512 c1a283888b612950eda1080d941f157651b8e52c4032b5fc46786ab45045c5e8d272769516a90cf652a384519b2fe046ec951dc45c4edfb5258c50112b8d2ed2 DIST okular-19.12.3.tar.xz 7208888 BLAKE2B c98e6708d5784ce2dc976de0b205681cc34c0a6b5684e408267da05ba335fa4e9c064eec393dc080dd97f06f38ef665aba9354787d2e42d13312b4820836f168 SHA512 ccc3c357fefe04691bba7bc803321789c3a1fdad4cfc610e9c425b2373efd94340fa2ceb2e357569ad14f1c0c69ef0db8079d9bc082a6d5708ccbfb3b65d8b3d -DIST okular-20.04.1.tar.xz 7236580 BLAKE2B 520c2cff45525499cfc5c271d7d388069d4b563b2a444e3c914b108284fb76cee88e6896b67907ce4bf415b1ebb38a3a42d916217ab27188fe0d46ba12c26174 SHA512 c2414c16d938d06b9bf78956741a3b1f97dab1930a47ba1c822909062e0efc6c5e2faf841d045552d455dc20b2e200213906ff8a5fa888d09c881846a55316bc +DIST okular-20.04.2.tar.xz 7237876 BLAKE2B 8b8570257d8b9548666a877b21589e9e899e2b1e99197f1dbecc53c7f3e5187331463e4c80e167a0be2f33a4b43ca241c81b1ebdfe8826a0d281a151e92ba155 SHA512 1f6f22a221701d25a0e0eef094cb60b8b66722ac158c0ac499010448504b507c72fedd33814b3920ba3ab5eb53a2c8b09505b7a7697bde589d89407e0cdbf961 EBUILD okular-19.12.3-r1.ebuild 3205 BLAKE2B c000e95e21e6637b94a9afab498a98b27b6e9ca25f53b2e59a6d1fb5763dbd29ea3beeb1daf6d1991bb6ac15b49af7fca1c0535847795d8503c00636315d682c SHA512 90eecfadef6170fe4d0ef1a9ea4c86cf43de8d693cf48568ee7ac5b60d05f4402bbf61b48d497d167a3beb3100214754149d1ebf571ce8d33b983c586149de3f -EBUILD okular-20.04.1.ebuild 3156 BLAKE2B b27cfd1e05493a8cd7dcc5abb8556bf4762403f9b74702580ed2aba5c3e54d8986393e8a9efdd8c6112a0edb9e3a4083f4f03d7e908929d545f4fb33d4cd7e48 SHA512 01b55afb75dfd0d677c6b5231e027e64e4c82d9f2ea67c42b100be8cf724fd79ab7fa47681a46535e84371fe7aba36eec2ce1675d301e1030c8e4687a973a1dd +EBUILD okular-20.04.2.ebuild 3213 BLAKE2B bd711148d95911c4994ecd169da06754954518ca2d615445f9162ecd59851993dc8b2d76c6a4b4fdb1c395713c75e5b46d95e923ef3e096b55c7383e9c2b9e1f SHA512 c00b351bcf339102c9425189aeed3105e49ca0f3f90865adeba62e70d818ab79d4cb21c4ddb5ed4ae025c0ae237f5fa16a6a577f837ce04688a1870e8ce9bf22 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e diff --git a/kde-apps/okular/okular-20.04.1.ebuild b/kde-apps/okular/okular-20.04.1.ebuild deleted file mode 100644 index c416508ff9ed..000000000000 --- a/kde-apps/okular/okular-20.04.1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2020 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.70.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 ~ppc64 ~x86" -IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff" - -DEPEND=" - >=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 - >=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 - media-libs/freetype - media-libs/phonon[qt5(+)] - sys-libs/zlib - chm? ( - dev-libs/chmlib - >=kde-frameworks/khtml-${KFMIN}:5 - ) - crypt? ( app-crypt/qca:2[qt5(+)] ) - djvu? ( app-text/djvu ) - epub? ( app-text/ebook-tools ) - image-backend? ( - >=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png] - >=kde-apps/libkexiv2-${PVCUT}:5 - ) - 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? ( - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-18.12.0-tests.patch" - "${FILESDIR}/${PN}-20.03.70-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 -} diff --git a/kde-apps/okular/okular-20.04.2.ebuild b/kde-apps/okular/okular-20.04.2.ebuild new file mode 100644 index 000000000000..da77b2e33e87 --- /dev/null +++ b/kde-apps/okular/okular-20.04.2.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2020 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.70.0 +QTMIN=5.14.1 +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 ~ppc64 ~x86" +IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff" + +DEPEND=" + >=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 + >=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 + media-libs/freetype + media-libs/phonon[qt5(+)] + sys-libs/zlib + chm? ( + dev-libs/chmlib + >=kde-frameworks/khtml-${KFMIN}:5 + ) + crypt? ( app-crypt/qca:2[qt5(+)] ) + djvu? ( app-text/djvu ) + epub? ( app-text/ebook-tools ) + image-backend? ( + >=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png] + >=kde-apps/libkexiv2-${PVCUT}:5 + ) + 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? ( + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + ) +" + +# tests require existing installation +RESTRICT+=" test" + +PATCHES=( + "${FILESDIR}/${PN}-18.12.0-tests.patch" + "${FILESDIR}/${PN}-20.03.70-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 +} -- cgit v1.2.3