gentoo resync : 18.08.2019

4 files changed, 39 insertions, 21 deletions

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index c4f748734caa..ed87a8094d00 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,4 +1,5 @@
 AUX calligra-3.1.0-doc.patch 323 BLAKE2B 56a886a5b4a4f371eebe3c4f72d5a4817b2fa19af29e55ee0af1f84751a84ec28df8794b8cb7ceb026c701843356ef83d0310dfc2454815d09c95edbb93a0c08 SHA512 6254828157896b44ba77ae36f99876a2806dd917e65a36fdf25ee75e1a6683678ef1dd4275d6712d4f25f808d53dcb20bc3787bb4217e77054e9797bf0ccef72
+AUX calligra-3.1.0-missing-header.patch 663 BLAKE2B 5c1a224f26ef3aaade9e00f30fd59d79fc45def89f3bc14a21e8c315415f05dd327184756bdc99c89bbcfdacdb0eb6276e782efb1add7d956c91d0cb05100b87 SHA512 bc2a196e75b943df71e3e0eeeebea964d3738380b629b37fba116be70435116193717f1a313c411ae520c29fdf8ae58a08d57a5960a3ec3e867455aad48f067e
 AUX calligra-3.1.0-no-arch-detection.patch 436 BLAKE2B 117544b6089912f34b3c4cb3ee7837fb4f4377cdc0edc8a6de91156fb99ce010bc857752cf683f7f57ca604dd6393b36eeb807a6007e59bf589e404d02d0cef1 SHA512 f8f747279eabb165da68fe83300223a2bd49a530116c04c9a31de2a32f9f2b3eb46f7866ce194c91d9fcb0ab77fde628574dc9a55e6a08c327e2716849a0da8d
 AUX calligra-3.1.0-no-webkit.patch 2587 BLAKE2B 9c5de12f3fe100060ec89eec8190ac2d5e97cc0e3f6e97e8b5e6f9c6c46f80e49b1e85e052dc16831aaf0a2b70abd9ecb4fa787bcefdeb2685c72dc59f2ea0ef SHA512 582d5e532ab237ee3f4bb87b12e47272d27f8c57448056a8900df7a76b38e8831dd2d352e0d4a3eb6bd1d651c5a34a7714a307c32ed218ce225ac17723615479
 AUX calligra-3.1.0-poppler-0.69.patch 2963 BLAKE2B 8fac1f298d414ac52073dfdb645d00eab1f2c71f876eea08feb8d9057f33b3ff5dbf69abe10984aa15717ef505522b07153341e846ace24a5f80f175dfed4600 SHA512 b408f1333af40c7270a2f14fa5f9069ec16baeceac7e2b91be2e9759d095d6df92a16b33e0b7c6897dbb15f01ae789436f8864cd1dd38ff009c1a77501e32083
@@ -8,5 +9,5 @@ AUX calligra-3.1.0-poppler-0.73.patch 1342 BLAKE2B e36495c1f1f6c546666f30473fea4
 AUX calligra-3.1.0-qt-5.11.patch 3537 BLAKE2B 25aa9f832eb49876e0ee28d3af945658f9e93610fa894cb73dc274083febf5d62c97de427c10277f07aa7ef8054f4e0c811c70d4b0c4068cd018a3475c9a7e80 SHA512 f895ee2b9999ab4ff6dae523e4f4ea6f72bd05a8f8163a33f05401b63c08cc3c987a1207d1008ae808db0564c0036194e3d6ab5806c681b793c5191f9e585a7e
 AUX calligra-3.1.0-stage-qt-5.11.patch 656 BLAKE2B 1a4d8f005fd03395617ba0b225302e40b4aaf75c2a838a3009a3b3b6df7e75afdc798f27f08e76b7ad0ea60766612912d06eebe87c209ad9cab45db4bb3ccf54 SHA512 685bfca658404dc9920c805b97832b0a481a0ec0614bf142978c4ae03329e5e93b28d5af09d021b53c6d7a1316404f87612ab316f6a47c3f174572b50c65989b
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
-EBUILD calligra-3.1.0-r3.ebuild 5903 BLAKE2B 6e8185c7fe26dfab200fd34be8fe59b1a443c485ab4275739d601463c5a7b492c5c6b8ae7c70c5c1c4d4b17a8debe9a8aa0ea0285ac4c4559a810bb4f514f8c1 SHA512 ef19a01ec7be39e7254ba3e117c5c8724aa6e2570ab9a1a64f02c5b0965fc2c9c5fa436d3ccdd9196fca6a25fa5467ae7cd28a52511ce9884b7f27d13f445062
-MISC metadata.xml 1223 BLAKE2B a488977274cd14e919409e0443ebadeefaabdc33a514e806fa2fb1bb3cd0b26fef95c705fcba1bbf7f9d259a7e50f2769a89cf42863c53996fda5cc60712487f SHA512 c965d2effceb77a5cc8696010f538046a703576671368def2c2990b70c00f43105d5a3bf9f438dab1220b2e20003d49596e4adc4b1c90146a13549daacc8bf89
+EBUILD calligra-3.1.0-r4.ebuild 5688 BLAKE2B c830d02ecb9e40bb39b2badceb0f0cae7b2c1c4337e7d3d7369b7bddd5c14ddc3ed9372b518c82f2d9977a2df432799a2dbce8b9309389bb9db75b09326a17b2 SHA512 1f30b8b1baeb3c3d63d116e8d7a9813f2b8a0fd7654421f9ee79915499e72c952ac78c0703b126df75a581cef482df843ca04678a8f66fc779a9866817158b65
+MISC metadata.xml 1149 BLAKE2B e5461ec7fe1747ce0f4f1b68e3573bcad14183e9a6522f4e2a47fc14cb2a2c968f1bee6d6bf91304d23b981df8c2bdf086222f823ccc6abbe44ff3fcd630ceb0 SHA512 2c6b8ac3f48fa278faf079cfc42b6bdc8ecba994222adfe735489088e1fbb26c60f5f6ef4ff773a64e9a6e5026ef4dff368ec3c2c3c96cd6b0a38b6711b2d7a9
diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r4.ebuild
index 81597b0d7d19..37e03558459c 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CHECKREQS_DISK_BUILD="4G"
 KDE_DOC_DIR="xxx" # contains no language subdirs
