gentoo resync : 25.08.2020

11 files changed, 5 insertions, 985 deletions

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index d676b659a569..c5f0f953f3c2 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,17 +1,8 @@
 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
-AUX scribus-1.5.5-docdir.patch 1053 BLAKE2B 3efadd63156463cd0d955b8de072082a3d958849e1c2107eb9bf16260048ad5e9f162162a4f148025fcad091dd44a1f291a6ae708f17014205791e5fcc24b613 SHA512 cae03652fcf541bdce1c89f60e7ba7e2cd14ad3846bbaa7c832e97ee7617188310f51e72c5e88947b51892b61c174f18db35785cf5631b436fc63d35056e2bf1
 AUX scribus-1.5.5-findhyphen-1.patch 1118 BLAKE2B c542a292601b43f12ee2b682225064bd650f2017466aed4aa3a256610dfe1aaa662857cf60682b3c8f1a0dd1b22b34b8c058967bc4879412e8599a641e254b18 SHA512 d536cce91eb161e2d8ead619f932111bcfe661bae9e0706567a0a789ef80eef28e6f81c357bd7bdaaeb97f8c6a872deb7147fea7fef84e279b7e8e812a821cef
-AUX scribus-1.5.5-findhyphen-2.patch 567 BLAKE2B c0aac324b9dc2238d5fd4ae857bcd2a704d10a936a6c152d83c824b0cd4979126f0c1e234e18430ed7894a06a0f000f851b462f8c8bd677f34695773b33f1b55 SHA512 bbcd503a33434625a4eb4f5661cec88aca88f64b078085872ba193ed1651e015a81bf7c0f2fa89588bce2247d286488bcdeacc9cad8e473bee08faa39a9df0e5
-AUX scribus-1.5.5-poppler-0.82.patch 5228 BLAKE2B 4d3dac11d77a41bca4ace028a249acacd07d4595dbd1611b15ad697fd6da5848cea880cb5edbc4411ed512bc3414261129b95984510750bdd5c1066185833d78 SHA512 8621876aa7ba5d91f48e2d4b1c9d865b2179e4029fdf1b122defa619454690328cc30d03963aad0865fe6dff480285fb21ba44c82d57d81f5b7ce1d687c34cc4
-AUX scribus-1.5.5-poppler-0.83.patch 5538 BLAKE2B 0d4b14e157f47dc6f0811918a2423f726c7a7019f75e99fc98744ece42b9516e15612879d16705d585c56d7ccd15ed7f0381787915958bd104076c527552e971 SHA512 1866f9f7c0ba51cb2030ab3fc0905dc49ba905f8400adbcdcc0395c46196b042fce07d67aab70f5d3847c1c2e5a74468375c20e90b222d9e27141a1ce85fb01c
-AUX scribus-1.5.5-poppler-0.84.patch 1359 BLAKE2B 7c0b3998fce5149a0b3d2e8d9f01ef66b2bd13d909d029f7970e264fa0d5fcc9e9beb16ecb77b858ff8ce237fb2d3ad8b7affa2d57b1d2719437869fc8bfafda SHA512 f593d62d3c7002e536f5d24c29ec7b54a6fb7f82ffb3c9363fc4816a27487a4c6929f174cb8808920d91ea2a57e181a9579b1d4182676a7e329775c1581143b6
-AUX scribus-1.5.5-poppler-0.86.patch 14366 BLAKE2B 868382aa0bce211465ebe26a704b784fe44fe67bc39bdc62532a3e1ae29766cb077d1b3cba9c9f5aeebe2cdbfdcbd1d7b37e33ef747cd212e6dec10cbe250b77 SHA512 5aef27942d02097e2b67c8249188e885086046399edcbf41018fe7480c5d1b6705609326a0823d7aec9c5b20fc8dfb16cc6435118792952a5e141bd434550583
-AUX scribus-1.5.5-qt-5.15.patch 695 BLAKE2B 040f9736e94bf5137c5e4f049095186c9383ee49619015d62b4799501702117884315c05f838345158b7b9878bc4349115bec4d4ea47634a3eecc3b3011c5c36 SHA512 a614838aa44ace29fddc359fa4b9bf7e5955aafe2efc248646e2e72eea0ba73f77794783397c2e1b4a92e9687cc562e721c3b462b180d308124a3d9b94520574
 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
-DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50
 DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
