gentoo resync : 22.01.2019

3 files changed, 29 insertions, 3 deletions

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index e8a9099303f8..ba2f34bfcbcf 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,9 +1,10 @@
 AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
+AUX scribus-1.5.5_pre20190113-poppler-0.73.patch 935 BLAKE2B c4f7e44a3d4a5a4fc2ab34aa164516757f8a76081a7644b100af0f104b4697ea4578495e06fcf74fc9b62226b28ce9b7b08aea29b1bce67b70a3e169c7be7149 SHA512 890868cacc52337e3593a35d80cc9958d7d039275c5f1c21694b22c738d7707893b49db43acf49672d8259a60809c2987fca415f4d0802f115d7c8d3a8dd0623
 DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
 DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403
-DIST scribus-1.5.5_pre20181227.tar.gz 84926534 BLAKE2B 1fa392a8a196aac028ad4f1b913f31c5655a191d5ff3db26f16b4b181885bb1035ca95d11b100ad1b6cc7aea0ea21677a211c83dbd94bfe730a94ed4feaaf6bc SHA512 53a9494dca4520ec89b4b4487c09683da00876088ed2750fd80bca6cbc96536c0bcfb8c96d671d9ca0ed0b74cbd8f75382298e3d20285d52cec52951807f4797
+DIST scribus-1.5.5_pre20190113.tar.gz 84927002 BLAKE2B ff515bbd66267493e4558fa2cbdca57fb3e9514940c3c7cc48e435e5d78349674f57bdbeeeb0574c7e7e2d1a2d2482a5b16ccc48c62281f2d11c28a5cc38f915 SHA512 1ed9bd3add1a62234b8e26f10a31a015f3a224da588b7b72c854209a45faae61ee949d2986980700132f9d573a426c1283f4e375c25d7ea63ce6b04260a863bb
 EBUILD scribus-1.5.4-r1.ebuild 7187 BLAKE2B 477cbf6e32b2b05eb2a66429fc80dbee31733bb80b035b8b52a0c830415ccf75648ecaf5b9f3e1c002aa6f2414cef2f83e8d5bd0711172ab8d0ba683aa83ee02 SHA512 be389ba247a5e4ebc583314c13b612bd7e7ff5496683cc373b35df84bf2fc38441435db5bcdbf6ca986291d1aa99eca80eb01f7ef324c27d5ba1e5e6c89e4b21
-EBUILD scribus-1.5.5_pre20181227.ebuild 6942 BLAKE2B 7d57349a4f0c3f481d9459e42059da7b33111ad0560bd35bd8a3808c7081f928e8c802a4911abf9e49759ad133e776bcb65183e626ef08f0700eb07102835d1f SHA512 fd3bab874a55fbdebfdcb2dc3b4d6498bd0a485d71d403114dc6fa16f9034a94f05ac18e7a48294cba45091a11f44710f8c1dc87dc7c39843be5780bbd5f578d
+EBUILD scribus-1.5.5_pre20190113.ebuild 6981 BLAKE2B 5b20df2d8e09b219655aad963f06ab9020ec18e69a62c6dca864e956be0d7748747329994933a4818d9b760a6f4a5c365cda6ff706de28a565888c25d95041a1 SHA512 a7085ccff2f5ae9893434831a1bd0202a51c87bac57ccfc3702e03a6d78b76af9185f180640cf233d85af1171976db67e91c361839088c18413fd89fec2d6231
 EBUILD scribus-9999.ebuild 6870 BLAKE2B 1fb6ae7e846178429e4c4380d7d8d50addf2eb9e9eda75caa23448eb31e3dd65d5eed2382a11274bad92949b43d063a24446f119b2a38098a8788dc99878dd37 SHA512 904507847c4fbce1f80748ad754685df086b27cb3f28c62aaceb4ede07bc16a6011c9508c22a798dda57a9f6aa0a3f59ee5c611d5a640f8e1ad43ee24217c7d6
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch
new file mode 100644
index 000000000000..f63f4c6d1eed
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch
@@ -0,0 +1,24 @@
+From d34e59bfe495250ba023ba0f99e672ee32300a27 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Wed, 16 Jan 2019 00:30:35 +0000
+Subject: [PATCH] #15537: changes in poppler 0.73.0 cause build failure
+
+git-svn-id: svn://scribus.net/trunk/Scribus@22806 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
+index c46448b80a..4dac7c3983 100644
+--- a/scribus/plugins/import/pdf/slaoutput.h
++++ b/scribus/plugins/import/pdf/slaoutput.h
+@@ -28,7 +28,9 @@ for which a new license (GPL+exception) is in place.
+ #include "selection.h"

+ #include "vgradient.h"

+ 

++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0)

+ #include <poppler/goo/gtypes.h>

++#endif

+ #include <poppler/Object.h>

+ #include <poppler/OutputDev.h>

+ #include <poppler/Gfx.h>

diff --git a/app-office/scribus/scribus-1.5.5_pre20181227.ebuild b/app-office/scribus/scribus-1.5.5_pre20190113.ebuild
index b92edd436ae8..77540ffb19bb 100644
--- a/app-office/scribus/scribus-1.5.5_pre20181227.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190113.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
-COMMIT=d857c1a3430acf207cdde2512db6822c45e98732
+COMMIT=6326f2af85935842fa7a93eb8f86bd2ae698245e
 inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
@@ -94,6 +94,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.3-docdir.patch
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+	"${FILESDIR}"/${P}-poppler-0.73.patch
 )
 
 S="${WORKDIR}"/${PN}-${COMMIT}