@@ -18,11 +18,14 @@ KEYWORDS="amd64 x86"
 
 CAL_FTS=( karbon sheets stage words )
 
-IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
-	phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr
+	+pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
 
 # TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
 # Required for the matlab/octave formula tool
+BDEPEND="
+	sys-devel/gettext
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcmutils)
@@ -65,7 +68,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	virtual/libiconv
 	activities? ( $(add_frameworks_dep kactivities) )
-	charts? ( dev-libs/kreport )
+	charts? ( dev-libs/kdiagram:5 )
 	crypt? ( app-crypt/qca:2[qt5(+)] )
 	fontconfig? ( media-libs/fontconfig )
 	gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
@@ -85,9 +88,8 @@ COMMON_DEPEND="
 		media-libs/lcms:2
 	)
 	openexr? ( media-libs/openexr )
-	pdf? ( >=app-text/poppler-0.64:=[qt5] )
+	pdf? ( >=app-text/poppler-0.73:=[qt5] )
 	phonon? ( media-libs/phonon[qt5(+)] )
-	pim? ( $(add_kdeapps_dep kcalcore) )
 	spacenav? ( dev-libs/libspnav )
 	truetype? ( media-libs/freetype:2 )
 	X? (
@@ -103,7 +105,6 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
-	sys-devel/gettext
 	test? ( $(add_frameworks_dep threadweaver) )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -116,11 +117,10 @@ RESTRICT+=" test"
 PATCHES=(
 	"${FILESDIR}"/${P}-no-arch-detection.patch
 	"${FILESDIR}"/${P}-doc.patch
-	"${FILESDIR}"/${P}-qt-5.11.patch
-	"${FILESDIR}"/${P}-stage-qt-5.11.patch
-	"${FILESDIR}"/${P}-poppler-0.69.patch
-	"${FILESDIR}"/${P}-poppler-0.71.patch
+	"${FILESDIR}"/${P}-{,stage-}qt-5.11.patch
+	"${FILESDIR}"/${P}-poppler-0.{69,71,72,73}.patch
 	"${FILESDIR}"/${P}-no-webkit.patch
+	"${FILESDIR}"/${P}-missing-header.patch
 )
 
 pkg_pretend() {
@@ -135,11 +135,6 @@ pkg_setup() {
 src_prepare() {
 	kde5_src_prepare
 
-	if has_version ">=app-text/poppler-0.72"; then
-		eapply "${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable
-		eapply "${FILESDIR}"/${P}-poppler-0.73.patch
-	fi
-
 	if ! use test; then
 		sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
 			-i libs/pigment/CMakeLists.txt || die
@@ -192,7 +187,7 @@ src_configure() {
 		-DWITH_LibWpg=$(usex import-filter)
 		-DWITH_LibWps=$(usex import-filter)
 		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package pim KF5CalendarCore)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
 		-DWITH_LCMS2=$(usex lcms)
 		-DWITH_Okular5=$(usex okular)
 		-DWITH_OpenEXR=$(usex openexr)
diff --git a/app-office/calligra/files/calligra-3.1.0-missing-header.patch b/app-office/calligra/files/calligra-3.1.0-missing-header.patch
new file mode 100644
index 000000000000..f15c3787172d
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-missing-header.patch
@@ -0,0 +1,23 @@
+From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 23 Jul 2019 13:02:34 +0200
+Subject: Fix compilation with Qt 5.13 (missing include)
+
+---
+ sheets/plugins/calendar/CalendarToolWidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp
+index b10b230..0c5eeb6 100644
+--- a/sheets/plugins/calendar/CalendarToolWidget.cpp
++++ b/sheets/plugins/calendar/CalendarToolWidget.cpp
+@@ -30,6 +30,7 @@
+ #include <kdatepicker.h>
+ 
+ #include <QPushButton>
++#include <QDate>
+ 
+ namespace Calligra
+ {
+-- 
+cgit v1.1
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index d5fb30da6eb0..f31dd00ff91a 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -11,13 +11,12 @@
 	</maintainer>
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
-		<flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kreport</pkg></flag>
+		<flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kdiagram</pkg></flag>
 		<flag name="gemini">Enable tablet and 2:1 devices support</flag>
 		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
 		<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>
 		<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag>
 		<flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag>
-		<flag name="pim">Enable support for KDE PIM resources integration</flag>
 		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
 	</use>
 </pkgmetadata>