[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     feb8be0ac2f9df871ee473e68222e59d80581275
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 00:55:29 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 08:31:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feb8be0a

app-office/scribus: Drop 1.5.5-r1

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/scribus/Manifest                        |   1 -
 .../scribus/files/scribus-1.5.5-docdir.patch       |  29 --
 .../scribus/files/scribus-1.5.5-findhyphen-2.patch |  19 -
 .../scribus/files/scribus-1.5.5-poppler-0.82.patch |  89 ----
 .../scribus/files/scribus-1.5.5-poppler-0.83.patch | 153 -------
 .../scribus/files/scribus-1.5.5-poppler-0.84.patch |  34 --
 .../scribus/files/scribus-1.5.5-poppler-0.86.patch | 459 ---------------------
 .../scribus/files/scribus-1.5.5-qt-5.15.patch      |  22 -
 app-office/scribus/scribus-1.5.5-r1.ebuild         | 167 --------
 9 files changed, 973 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 823daf4f2db..968c3cbf84b 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1 @@
-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

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 897a8a75ae9..00000000000
--- 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 a8993ca6387..00000000000
--- 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 f1eb1e887da..00000000000
--- 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 0d52486da92..00000000000
--- 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 de1f39411e8..00000000000
--- 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 e91bb3afdb6..00000000000
--- 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 4ece0feb8e4..00000000000
--- 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/scribus-1.5.5-r1.ebuild b/app-office/scribus/scribus-1.5.5-r1.ebuild
deleted file mode 100644
index 9ba57749729..00000000000
--- 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
-}