-EBUILD scribus-1.5.5-r1.ebuild 4437 BLAKE2B bbdc4aca01970266c1f266609e4b7a43c760bcab70b05455f70e274a388d1e017330f387f1219b57f354a96f2c1493c4c6b41027d374f45f316c00ea277bf51b SHA512 d522010993b6805df278f55c62b876286d9cc700b46bbb3e1345a4a0cba23e0864c06f395f8c78a95731b2f7fc7c01df1ac0d613d6977b2864210b62c5805d95
-EBUILD scribus-1.5.5_p20200626.ebuild 4082 BLAKE2B 50a7feb8b12cf20ad57182dde2119cc22b1eab12bf3cde70a1288baa9acbc7ecf428736843d60663f409caba87b749656547eff738f03ee235a4ef14c8421eb6 SHA512 24f5d2dae11f2691aa054ccc4af537a06af4617e8b4852a3cd1d5a4761139b3427ed58d73d306ca129fb3a7884f1c1b2186c069a8916a51276b32b43c12a007c
+EBUILD scribus-1.5.5_p20200626.ebuild 4078 BLAKE2B 28b48945c2f0cfbe409a1b390c42eeaed0db28a0592284c67c62855c11f52415ded2b0eeb2f65d359c6af6535ebc74928d7786a4abcde191ffdeb02b5870b661 SHA512 ff283fe98f0ce8929a7456316ced12d97d0e8df373af0fde09e49af37ccf5f29a0569ceb65ef21a03ea3444ccaa4c65d33d3753a5ba6390fa1f6f87d47ce273a
 EBUILD scribus-9999.ebuild 3986 BLAKE2B f856409e29e5d57bb527f463ddada1e7461f48d16c872fec92328e781ef5a9e130b1c8fc0d06ffac59262ad28f22f7a9fb4cd387b96c0172b4cf6eeed72b205b SHA512 31fa1efd6797d803f6e5db8703fe3d40f2978f87dc9229872f5313b01ebeb6febb98d4f15ebf5c5a9afaf60d4e7de90b80b0d48e91c7e55915e66a703dd6f186
-MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
+MISC metadata.xml 881 BLAKE2B 3cbd9331bb4a2a5c04529c21f9fbe08fc02ad12317b93867cc57e3b4a9d11ccd37f2842b63f6a609d093cf9f4e395a4ab412250d422c61f282339f4af78c33dd SHA512 571c8e45e1bd4cb783e635db4bf6e870dfc1efd593df275c61820ed9f9135659e5486d5c702d0f283323a8944390fe9f1b49b8929e92cd37b02a66b6b6a67ed9
diff --git a/app-office/scribus/files/scribus-1.5.5-docdir.patch b/app-office/scribus/files/scribus-1.5.5-docdir.patch
deleted file mode 100644
index 897a8a75ae95..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-docdir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f5b3e77..4c5fd3f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -313,14 +313,16 @@ else()
- endif()
- 
- #SHARE - use the default on Apple as TAG_VERSION is empty
--if(WIN32 OR OS2)
--	set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
--elseif(TAG_VERSION OR BUILD_OSX_BUNDLE)
--	set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
--elseif(NOT WANT_VERSIONING)
--	set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
--else()
--	set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
-+if(NOT DOCDIR)
-+	if(WIN32 OR OS2)
-+		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
-+	elseif(TAG_VERSION OR BUILD_OSX_BUNDLE)
-+		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-+	elseif(NOT WANT_VERSIONING)
-+		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
-+	else()
-+		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
-+	endif()
- endif()
- 
- if(IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE)
diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch b/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch
deleted file mode 100644
index a8993ca63874..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/CMakeLists.txt	2019-07-31 00:34:43.000000000 +0200
-+++ b/CMakeLists.txt	2019-10-02 00:17:34.968355656 +0200
-@@ -954,6 +954,16 @@
- endif()
- #>>HUNSPELL for Speelling support
- 
-+#<<HYPHEN for Hyphenation support
-+find_package(HYPHEN)
-+if(HYPHEN_FOUND)
-+	message("System Hyphen Found OK")
-+	set(HAVE_HYPHEN ON)
-+else()
-+	message("Hyphen or its developer libraries NOT found - using bundled Hyphen instead")
-+endif()
-+#>>HYPHEN for Hyphenation support
-+
- #<<PoDoFo for AI PDF import
- option(WITH_PODOFO "Enable support for PDF embedded in AI" ON)
- if (WITH_PODOFO)
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.82.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.82.patch
deleted file mode 100644
index f1eb1e887da0..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-poppler-0.82.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 615b6185c70c70928cab1aab6e1340ba5f80c174 Mon Sep 17 00:00:00 2001
-From: Craig Bradney <mrb@scribus.info>
-Date: Mon, 28 Oct 2019 22:11:56 +0000
-Subject: [PATCH] Work around poppler 0.82 signature changes
-
-git-svn-id: svn://scribus.net/trunk/Scribus@23287 11d20701-8431-0410-a711-e3c959e3b870
-
-Use same mechanism as with previous poppler versions to support change of constness in function signatures
-
-git-svn-id: svn://scribus.net/trunk/Scribus@23289 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/importpdfconfig.h | 6 ++++++
- scribus/plugins/import/pdf/slaoutput.cpp     | 6 +++---
- scribus/plugins/import/pdf/slaoutput.h       | 6 +++---
- 3 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h
-index 2a13b0d10..9913ee382 100644
---- a/scribus/plugins/import/pdf/importpdfconfig.h
-+++ b/scribus/plugins/import/pdf/importpdfconfig.h
-@@ -52,4 +52,10 @@ for which a new license (GPL+exception) is in place.
- #define POPPLER_REF

