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

[Andreas Sturmlechner]

commit:     d678e7ae57b537f75179aaed8307b9212140eb22
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 23 20:55:56 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 23 22:52:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d678e7ae

app-office/libreoffice: Drop 6.2.0.2

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

 app-office/libreoffice/Manifest                    |   2 -
 .../files/libreoffice-6.2.0.1-poppler-0.71-1.patch | 164 ------
 .../files/libreoffice-6.2.0.1-poppler-0.71-2.patch |  72 ---
 .../files/libreoffice-6.2.0.1-poppler-0.72.patch   |  43 --
 .../files/libreoffice-6.2.0.2-poppler-0.73.patch   | 101 ----
 app-office/libreoffice/libreoffice-6.2.0.2.ebuild  | 582 ---------------------
 6 files changed, 964 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 15390722f85..5effcd09b23 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,10 +5,8 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
 DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
 DIST libreoffice-6.1.5.1.tar.xz 207920688 BLAKE2B 7e435a62b880839c752ba90693918242ec29807acb73a22d6101d74f8c8d712a5a26a85cea334a6e66811b7a4f8e016b87932390f2746da4effcb74a416ca973 SHA512 fab7f0bb6fb113c0bfa8bbc0424568c37a04f301d6e44f5755dcbb21cc6df964819a2e143b10f5c6352bfbea438df0b136ba55caf7be3bbbb83bcebba4ceadae
-DIST libreoffice-6.2.0.2.tar.xz 213471412 BLAKE2B 61c07f0b6e2c12d197d93346ae4b9f583189a093f9fe49156c5f6ccee4309a77b4a6f6a133a61764d11dd56e7e36734ed4ebf3abab035021c0692477d556acf7 SHA512 6c8e039548b50071e50eea6719a92c11c85da2c7ae73bc70bddc5eb32859823fc5f5ab5867ec0b76d8a094cd21a228d6b0d3a7fa834e8005a2d7a82c7ecdb278
 DIST libreoffice-6.2.0.3.tar.xz 213476336 BLAKE2B e0a44098aa46c86d5fb7d26366d57d4bf395f642cf228a426446067a7037b5199715a7d34a2b28664123f814cc23da7e299da4f93ed8b65c29ae90056cc40399 SHA512 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
 DIST libreoffice-help-6.1.5.1.tar.xz 15756964 BLAKE2B 0d7b32488e2e0ccab0ff067ba19dbbcdcc57f80280c74c6aa0f2e0f6cd49f2eeb67adb1d8f0e88459636d6301329fed3c5837b246571cecfa27a1e334d9b8579 SHA512 f9ae9134eb322f7cfc1cb2a18d23edfaed880925c289d49136d9e7ce026bfa2fbbf148b14a88e8f68d6f5bd8a04a97265c5c15d1eb92ef6fef50a899388617a3
-DIST libreoffice-help-6.2.0.2.tar.xz 16186468 BLAKE2B 3846172642023633420ba83f3c65430dd7c1e5b4fc652e758081175d6b52c412822acd2af1dc31ebcc5344bd4f4b5ba6d49beb4f43f997fd99cbe1ecd69a9f96 SHA512 43c99f3db3d773d3f724600a875b964a65ae3dcab4ab7348289828cf860475a036cd6ba2d54d57cfec4ca259c085932fa479d465475591919e86108c56ed5feb
 DIST libreoffice-help-6.2.0.3.tar.xz 16186548 BLAKE2B 95d7fbdaac774032f5ddac121eec5ace9f7964a112f8137d8cf3b999e4ba6685048c027b5635283de9913547c2776ba9b9ab7e28b97cf94fac536decc12fda98 SHA512 7b1c7949ede3fdd6dcc09fd38b62f17d68c5f79e75fb72cedb9d55889d8d8cf261d6614aa5e2e3eae3e26764b2cdb0e4344bef25851daef6041ac3935ad64fb1

diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch
deleted file mode 100644
index 9899f5864ca..00000000000
--- a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 5e8bdd9203dd642111c62a6668ee665a20d4ba19 Mon Sep 17 00:00:00 2001
-From: Mike Kaganski <mike.kaganski@×××××××××.com>
-Date: Tue, 20 Nov 2018 08:45:38 +0100
-Subject: poppler dropped GBool since 0.71
-
-See https://lists.freedesktop.org/archives/libreoffice/2018-November/081410.html
-
-Change-Id: I258e08894486a925bed50a3a4232b6e805af6784
-Reviewed-on: https://gerrit.libreoffice.org/63625
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@××××××.com>
----
- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx       | 21 +++++++------
- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx       | 35 +++++++++++++---------
- 2 files changed, 31 insertions(+), 25 deletions(-)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 575a90a..ab74b36 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -514,7 +514,7 @@ void PDFOutDev::printPath( GfxPath* pPath )
- PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
-     m_pDoc( pDoc ),
-     m_aFontMap(),
--    m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ),
-+    m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ),
-     m_bSkipImages(false)
- {
- }
-@@ -939,9 +939,9 @@ void PDFOutDev::endTextObject(GfxState*)
- }
- 
- void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
--                              int width, int height, GBool invert,
--                              GBool /*interpolate*/,
--                              GBool /*inlineImg*/ )
-+                              int width, int height, poppler_bool invert,
-+                              poppler_bool /*interpolate*/,
-+                              poppler_bool /*inlineImg*/ )
- {
-     if (m_bSkipImages)
-         return;
-@@ -969,8 +969,8 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
- 
- void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
-                           int width, int height, GfxImageColorMap* colorMap,
--                          GBool /*interpolate*/,
--                          int* maskColors, GBool /*inlineImg*/ )
-+                          poppler_bool /*interpolate*/,
-+                          int* maskColors, poppler_bool /*inlineImg*/ )
- {
-     if (m_bSkipImages)
-         return;
-@@ -1018,11 +1018,10 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
- void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
-                                 int width, int height,
-                                 GfxImageColorMap* colorMap,
--                                GBool /*interpolate*/,
-+                                poppler_bool /*interpolate*/,
-                                 Stream* maskStr,
-                                 int maskWidth, int maskHeight,
--                                GBool maskInvert
--                                , GBool /*maskInterpolate*/
-+                                poppler_bool maskInvert, poppler_bool /*maskInterpolate*/
-                                )
- {
-     if (m_bSkipImages)
-@@ -1036,11 +1035,11 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
- void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str,
-                                     int width, int height,
-                                     GfxImageColorMap* colorMap,
--                                    GBool /*interpolate*/,
-+                                    poppler_bool /*interpolate*/,
-                                     Stream* maskStr,
-                                     int maskWidth, int maskHeight,
-                                     GfxImageColorMap* maskColorMap
--                                    , GBool /*maskInterpolate*/
-+                                    , poppler_bool /*maskInterpolate*/
-                                    )
- {
-     if (m_bSkipImages)
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index da021a2a..a6135fa 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -130,6 +130,13 @@ namespace pdfi
-         { return const_cast<GooString &>(familyName); }
-     };
- 
-+    // Versions before 0.15 defined GBool as int; 0.15 redefined it as bool; 0.71 dropped GBool
-+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 71
-+    typedef GBool poppler_bool;
-+#else
-+    typedef bool poppler_bool;
-+#endif
-+
-     class PDFOutDev : public OutputDev
-     {
-         // not owned by this class
-@@ -151,17 +158,17 @@ namespace pdfi
- 
-         // Does this device use upside-down coordinates?
-         // (Upside-down means (0,0) is the top left corner of the page.)
--        virtual GBool upsideDown() override { return gTrue; }
-+        virtual poppler_bool upsideDown() override { return true; }
- 
-         // Does this device use drawChar() or drawString()?
--        virtual GBool useDrawChar() override { return gTrue; }
-+        virtual poppler_bool useDrawChar() override { return true; }
- 
-         // Does this device use beginType3Char/endType3Char?  Otherwise,
-         // text in Type 3 fonts will be drawn with drawChar/drawString.
--        virtual GBool interpretType3Chars() override { return gFalse; }
-+        virtual poppler_bool interpretType3Chars() override { return false; }
- 
-         // Does this device need non-text content?
--        virtual GBool needNonText() override { return gTrue; }
-+        virtual poppler_bool needNonText() override { return true; }
- 
-         //----- initialization and control
- 
-@@ -233,29 +240,29 @@ namespace pdfi
- 
-         //----- image drawing
-         virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
--                                   int width, int height, GBool invert,
--                                   GBool interpolate,
--                                   GBool inlineImg) override;
-+                                   int width, int height, poppler_bool invert,
-+                                   poppler_bool interpolate,
-+                                   poppler_bool inlineImg) override;
-         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
-                                int width, int height, GfxImageColorMap *colorMap,
--                               GBool interpolate,
--                               int *maskColors, GBool inlineImg) override;
-+                               poppler_bool interpolate,
-+                               int* maskColors, poppler_bool inlineImg) override;
-         virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
-                                      int width, int height,
-                                      GfxImageColorMap *colorMap,
--                                     GBool interpolate,
-+                                     poppler_bool interpolate,
-                                      Stream *maskStr, int maskWidth, int maskHeight,
--                                     GBool maskInvert
--                                     , GBool maskInterpolate
-+                                     poppler_bool maskInvert,
-+                                     poppler_bool maskInterpolate
-                                     ) override;
-         virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
-                                          int width, int height,
-                                          GfxImageColorMap *colorMap,
--                                         GBool interpolate,
-+                                         poppler_bool interpolate,
-                                          Stream *maskStr,
-                                          int maskWidth, int maskHeight,
-                                          GfxImageColorMap *maskColorMap
--                                         , GBool maskInterpolate
-+                                         , poppler_bool maskInterpolate
-                                         ) override;
- 
-         static void setPageNum( int nNumPages );
--- 
-cgit v1.1
-

diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch
deleted file mode 100644
index 37b44556219..00000000000
--- a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 8ff41a26caf51544699863c89598d37d93dc1b21 Mon Sep 17 00:00:00 2001
-From: Aleksei Nikiforov <darktemplar@×××××××.ru>
-Date: Thu, 22 Nov 2018 17:54:00 +0300
-Subject: Fix build with poppler 0.71
-
-Change-Id: I470ece9dc4766e10e1ccb5e99b25a8d8cc4cbf38
-Reviewed-on: https://gerrit.libreoffice.org/63860
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@××××××.com>
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx    | 4 ++--
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index ab74b36..101e3be 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*)
-     printf( "restoreState\n" );
- }
- 
-+#if POPPLER_CHECK_VERSION(0, 71, 0)
-+void PDFOutDev::setDefaultCTM(const double *pMat)
-+#else
- void PDFOutDev::setDefaultCTM(double *pMat)
-+#endif
- {
-     assert(pMat);
- 
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index a6135fa..98d8ede 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -173,7 +173,11 @@ namespace pdfi
-         //----- initialization and control
- 
-         // Set default transform matrix.
-+#if POPPLER_CHECK_VERSION(0, 71, 0)
-+        virtual void setDefaultCTM(const double *ctm) override;
-+#else
-         virtual void setDefaultCTM(double *ctm) override;
-+#endif
- 
-         // Start a page.
-         virtual void startPage(int pageNum, GfxState *state
-diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-index 0f4a35b..b0a6ac4 100644
---- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
-@@ -69,7 +69,7 @@ int main(int argc, char **argv)
- 
-     // read config file
-     globalParams = new GlobalParams();
--    globalParams->setErrQuiet(gTrue);
-+    globalParams->setErrQuiet(true);
- #if defined(_MSC_VER)
-     globalParams->setupBaseFonts(nullptr);
- #endif
-@@ -145,7 +145,7 @@ int main(int argc, char **argv)
-                 i,
-                 PDFI_OUTDEV_RESOLUTION,
-                 PDFI_OUTDEV_RESOLUTION,
--                0, gTrue, gTrue, gTrue);
-+                0, true, true, true);
-         rDoc.processLinks(&aOutDev, i);
-     }
- 
--- 
-cgit v1.1
-

diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch
deleted file mode 100644
index 7f0b1f71a1e..00000000000
--- a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 65a6c9ae4791188ffcecf489073cf38873ce5e17 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@g.o>
-Date: Tue, 8 Jan 2019 11:24:40 +0100
-Subject: Fix build with poppler-0.72
-
-Change-Id: I0664d1b39e97b7555c0a3cba442db52b84f37134
-Reviewed-on: https://gerrit.libreoffice.org/65960
-Tested-by: Jenkins
-Reviewed-by: Michael Stahl <Michael.Stahl@×××.de>
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 101e3be..dab405b 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -555,7 +555,11 @@ void PDFOutDev::processLink(Link* link, Catalog*)
-     LinkAction* pAction = link->getAction();
-     if (pAction && pAction->getKind() == actionURI)
-     {
-+#if POPPLER_CHECK_VERSION(0, 72, 0)
-+        const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
-+#else
-         const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
-+#endif
- 
-         std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
- 
-@@ -757,7 +761,11 @@ void PDFOutDev::updateFont(GfxState *state)
- 
-             aFont = it->second;
- 
-+#if POPPLER_CHECK_VERSION(0, 72, 0)
-+            std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
-+#else
-             std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
-+#endif
-             printf( " %d %d %d %d %f %d %s",
-                     aFont.isEmbedded,
-                     aFont.isBold,
--- 
-cgit v1.1

diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch b/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
deleted file mode 100644
index fb9112bc398..00000000000
--- a/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 9e1522ad1d2c2bd775fa50c2b142eb110a56af72 Mon Sep 17 00:00:00 2001
-From: Michael Stahl <Michael.Stahl@×××.de>
-Date: Mon, 14 Jan 2019 15:08:42 +0100
-Subject: sdext: fix build with poppler 0.73
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-... which has removed Guchar, Gushort, Guint, Gulong...
-
-Change-Id: Ia54ad378031f167f6779f6ffe574b85c1e72f26d
-Reviewed-on: https://gerrit.libreoffice.org/66305
-Tested-by: Jenkins
-Reviewed-by: Michael Stahl <Michael.Stahl@×××.de>
-(cherry picked from commit 50d371ae08c66648d9f32f633b2245e1746e2bb6)
-Reviewed-on: https://gerrit.libreoffice.org/66356
-Reviewed-by: Caolán McNamara <caolanm@××××××.com>
-Tested-by: Caolán McNamara <caolanm@××××××.com>
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++--
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 6 +++++-
- sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx      | 6 +++---
- 3 files changed, 10 insertions(+), 6 deletions(-)
-
-(limited to 'sdext/source/pdfimport/xpdfwrapper')
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 575a90a..35490a0 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -298,7 +298,7 @@ static void writePpm_( OutputBuffer&     o_rOutputBuf,
-     o_rOutputBuf.resize(header_size);
- 
-     // initialize stream
--    Guchar *p;
-+    unsigned char *p;
-     GfxRGB rgb;
-     std::unique_ptr<ImageStream> imgStr(
-         new ImageStream(str,
-@@ -401,7 +401,7 @@ static void writeImage_( OutputBuffer&     o_rOutputBuf,
-                 oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) };
-         if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray )
-         {
--            Guchar nIndex = 0;
-+            unsigned char nIndex = 0;
-             colorMap->getRGB( &nIndex, &zeroColor );
-             nIndex = 1;
-             colorMap->getRGB( &nIndex, &oneColor );
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index da021a2a..443e757 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -267,9 +267,13 @@ extern FILE* g_binary_out;
- 
- // note: if you ever change Output_t, please keep in mind that the current code
- // relies on it being of 8 bit size
--typedef Guchar Output_t;
-+typedef unsigned char Output_t;
- typedef std::vector< Output_t > OutputBuffer;
- 
-+#if !POPPLER_CHECK_VERSION(0, 73, 0)
-+static_assert(std::is_same<Guchar, unsigned char>::value, "unexpected typedef");
-+#endif
-+
- #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX
- 
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
-index 4d9e3bb..b582856 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
-@@ -242,7 +242,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
-     appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
- 
-     // initialize stream
--    Guchar *p, *pm;
-+    unsigned char *p, *pm;
-     GfxRGB rgb;
-     GfxGray alpha;
-     std::unique_ptr<ImageStream> imgStr(
-@@ -328,7 +328,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
-     appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
- 
-     // initialize stream
--    Guchar *p;
-+    unsigned char *p;
-     GfxRGB rgb;
-     std::unique_ptr<ImageStream> imgStr(
-         new ImageStream(str,
-@@ -374,7 +374,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
-     {
-         for( int x = 0; x < maskWidth; ++x )
-         {
--            Guchar aPixel = 0;
-+            unsigned char aPixel = 0;
-             imgStrMask->getPixel( &aPixel );
-             int nIndex = (y*height/maskHeight) * (width*4+1) + // mapped line
-                          (x*width/maskWidth)*4 + 1  + 3        // mapped column
--- 
-cgit v1.1
-

diff --git a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
deleted file mode 100644
index e2865fbd55d..00000000000
--- a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
+++ /dev/null
@@ -1,582 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
-	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	app-text/libnumbertext
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-libs/liborcus-0.14.0
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.24[nss]
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
-	bluetooth? (
-		dev-libs/glib:2
-		net-wireless/bluez
-	)
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( sys-apps/dbus )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl]
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	gtk2? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtwidgets:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/breeze-icons:* )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-#        tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3
-	dev-util/intltool
-	>=dev-util/mdds-1.4.1:1=
-	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/ucpp
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-		media-fonts/liberation-fonts
-	)
-"
-
-PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
-	# 6.2 branch
-	"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch
-	"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch
-	"${FILESDIR}"/${P}-poppler-0.73.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
-	CHECKREQS_MEMORY="512M"
-	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		CHECKREQS_DISK_BUILD="22G"
-	else
-		CHECKREQS_DISK_BUILD="6G"
-	fi
-	check-reqs_$1
-}
-
-pkg_pretend() {
-	use java || \
-		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
-	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
-		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
-		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
-		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
-	fi
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${MY_PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${MY_PV/.9999}
-		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-		LOCOREGIT_VERSION=${EGIT_VERSION}
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sandbox violations on many systems, we don't need it. Bug #646406
-	sed -i \
-		-e "/KF5_CONFIG/s/kf5-config/no/" \
-		configure.ac || die "Failed to disable kf5-config"
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/officehelper.py || die
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@g.o for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use kde; then
-		export QT_SELECT=5 # bug 639620 needs proper fix though
-		export QT5DIR="$(qt5_get_bindir)/../"
-		export MOC5="$(qt5_get_bindir)/moc"
-	fi
-
-	local gentoo_buildid="Gentoo official package"
-	if [[ -n ${LOCOREGIT_VERSION} ]]; then
-		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-build-opensymbol
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-ccache
-		--disable-dependency-tracking
-		--disable-epm
-		--disable-fetch-external
-		--disable-gstreamer-0-10
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--disable-report-builder
-		--with-build-version="${gentoo_buildid}"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-ucpp
-		--with-tls=nss
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--without-help
-		--with-helppack-integration
-		--with-system-gpgmepp
-		--without-system-sane
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk gtk3)
-		$(use_enable gtk2 gtk)
-		$(use_enable kde kde5)
-		$(use_enable kde qt5)
-		$(use_enable mysql bundle-mariadb)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable vlc)
-		$(use_with accessibility lxml)
-		$(use_with coinmp system-coinmp)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with odk doxygen)
-	)
-
-	if use gtk && use kde; then
-		myeconfargs+=( --enable-gtk3-kde5 )
-	fi
-
-	if use eds || use gtk; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
-		)
-
-		use libreoffice_extensions_scripting-beanshell && \
-			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
-	fi
-
-	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=helpcontent2/source/media/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || \
-			ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# bug 593514
-	if use gtk; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
-	fi
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}