- #endif

- 

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 82, 0)

-+#define POPPLER_CONST_082 const

-+#else

-+#define POPPLER_CONST_082

-+#endif

-+

- #endif

-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 6094f3d9e..520474f65 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -2784,7 +2784,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,  i
- 	delete[] mbuffer;

- }

- 

--void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg)

-+void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, POPPLER_CONST_082 int* maskColors, GBool inlineImg)

- {

- 	ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());

- //	qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors;

-@@ -3365,7 +3365,7 @@ err1:
- 		fontsrc->unref();

- }

- 

--void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, Unicode *u, int uLen)

-+void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, POPPLER_CONST_082 Unicode *u, int uLen)

- {

- 	double x1, y1, x2, y2;

- 	int render;

-@@ -3452,7 +3452,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, doub
- 	}

- }

- 

--GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)

-+GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen)

- {

- //	qDebug() << "beginType3Char";

- 	GfxFont *gfxFont;

-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index bc4350a03..14a590d55 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -229,7 +229,7 @@ public:
- 

- 	//----- image drawing

- 	void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) override;

--	void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) override;

-+	void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, POPPLER_CONST_082 int *maskColors, GBool inlineImg) override;

- 	void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,

- 				   int width, int height,

- 				   GfxImageColorMap *colorMap,

-@@ -261,8 +261,8 @@ public:
- 	//----- text drawing

- 	void  beginTextObject(GfxState *state) override;

- 	void  endTextObject(GfxState *state) override;

--	void  drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) override;

--	GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/) override;

-+	void  drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, POPPLER_CONST_082 Unicode * /*u*/, int /*uLen*/) override;

-+	GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, POPPLER_CONST_082 Unicode * /*u*/, int /*uLen*/) override;

- 	void  endType3Char(GfxState * /*state*/) override;

- 	void  type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/) override;

- 	void  type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) override;

--- 
-2.23.0
-
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch
deleted file mode 100644
index 0d52486da924..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-Source/Upstream: Yes fixed in svn
-Reason: Fix build with poppler 0.83.0
-
-From b51c2bab4d57d685f96d427d6816bdd4ecfb4674 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Wed, 4 Dec 2019 05:51:19 +0000
-Subject: [PATCH] #15985: Fix failure to build against poppler 0.83.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@23395 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/importpdf.cpp     | 22 ++++++++++++++++++++
- scribus/plugins/import/pdf/importpdfconfig.h |  6 ++++++
- scribus/plugins/import/pdf/slaoutput.cpp     |  4 ++--
- scribus/plugins/import/pdf/slaoutput.h       |  2 +-
- 4 files changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
-index 2ab38ac758..427cd66ef2 100644
---- a/scribus/plugins/import/pdf/importpdf.cpp
-+++ b/scribus/plugins/import/pdf/importpdf.cpp
-@@ -74,7 +74,11 @@ PdfPlug::PdfPlug(ScribusDoc* doc, int flags)
- QImage PdfPlug::readThumbnail(const QString& fName)

- {

- 	QString pdfFile = QDir::toNativeSeparators(fName);

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)

-+	globalParams.reset(new GlobalParams());

-+#else

- 	globalParams = new GlobalParams();

-+#endif

- 	if (globalParams)

- 	{

- #if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0)

-@@ -89,7 +93,9 @@ QImage PdfPlug::readThumbnail(const QString& fName)
- 			if (pdfDoc->getErrorCode() == errEncrypted)

- 			{

- 				delete pdfDoc;

-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)

- 				delete globalParams;

-+#endif

- 				return QImage();

- 			}

- 			if (pdfDoc->isOk())

-@@ -133,11 +139,15 @@ QImage PdfPlug::readThumbnail(const QString& fName)
- 				image.setText("YSize", QString("%1").arg(h));

- 				delete dev;

- 				delete pdfDoc;

-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)

- 				delete globalParams;

-+#endif

- 				return image;

- 			}

- 			delete pdfDoc;

-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)

- 			delete globalParams;

-+#endif

- 		}

- 	}

- 	return QImage();

-@@ -343,7 +353,11 @@ bool PdfPlug::convert(const QString& fn)
- 		qApp->processEvents();

- 	}

- 

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)

-+	globalParams.reset(new GlobalParams());

-+#else

- 	globalParams = new GlobalParams();

-+#endif

- 	GooString *userPW = nullptr;

- 	if (globalParams)

- 	{

-@@ -385,7 +399,9 @@ bool PdfPlug::convert(const QString& fn)
- 					if (progressDialog)

- 						progressDialog->close();

- 					delete pdfDoc;

-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)

- 					delete globalParams;

-+#endif

- 					return false;

- 				}

- 				if (progressDialog)

-@@ -430,7 +446,9 @@ bool PdfPlug::convert(const QString& fn)
- 							progressDialog->close();

- 						delete optImp;

- 						delete pdfDoc;

-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)

- 						delete globalParams;

-+#endif

- 						return false;

- 					}

- 					pageString = optImp->getPagesString();

-@@ -843,8 +861,12 @@ bool PdfPlug::convert(const QString& fn)
- 		}

- 		delete pdfDoc;

- 	}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)

-+	globalParams.release();

-+#else

- 	delete globalParams;

- 	globalParams = nullptr;

-+#endif

- 

- //	qDebug() << "converting finished";

- //	qDebug() << "Imported" << Elements.count() << "Elements";

-diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h
-index 9913ee382c..5a7e0d2162 100644
---- a/scribus/plugins/import/pdf/importpdfconfig.h
-+++ b/scribus/plugins/import/pdf/importpdfconfig.h
-@@ -58,4 +58,10 @@ for which a new license (GPL+exception) is in place.
- #define POPPLER_CONST_082

- #endif

- 

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)

-+#define POPPLER_CONST_083 const

-+#else

-+#define POPPLER_CONST_083

-+#endif

-+

- #endif

-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 5e4d32a551..ffcfa8450b 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -3678,7 +3678,7 @@ QString SlaOutputDev::getAnnotationColor(const AnnotColor *color)
- 	return fNam;

- }

- 

--QString SlaOutputDev::convertPath(GfxPath *path)

-+QString SlaOutputDev::convertPath(POPPLER_CONST_083 GfxPath *path)

- {

- 	if (! path)

- 		return QString();

-@@ -3688,7 +3688,7 @@ QString SlaOutputDev::convertPath(GfxPath *path)
- 

- 	for (int i = 0; i < path->getNumSubpaths(); ++i)

- 	{

--		GfxSubpath * subpath = path->getSubpath(i);

-+		POPPLER_CONST_083 GfxSubpath * subpath = path->getSubpath(i);

- 		if (subpath->getNumPoints() > 0)

- 		{

- 			output += QString("M %1 %2").arg(subpath->getX(0)).arg(subpath->getY(0));

-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index 60fb900618..d928fada81 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -282,7 +282,7 @@ class SlaOutputDev : public OutputDev
- 	void getPenState(GfxState *state);

- 	QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade);

- 	QString getAnnotationColor(const AnnotColor *color);

--	QString convertPath(GfxPath *path);

-+	QString convertPath(POPPLER_CONST_083 GfxPath *path);

- 	int getBlendMode(GfxState *state);

- 	void applyMask(PageItem *ite);

- 	void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false);

diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch
deleted file mode 100644
index de1f39411e8e..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3742559924136c2471ab15081c5b600dd5feaeb0 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Sat, 28 Dec 2019 21:32:29 +0000
-Subject: [PATCH] Fix failure to build with poppler 0.84.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@23429 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index ffcfa8450b..d788f9f06c 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -1189,6 +1189,11 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA)
- 	catalog = catA;

- 	pdfDoc = doc;

- 	updateGUICounter = 0;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0)

-+	m_fontEngine = new SplashFontEngine(true, true, true, true);

-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0)

-+	m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), true, true, true);

-+#else

- 	m_fontEngine = new SplashFontEngine(

- #if HAVE_T1LIB_H

- 	globalParams->getEnableT1lib(),

-@@ -1199,6 +1204,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA)
- 	true,

- #endif

- 	true);

-+#endif

- }

- 

- void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *)

diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch
deleted file mode 100644
index e91bb3afdb6c..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch
+++ /dev/null
@@ -1,459 +0,0 @@
-From 67f8771aaff2f55d61b8246f420e762f4b526944 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Mon, 2 Mar 2020 14:45:59 +0000
-Subject: [PATCH] PDF import plugin: support poppler 0.86.x
-
-git-svn-id: svn://scribus.net/trunk/Scribus@23478 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/importpdf.cpp |  51 +++++++-
- scribus/plugins/import/pdf/importpdf.h   |  19 +--
- scribus/plugins/import/pdf/slaoutput.cpp | 154 +++++++++++++++++++++--
- scribus/plugins/import/pdf/slaoutput.h   |  13 +-
- 4 files changed, 215 insertions(+), 22 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
-index 427cd66ef2..4679674a4d 100644
---- a/scribus/plugins/import/pdf/importpdf.cpp
-+++ b/scribus/plugins/import/pdf/importpdf.cpp
-@@ -791,11 +791,20 @@ bool PdfPlug::convert(const QString& fn)
- 								names = catDict.dictLookup("OpenAction");

- 								if (names.isDict())

- 								{

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+									std::unique_ptr<LinkAction> linkAction;

-+									linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI());

-+#else

- 									LinkAction *linkAction = nullptr;

- 									linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI());

-+#endif

- 									if (linkAction)

- 									{

--										LinkJavaScript *jsa = (LinkJavaScript*)linkAction;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+										LinkJavaScript *jsa = (LinkJavaScript*) linkAction.get();

-+#else

-+										LinkJavaScript *jsa = (LinkJavaScript*) linkAction;

-+#endif

- 										if (jsa->isOk())

- 										{

- 											QString script = UnicodeParsedString(jsa->getScript());

-@@ -1003,3 +1012,43 @@ QString PdfPlug::UnicodeParsedString(POPPLER_CONST GooString *s1)
- 	}

- 	return result;

- }

-+

-+QString PdfPlug::UnicodeParsedString(const std::string& s1)

-+{

-+	if (s1.length() == 0)

-+		return QString();

-+	GBool isUnicode;

-+	int i;

-+	Unicode u;

-+	QString result;

-+	if ((s1.at(0) & 0xff) == 0xfe && (s1.length() > 1 && (s1.at(1) & 0xff) == 0xff))

-+	{

-+		isUnicode = gTrue;

-+		i = 2;

-+		result.reserve((s1.length() - 2) / 2);

-+	}

-+	else

-+	{

-+		isUnicode = gFalse;

-+		i = 0;

-+		result.reserve(s1.length());

-+	}

-+	while (i < s1.length())

-+	{

-+		if (isUnicode)

-+		{

-+			u = ((s1.at(i) & 0xff) << 8) | (s1.at(i+1) & 0xff);

-+			i += 2;

-+		}

-+		else

-+		{

-+			u = s1.at(i) & 0xff;

-+			++i;

-+		}

-+		// #15616: imagemagick may write unicode strings incorrectly in PDF

-+		if (u == 0)

-+			continue;

-+		result += QChar( u );

-+	}

-+	return result;

-+}

-diff --git a/scribus/plugins/import/pdf/importpdf.h b/scribus/plugins/import/pdf/importpdf.h
-index bb58fd208f..bc55819618 100644
---- a/scribus/plugins/import/pdf/importpdf.h
-+++ b/scribus/plugins/import/pdf/importpdf.h
-@@ -82,6 +84,7 @@ class PdfPlug : public QObject
- 	bool convert(const QString& fn);
- 	QRectF getCBox(int box, int pgNum);
- 	QString UnicodeParsedString(POPPLER_CONST GooString *s1);
-+	QString UnicodeParsedString(const std::string& s1);
- 	
- 	QList<PageItem*> Elements;
- 	double baseX, baseY;

-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 93ceb1e305..6e73049ef7 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -273,9 +273,15 @@ LinkAction* SlaOutputDev::SC_getAction(AnnotWidget *ano)
- }

- 

- /* Replacement for the crippled Poppler function LinkAction* AnnotWidget::getAdditionalAction(AdditionalActionsType type) */

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+std::unique_ptr<LinkAction> SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *ano)

-+{

-+	std::unique_ptr<LinkAction> linkAction;

-+#else

- LinkAction* SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *ano)

- {

- 	LinkAction *linkAction = nullptr;

-+#endif

- 	Object obj;

- 	Ref refa = ano->getRef();

- 

-@@ -420,7 +426,11 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
- 			POPPLER_CONST GooString *ndst = gto->getNamedDest();

- 			if (ndst)

- 			{

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+				std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);

-+#else

- 				LinkDest *dstn = pdfDoc->findDest(ndst);

-+#endif

- 				if (dstn)

- 				{

- 					if (dstn->getKind() == destXYZ)

-@@ -464,7 +474,11 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
- 			POPPLER_CONST GooString *ndst = gto->getNamedDest();

- 			if (ndst)

- 			{

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+				std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);

-+#else

- 				LinkDest *dstn = pdfDoc->findDest(ndst);

-+#endif

- 				if (dstn)

- 				{

- 					if (dstn->getKind() == destXYZ)

-@@ -932,7 +946,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 				POPPLER_CONST GooString *ndst = gto->getNamedDest();

- 				if (ndst)

- 				{

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+					std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);

-+#else

- 					LinkDest *dstn = pdfDoc->findDest(ndst);

-+#endif

- 					if (dstn)

- 					{

- 						if (dstn->getKind() == destXYZ)

-@@ -984,7 +1002,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 				POPPLER_CONST GooString *ndst = gto->getNamedDest();

- 				if (ndst)

- 				{

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+					std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);

-+#else

- 					LinkDest *dstn = pdfDoc->findDest(ndst);

-+#endif

- 					if (dstn)

- 					{

- 						if (dstn->getKind() == destXYZ)

-@@ -1053,96 +1075,148 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 		else

- 			qDebug() << "Found unsupported Action of type" << Lact->getKind();

- 	}

--	LinkAction *Aact = SC_getAdditionalAction("D", ano);

-+	auto Aact = SC_getAdditionalAction("D", ano);

- 	if (Aact)

- 	{

- 		if (Aact->getKind() == actionJavaScript)

- 		{

--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

-+#else

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

-+#endif

- 			if (jsa->isOk())

- 			{

- 				ite->annotation().setD_act(UnicodeParsedString(jsa->getScript()));

- 				ite->annotation().setAAact(true);

- 			}

- 		}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+		Aact.reset();

-+#else

- 		Aact = nullptr;

-+#endif

- 	}

- 	Aact = SC_getAdditionalAction("E", ano);

- 	if (Aact)

- 	{

- 		if (Aact->getKind() == actionJavaScript)

- 		{

--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

-+#else

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

-+#endif

- 			if (jsa->isOk())

- 			{

- 				ite->annotation().setE_act(UnicodeParsedString(jsa->getScript()));

- 				ite->annotation().setAAact(true);

- 			}

- 		}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+		Aact.reset();

-+#else

- 		Aact = nullptr;

-+#endif

- 	}

- 	Aact = SC_getAdditionalAction("X", ano);

- 	if (Aact)

- 	{

- 		if (Aact->getKind() == actionJavaScript)

- 		{

--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

-+#else

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

-+#endif

- 			if (jsa->isOk())

- 			{

- 				ite->annotation().setX_act(UnicodeParsedString(jsa->getScript()));

- 				ite->annotation().setAAact(true);

- 			}

- 		}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+		Aact.reset();

-+#else

- 		Aact = nullptr;

-+#endif

- 	}

- 	Aact = SC_getAdditionalAction("Fo", ano);

- 	if (Aact)

- 	{

- 		if (Aact->getKind() == actionJavaScript)

- 		{

--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

-+#else

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

-+#endif

- 			if (jsa->isOk())

- 			{

- 				ite->annotation().setFo_act(UnicodeParsedString(jsa->getScript()));

- 				ite->annotation().setAAact(true);

- 			}

- 		}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+		Aact.reset();

-+#else

- 		Aact = nullptr;

-+#endif

- 	}

- 	Aact = SC_getAdditionalAction("Bl", ano);

- 	if (Aact)

- 	{

- 		if (Aact->getKind() == actionJavaScript)

- 		{

--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

-+#else

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

-+#endif

- 			if (jsa->isOk())

- 			{

- 				ite->annotation().setBl_act(UnicodeParsedString(jsa->getScript()));

- 				ite->annotation().setAAact(true);

- 			}

- 		}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+		Aact.reset();

-+#else

- 		Aact = nullptr;

-+#endif

- 	}

- 	Aact = SC_getAdditionalAction("C", ano);

- 	if (Aact)

- 	{

- 		if (Aact->getKind() == actionJavaScript)

- 		{

--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

-+#else

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

-+#endif

- 			if (jsa->isOk())

- 			{

- 				ite->annotation().setC_act(UnicodeParsedString(jsa->getScript()));

- 				ite->annotation().setAAact(true);

- 			}

- 		}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+		Aact.reset();

-+#else

- 		Aact = nullptr;

-+#endif

- 	}

- 	Aact = SC_getAdditionalAction("F", ano);

- 	if (Aact)

- 	{

- 		if (Aact->getKind() == actionJavaScript)

- 		{

--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

-+#else

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

-+#endif

- 			if (jsa->isOk())

- 			{

- 				ite->annotation().setF_act(UnicodeParsedString(jsa->getScript()));

-@@ -1150,14 +1224,22 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 				ite->annotation().setFormat(5);

- 			}

- 		}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+		Aact.reset();

-+#else

- 		Aact = nullptr;

-+#endif

- 	}

- 	Aact = SC_getAdditionalAction("K", ano);

- 	if (Aact)

- 	{

- 		if (Aact->getKind() == actionJavaScript)

- 		{

--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

-+#else

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

-+#endif

- 			if (jsa->isOk())

- 			{

- 				ite->annotation().setK_act(UnicodeParsedString(jsa->getScript()));

-@@ -1165,21 +1247,33 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 				ite->annotation().setFormat(5);

- 			}

- 		}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+		Aact.reset();

-+#else

- 		Aact = nullptr;

-+#endif

- 	}

- 	Aact = SC_getAdditionalAction("V", ano);

- 	if (Aact)

- 	{

- 		if (Aact->getKind() == actionJavaScript)

- 		{

--			LinkJavaScript *jsa = (LinkJavaScript*)Aact;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact.get();

-+#else

-+			LinkJavaScript *jsa = (LinkJavaScript*) Aact;

-+#endif

- 			if (jsa->isOk())

- 			{

- 				ite->annotation().setV_act(UnicodeParsedString(jsa->getScript()));

- 				ite->annotation().setAAact(true);

- 			}

- 		}

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+		Aact.reset();

-+#else

- 		Aact = nullptr;

-+#endif

- 	}

- }

- 

-@@ -3901,6 +3995,46 @@ QString SlaOutputDev::UnicodeParsedString(POPPLER_CONST GooString *s1)
- 	return result;

- }

- 

-+QString SlaOutputDev::UnicodeParsedString(const std::string& s1)

-+{

-+	if (s1.length() == 0)

-+		return QString();

-+	GBool isUnicode;

-+	int i;

-+	Unicode u;

-+	QString result;

-+	if ((s1.at(0) & 0xff) == 0xfe && (s1.length() > 1 && (s1.at(1) & 0xff) == 0xff))

-+	{

-+		isUnicode = gTrue;

-+		i = 2;

-+		result.reserve((s1.length() - 2) / 2);

-+	}

-+	else

-+	{

-+		isUnicode = gFalse;

-+		i = 0;

-+		result.reserve(s1.length());

-+	}

-+	while (i < s1.length())

-+	{

-+		if (isUnicode)

-+		{

-+			u = ((s1.at(i) & 0xff) << 8) | (s1.at(i+1) & 0xff);

-+			i += 2;

-+		}

-+		else

-+		{

-+			u = s1.at(i) & 0xff;

-+			++i;

-+		}

-+		// #15616: imagemagick may write unicode strings incorrectly in PDF

-+		if (u == 0)

-+			continue;

-+		result += QChar( u );

-+	}

-+	return result;

-+}

-+

- bool SlaOutputDev::checkClip()

- {

- 	bool ret = false;

-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index d928fada81..67b5a51937 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -20,6 +20,8 @@ for which a new license (GPL+exception) is in place.
- #include <QTextStream>

- #include <QTransform>

- 

-+#include <memory>

-+

- #include "fpointarray.h"

- #include "importpdfconfig.h"

- #include "pageitem.h"

-@@ -159,7 +161,11 @@ class SlaOutputDev : public OutputDev
- 	virtual ~SlaOutputDev();

- 

- 	LinkAction* SC_getAction(AnnotWidget *ano);

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)

-+	std::unique_ptr<LinkAction> SC_getAdditionalAction(const char *key, AnnotWidget *ano);

-+#else

- 	LinkAction* SC_getAdditionalAction(const char *key, AnnotWidget *ano);

-+#endif

- 	static GBool annotations_callback(Annot *annota, void *user_data);

- 	bool handleTextAnnot(Annot* annota, double xCoor, double yCoor, double width, double height);

- 	bool handleLinkAnnot(Annot* annota, double xCoor, double yCoor, double width, double height);

-@@ -287,6 +293,7 @@ class SlaOutputDev : public OutputDev
- 	void applyMask(PageItem *ite);

- 	void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false);

- 	QString UnicodeParsedString(POPPLER_CONST GooString *s1);

-+	QString UnicodeParsedString(const std::string& s1);

- 	bool checkClip();

- 	bool pathIsClosed {false};

- 	QString CurrColorFill;

diff --git a/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch
deleted file mode 100644
index 4ece0feb8e44..000000000000
--- a/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 17d6a9833488163d7c33c3f2233916b18550e253 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Sun, 29 Mar 2020 10:55:06 +0000
-Subject: [PATCH] #16076: Fix build with Qt 5.15 <heirecka>
-
-git-svn-id: svn://scribus.net/trunk/Scribus@23541 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/ui/scresizecursor.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scribus/ui/scresizecursor.cpp b/scribus/ui/scresizecursor.cpp
-index f2c78e5ae7..85271ed861 100644
---- a/scribus/ui/scresizecursor.cpp
-+++ b/scribus/ui/scresizecursor.cpp
-@@ -12,6 +12,7 @@
- 
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QPen>
- #include <QBrush>
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 02d7f56a4fef..ab1b2fa6c137 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>jlec@gentoo.org</email>
+    <email>fordfrog@gentoo.org</email>
+    <name>Miroslav Šulc</name>
   </maintainer>
   <use>
     <flag name="boost">Enable support for Boost based enhancement</flag>
diff --git a/app-office/scribus/scribus-1.5.5-r1.ebuild b/app-office/scribus/scribus-1.5.5-r1.ebuild
deleted file mode 100644
index 9ba577497293..000000000000
--- a/app-office/scribus/scribus-1.5.5-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/libqxp
-	app-text/poppler:=
-	dev-libs/hyphen
-	>=dev-libs/icu-58.2:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/libzmf
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.0[X,svg]
-	boost? ( >=dev-libs/boost-1.67:= )
-	hunspell? ( app-text/hunspell:= )
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	osg? ( dev-games/openscenegraph:= )
-	pdf? ( app-text/podofo:0= )
-	scripts? (
-		$(python_gen_cond_dep '
-			dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-"
-
-PATCHES=(
-	# upstream svn trunk
-	"${FILESDIR}"/${P}-poppler-0.82.patch
-	"${FILESDIR}"/${P}-poppler-0.83.patch
-	"${FILESDIR}"/${P}-poppler-0.84.patch
-	"${FILESDIR}"/${P}-poppler-0.86.patch
-	"${FILESDIR}"/${P}-qt-5.15.patch # bug 726046
-	# non(?)-upstreamable
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-	"${FILESDIR}"/${P}-docdir.patch
-	"${FILESDIR}"/${P}-findhyphen-{1,2}.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	rm -r codegen/cheetah scribus/third_party/hyphen || die
-
-	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
-	find_package(PkgConfig)
-	pkg_check_modules(ZLIB minizip zlib)
-	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
-	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
-	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
-	EOF
-	sed \
-		-e "/^\s*unzip\.[ch]/d" \
-		-e "/^\s*ioapi\.[ch]/d" \
-		-i scribus/CMakeLists.txt Scribus.pro || die
-	rm scribus/ioapi.[ch] || die
-
-	sed \
-		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-		-i resources/templates/CMakeLists.txt || die
-
-	sed \
-		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
-		-DPYTHON_LIBRARY=$(python_get_library_path)
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
-		-DWITH_BOOST=$(usex boost)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_NOEXAMPLES=$(usex !examples)
-		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DWANT_HUNSPELL=$(usex hunspell)
-		-DWANT_HEADERINSTALL=$(usex !minimal)
-		-DWANT_NOOSG=$(usex !osg)
-		-DWITH_PODOFO=$(usex pdf)
-		-DWANT_NOTEMPLATES=$(usex !templates)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use tk; then
-		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-	if use scripts; then
-		python_fix_shebang "${ED}"/usr/share/scribus/scripts
-		python_optimize "${ED}"/usr/share/scribus/scripts
-	else
-		rm "${ED}"/usr/share/scribus/scripts/*.py || die
-	fi
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-
-	# These files are parsed to populate the help/about window.
-	cat >> "${T}"/COPYING <<- EOF || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
-	EOF
-	dodoc "${T}"/COPYING
-	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
-
-	local size
-	for size in 16 32 128 256 512; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}
diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
index a017d67eb016..2b4f3fb49c3c 100644
--- a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}