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

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

commit:     72f67e5114c0c47627c5abf4955a842f0efd9cd4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 16:04:49 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 16:32:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f67e51

app-office/libreoffice: drop 7.6.4.1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/libreoffice/Manifest                    |   2 -
 .../files/libreoffice-7.5.9.2-libxml2-2.12.patch   | 303 ----------
 app-office/libreoffice/libreoffice-7.6.4.1.ebuild  | 668 ---------------------
 3 files changed, 973 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a091f36e87d2..b5a7bb935041 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,11 +21,9 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
 DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e
 DIST libreoffice-24.2.3.2-icu-74.tar.xz 28100 BLAKE2B 5c49749f3e8f23d28dc2463001030eb660e3387480aa1b0611460987f80fa2c965adb4a84d822177452994a072ad94dbff41a43d621b89c37d4133875620a591 SHA512 32c906fb4bfc431baecbc7f01bfcb32227da740b10ff97a53288275e179344070344e594e273a79671070c74423bcc3ea68dec88543d6ab89fb20a57f4c2c114
 DIST libreoffice-24.2.4.2.tar.xz 279938452 BLAKE2B a950463998c5b5478ac2b17c7ef6e9bf579e01b3434a26edb8cd1eb320dbeb444a63ace5a64cc37c98e2f3e8166b0044a5cc28474f6125b645cce6c16ed353c8 SHA512 a0d10ccfd3c88285519a3ff00c429cbeec3591d779769b2264c2bde67aed3921462b5e5a4fda52217a483088f7fd1f518339d9809907b1a8dea54dc66b86ae3e
-DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
 DIST libreoffice-7.6.7.2.tar.xz 282345404 BLAKE2B 7214739ce3e495e07180875834908078975857bed83fbd4f33ccfaaca5b30a0651661da4e42aa59f9c7011fe7ce2c58667c41d48b73f621d2004e8dbbdd0817f SHA512 443d818f35d9cac1af3a911f031b0b8f455eb28afa1a563ee3551b3285810f3b7b19265a64f853eef07e0c550c5d81f95e2774db46bd9dfee7b9aee029eb3747
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-24.2.4.2.tar.xz 167013820 BLAKE2B 9345efdfdd47336c623fe6da872eb22278dc8156e29ab049969ea11d947b374dfe0661388a14318afacfc4f0dbf717d16906f71e0d300f52eed0b18fa909f6e7 SHA512 2dc8c7d5976b4784011ac6d3e7a507e433673bf68451a13cbe243b478d32659cbb46f38af345f44efc24ca90dcd4e74f2d53354fd11d738635070ef57da0c317
-DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
 DIST libreoffice-help-7.6.7.2.tar.xz 166901284 BLAKE2B 636772e6ba11b00d26f0280f3ac564e4c4ab839808ec21eeefdbec7a16e4fdad512466b523f1e58cfd74bfe29f4bc06b7d203e18e5e2a2b1a6ed5b8ff8ec9093 SHA512 724cdb884b37bd847080b4610d1fe2f9b111479585bc097f2ad2a73141565c542d08eab088a36eb3374a3c85a0b803a7c65e43058234076c3ddc99c6f847e3a8
 DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
 DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9

diff --git a/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch b/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch
deleted file mode 100644
index bc7ae2a561ff..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-From c8f7408db73d2f2ccacb25a2b4fef8dfebdfc6cb Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.com>
-Date: Mon, 27 Nov 2023 08:02:59 +0100
-Subject: tdf#158302 fix build against system-libxml-2.12
-
-Seen in a fedora:40 container, using --with-system-libcmis,
---with-system-liblangtag and --with-system-xmlsec.
-
-Change-Id: I9d748d3dc0b70dbfdfcb6b99c9ce8440bda6f326
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159980
-Tested-by: Jenkins
-Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
----
- drawinglayer/source/tools/primitive2dxmldump.cxx | 1 +
- filter/source/xsltfilter/LibXSLTTransformer.cxx  | 2 +-
- helpcompiler/source/HelpLinker.cxx               | 4 ++++
- include/xmloff/xmltoken.hxx                      | 2 +-
- sax/source/fastparser/fastparser.cxx             | 2 +-
- sc/source/core/tool/interpr7.cxx                 | 1 +
- sc/source/filter/xml/XMLExportDataPilot.cxx      | 2 +-
- sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 2 +-
- sc/source/filter/xml/xmlfilti.cxx                | 6 +++---
- unoxml/source/dom/attr.cxx                       | 1 +
- unoxml/source/dom/document.cxx                   | 1 +
- unoxml/source/dom/documentbuilder.cxx            | 1 +
- unoxml/source/dom/entity.cxx                     | 1 +
- unoxml/source/xpath/xpathapi.cxx                 | 7 ++++++-
- xmloff/source/core/xmltoken.cxx                  | 2 +-
- xmloff/source/style/PageMasterStyleMap.cxx       | 2 +-
- xmlsecurity/inc/xmlsec-wrapper.h                 | 1 +
- xmlsecurity/inc/xmlsec/saxhelper.hxx             | 1 +
- 18 files changed, 28 insertions(+), 11 deletions(-)
-
-diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx
-index 76aefec902ea..f3b9ef1bc919 100644
---- a/drawinglayer/source/tools/primitive2dxmldump.cxx
-+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
-@@ -15,6 +15,7 @@
- 
- #include <math.h>
- #include <memory>
-+#include <libxml/parser.h>
- #include <sal/log.hxx>
- 
- #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx
-index 1a7c34805f1b..5e9a7c4bcd35 100644
---- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
-+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
-@@ -333,7 +333,7 @@ namespace XSLT
-         }
-         else
-         {
--            xmlErrorPtr lastErr = xmlGetLastError();
-+            const xmlError* lastErr = xmlGetLastError();
-             OUString msg;
-             if (lastErr)
-                 msg = OStringToOUString(lastErr->message, RTL_TEXTENCODING_UTF8);
-diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
-index 3d52834dbe6b..898a8b26392a 100644
---- a/helpcompiler/source/HelpLinker.cxx
-+++ b/helpcompiler/source/HelpLinker.cxx
-@@ -815,7 +815,11 @@ static const HelpProcessingException* GpXMLParsingException = nullptr;
- 
- extern "C" {
- 
-+#if LIBXML_VERSION >= 21200
-+static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, const xmlError* error)
-+#else
- static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, xmlErrorPtr error)
-+#endif
- {
-     std::string aErrorMsg = error->message;
-     std::string aXMLParsingFile;
-diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
-index 4e6441841774..ba42fae4d035 100644
---- a/include/xmloff/xmltoken.hxx
-+++ b/include/xmloff/xmltoken.hxx
-@@ -744,7 +744,7 @@ namespace xmloff::token {
-         XML_EMBEDDED_VISIBLE_AREA,
-         XML_EMBOSSED,
-         XML_EMISSIVE_COLOR,
--        XML_EMPTY,
-+        XML_TOKEN_EMPTY,
-         XML_EMPTY_LINE_REFRESH,
-         XML_ENABLE_NUMBERING,
-         XML_ENABLED,
-diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
-index ec8065016a12..e0338e053cf0 100644
---- a/sax/source/fastparser/fastparser.cxx
-+++ b/sax/source/fastparser/fastparser.cxx
-@@ -578,7 +578,7 @@ Event& Entity::getEvent( CallbackType aType )
- OUString lclGetErrorMessage( xmlParserCtxtPtr ctxt, std::u16string_view sSystemId, sal_Int32 nLine )
- {
-     const char* pMessage;
--    xmlErrorPtr error = xmlCtxtGetLastError( ctxt );
-+    const xmlError* error = xmlCtxtGetLastError( ctxt );
-     if( error && error->message )
-         pMessage = error->message;
-     else
-diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
-index 352c7cf70e45..ecb4ea346396 100644
---- a/sc/source/core/tool/interpr7.cxx
-+++ b/sc/source/core/tool/interpr7.cxx
-@@ -31,6 +31,7 @@
- #include <cstring>
- #include <memory>
- #include <string_view>
-+#include <libxml/parser.h>
- 
- using namespace com::sun::star;
- 
-diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
-index da65bec0dab7..bd5f16d828ff 100644
---- a/sc/source/filter/xml/XMLExportDataPilot.cxx
-+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
-@@ -123,7 +123,7 @@ void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, boo
- 
-     if (aQueryEntry.IsQueryByEmpty())
-     {
--        rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_EMPTY));
-+        rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_TOKEN_EMPTY));
-     }
-     else if (aQueryEntry.IsQueryByNonEmpty())
-     {
-diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
-index 6905e02d651b..e4307065bd92 100644
---- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
-+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
-@@ -376,7 +376,7 @@ private:
-             case SC_EQUAL:
-             {
-                 if (rEntry.IsQueryByEmpty())
--                    return GetXMLToken(XML_EMPTY);
-+                    return GetXMLToken(XML_TOKEN_EMPTY);
-                 else if (rEntry.IsQueryByNonEmpty())
-                     return GetXMLToken(XML_NOEMPTY);
- 
-diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
-index 7585ce0c50fa..61f7cfe4a349 100644
---- a/sc/source/filter/xml/xmlfilti.cxx
-+++ b/sc/source/filter/xml/xmlfilti.cxx
-@@ -370,7 +370,7 @@ void ScXMLConditionContext::GetOperator(
-         rEntry.eOp = SC_BOTPERC;
-     else if (IsXMLToken(aOpStr, XML_BOTTOM_VALUES))
-         rEntry.eOp = SC_BOTVAL;
--    else if (IsXMLToken(aOpStr, XML_EMPTY))
-+    else if (IsXMLToken(aOpStr, XML_TOKEN_EMPTY))
-         rEntry.SetQueryByEmpty();
-     else if (aOpStr == u">")
-         rEntry.eOp = SC_GREATER;
-@@ -422,7 +422,7 @@ void SAL_CALL ScXMLConditionContext::endFastElement( sal_Int32 /*nElement*/ )
-     if (maQueryItems.empty())
-     {
-         ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
--        if (IsXMLToken(sOperator, XML_EMPTY))
-+        if (IsXMLToken(sOperator, XML_TOKEN_EMPTY))
-             return;
-         if (IsXMLToken(sDataType, XML_NUMBER))
-         {
-@@ -753,7 +753,7 @@ void SAL_CALL ScXMLDPConditionContext::endFastElement( sal_Int32 /*nElement*/ )
-     else
-         aFilterField.eConnect = SC_AND;
-     pFilterContext->SetIsCaseSensitive(bIsCaseSensitive);
--    if (IsXMLToken(sOperator, XML_EMPTY))
-+    if (IsXMLToken(sOperator, XML_TOKEN_EMPTY))
-         aFilterField.SetQueryByEmpty();
-     else if (IsXMLToken(sOperator, XML_NOEMPTY))
-         aFilterField.SetQueryByNonEmpty();
-diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
-index dd974d910edb..d8d873cdf055 100644
---- a/unoxml/source/dom/attr.cxx
-+++ b/unoxml/source/dom/attr.cxx
-@@ -22,6 +22,7 @@
- #include <string.h>
- 
- #include <memory>
-+#include <libxml/entities.h>
- 
- #include <osl/diagnose.h>
- #include <sal/log.hxx>
-diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
-index cb48bd1635f8..0825fc2cd7ed 100644
---- a/unoxml/source/dom/document.cxx
-+++ b/unoxml/source/dom/document.cxx
-@@ -41,6 +41,7 @@
- #include <eventdispatcher.hxx>
- 
- #include <string.h>
-+#include <libxml/xmlIO.h>
- 
- #include <osl/diagnose.h>
- 
-diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
-index c3cd7663d2fc..3898d58e4be4 100644
---- a/unoxml/source/dom/documentbuilder.cxx
-+++ b/unoxml/source/dom/documentbuilder.cxx
-@@ -22,6 +22,7 @@
- #include <string.h>
- 
- #include <libxml/xmlerror.h>
-+#include <libxml/parser.h>
- 
- #include <memory>
- 
-diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx
-index ccc8a0872499..98909dfe8f12 100644
---- a/unoxml/source/dom/entity.cxx
-+++ b/unoxml/source/dom/entity.cxx
-@@ -22,6 +22,7 @@
- #include <osl/diagnose.h>
- 
- #include <string.h>
-+#include <libxml/entities.h>
- 
- using namespace css::uno;
- using namespace css::xml::dom;
-diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
-index a60083983882..c2b753783176 100644
---- a/unoxml/source/xpath/xpathapi.cxx
-+++ b/unoxml/source/xpath/xpathapi.cxx
-@@ -26,6 +26,7 @@
- #include <libxml/xmlerror.h>
- #include <libxml/xpath.h>
- #include <libxml/xpathInternals.h>
-+#include <libxml/xmlIO.h>
- 
- #include <com/sun/star/xml/xpath/XPathException.hpp>
- 
-@@ -217,7 +218,7 @@ namespace XPath
-         return selectSingleNode(contextNode, expr);
-     }
- 
--    static OUString make_error_message(xmlErrorPtr pError)
-+    static OUString make_error_message(const xmlError* pError)
-     {
-         OUStringBuffer buf;
-         if (pError) {
-@@ -259,7 +260,11 @@ namespace XPath
-             SAL_WARN("unoxml", "libxml2 error: " << str);
-         }
- 
-+#if LIBXML_VERSION >= 21200
-+        static void structured_error_func(void *, const xmlError* error)
-+#else
-         static void structured_error_func(void *, xmlErrorPtr error)
-+#endif
-         {
-             SAL_WARN("unoxml", "libxml2 error: " << make_error_message(error));
-         }
-diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
-index 6879f37db295..e11dc0d16111 100644
---- a/xmloff/source/core/xmltoken.cxx
-+++ b/xmloff/source/core/xmltoken.cxx
-@@ -756,7 +756,7 @@ namespace xmloff::token {
-         TOKEN( "embedded-visible-area",           XML_EMBEDDED_VISIBLE_AREA ),
-         TOKEN( "embossed",                        XML_EMBOSSED ),
-         TOKEN( "emissive-color",                  XML_EMISSIVE_COLOR ),
--        TOKEN( "empty",                           XML_EMPTY ),
-+        TOKEN( "empty",                           XML_TOKEN_EMPTY ),
-         TOKEN( "empty-line-refresh",              XML_EMPTY_LINE_REFRESH ),
-         TOKEN( "enable-numbering",                XML_ENABLE_NUMBERING ),
-         TOKEN( "enabled",                         XML_ENABLED ),
-diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
-index 7b2cab4751aa..6f631289672b 100644
---- a/xmloff/source/style/PageMasterStyleMap.cxx
-+++ b/xmloff/source/style/PageMasterStyleMap.cxx
-@@ -157,7 +157,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
-     PLMAP( PROP_FootnoteLineRelativeWidth, XML_NAMESPACE_STYLE,    XML__EMPTY,     XML_TYPE_PERCENT8|MID_FLAG_SPECIAL_ITEM,    CTF_PM_FTN_LINE_WIDTH ),
-     PLMAP( PROP_FootnoteLineTextDistance, XML_NAMESPACE_STYLE,    XML__EMPTY,     XML_TYPE_MEASURE|MID_FLAG_SPECIAL_ITEM,    CTF_PM_FTN_LINE_DISTANCE ),
-     PLMAP( PROP_FootnoteLineWeight,        XML_NAMESPACE_STYLE,    XML_FOOTNOTE_SEP,    XML_TYPE_MEASURE16|MID_FLAG_ELEMENT_ITEM,    CTF_PM_FTN_LINE_WEIGHT ),
--    PLMAP( PROP_FootnoteLineStyle,     XML_NAMESPACE_STYLE,    XML_EMPTY,  XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM,  CTF_PM_FTN_LINE_STYLE ),
-+    PLMAP( PROP_FootnoteLineStyle,     XML_NAMESPACE_STYLE,    XML_TOKEN_EMPTY,  XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM,  CTF_PM_FTN_LINE_STYLE ),
-     PLMAP_EXT(PROP_GutterMargin, XML_NAMESPACE_LO_EXT, XML_MARGIN_GUTTER, XML_TYPE_MEASURE, CTF_PM_MARGINGUTTER),
- 
-     //////////////////////////////////////////////////////////////////////////
-diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h
-index 7c6d267e8b73..3ad705400c52 100644
---- a/xmlsecurity/inc/xmlsec-wrapper.h
-+++ b/xmlsecurity/inc/xmlsec-wrapper.h
-@@ -23,6 +23,7 @@
- 
- #include <sal/types.h>
- 
-+#include <libxml/parser.h>
- #include <xmlsec/base64.h>
- #include <xmlsec/bn.h>
- #include <xmlsec/errors.h>
-diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx
-index a49ccef1894c..a5863ffd0e2a 100644
---- a/xmlsecurity/inc/xmlsec/saxhelper.hxx
-+++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx
-@@ -23,6 +23,7 @@
- 
- #include <string_view>
- 
-+#include <libxml/parser.h>
- #include <libxml/tree.h>
- 
- #include <rtl/ustring.hxx>
--- 
-cgit v1.2.1
-

diff --git a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
deleted file mode 100644
index f670c0d85276..000000000000
--- a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
+++ /dev/null
@@ -1,668 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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 flag-o-matic java-pkg-opt-2 multiprocessing 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=(
-	# not packaged in Gentoo
-	"${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
-	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
-	"${ADDONS_URI}/dtoa-20180411.tgz"
-	# not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
-	"${ADDONS_URI}/frozen-1.1.1.tar.gz"
-	# not packaged in Gentoo, https://skia.org/
-	"${ADDONS_URI}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"
-	"base? (
-		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
-		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	)"
-	"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 base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	base? ( java )
-	bluetooth? ( dbus )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-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.21
-	>=app-text/libnumbertext-1.0.6
-	>=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.6.2:0=
-	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.18.0:0/0.18
-	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.35:=[nss]
-	>=games-engines/box2d-2.4.1:0
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.11.0-r1:2
-	>=media-libs/harfbuzz-5.1.0:=[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/libjpeg-turbo:=
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libwebp:=
-	media-libs/libzmf
-	media-libs/openjpeg:=
-	media-libs/tiff:=
-	media-libs/zxing-cpp:=
-	net-misc/curl
-	sci-mathematics/lpsolve:=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	accessibility? (
-		$(python_gen_cond_dep '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-0.40.0
-		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? (
-		app-accessibility/at-spi2-core:2
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl(+)]
-		x11-libs/gtk+:3[X]
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	ldap? ( net-nds/openldap:= )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	!mariadb? ( dev-db/mysql-connector-c:= )
-	pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# 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.1
-	dev-util/mdds:1/2.1
-	media-libs/glm
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-11
-	)
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-		media-fonts/liberation-fonts
-	)
-	valgrind? ( dev-debug/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/libreoffice
-	acct-user/libreoffice
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-11 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
-	dev-util/intltool
-	sys-apps/which
-	app-alternatives/yacc
-	app-alternatives/lex
-	sys-devel/gettext
-	virtual/pkgconfig
-	clang? (
-		|| (
-			(	sys-devel/clang:18
-				sys-devel/llvm:18
-				=sys-devel/lld-18*	)
-			(	sys-devel/clang:17
-				sys-devel/llvm:17
-				=sys-devel/lld-17*	)
-			(	sys-devel/clang:16
-				sys-devel/llvm:16
-				=sys-devel/lld-16*	)
-			(	sys-devel/clang:15
-				sys-devel/llvm:15
-				=sys-devel/lld-15*	)
-		)
-	)
-	odk? ( >=app-text/doxygen-1.8.4 )
-"
-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.
-	RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
-	# maybe upstreamable
-	"${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
-
-	# 24.2 branch
-	"${FILESDIR}/${PN}-7.5.9.2-libxml2-2.12.patch" # bug 917691
-)
-
-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 base ||
-		ewarn "If you plan to use Base application you must enable USE base."
-	use java ||
-		ewarn "Without USE java, several wizards are not going to be available."
-
-	[[ ${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
-
-	# 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@gentoo.org for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# Show flags set at the beginning
-	einfo "Preset CFLAGS:    ${CFLAGS}"
-	einfo "Preset LDFLAGS:   ${LDFLAGS}"
-
-	# Workaround for bug #915067
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	if use clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-		LDFLAGS+=" -fuse-ld=lld"
-
-		# Workaround for bug #907905
-		filter-lto
-
-		# Not implemented by Clang, bug #903889
-		filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
-	else
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-
-		# Apparently the Clang flags get used even for GCC builds sometimes.
-		# bug #838115
-		sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
-	fi
-
-	if use custom-cflags ; then
-		elog "USE=custom-cflags has been selected. You are on your own to make sure that"
-		elog "the build succeeds. Good luck!"
-	else
-		strip-flags
-	fi
-
-	export LO_CLANG_CC=${CC}
-	export LO_CLANG_CXX=${CXX}
-
-	# Show flags set at the end
-	einfo "  Used CFLAGS:    ${CFLAGS}"
-	einfo "  Used LDFLAGS:   ${LDFLAGS}"
-
-	# Ensure we use correct toolchain
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
-	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-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-bundle-mariadb
-		--disable-ccache
-		--disable-epm
-		--disable-fetch-external
-		--disable-gtk3-kde5
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--disable-qt6
-		--with-extra-buildid="${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-openjpeg
-		--with-tls=nss
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--with-help="html"
-		--without-helppack-integration
-		--with-system-gpgmepp
-		--without-system-abseil
-		--without-system-dragonbox
-		--without-system-frozen
-		--without-system-jfreereport
-		--without-system-libfixmath
-		--without-system-sane
-		$(use_enable base report-builder)
-		$(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 kde kf5)
-		$(use_enable kde qt5)
-		$(use_enable ldap)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable vulkan skia)
-		$(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)
-		$(use_with valgrind)
-	)
-
-	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_HOME}"
-		)
-
-		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 rhino.jar) )
-	fi
-
-	tc-is-lto && myeconfargs+=( --enable-lto )
-
-	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
-	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
-
-	default
-}
-
-src_test() {
-	emake unitcheck
-	emake slowcheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" distro-pack-install -o build -o check
-
-	# 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
-
-	# bug 703474
-	insinto /usr/include
-	doins -r include/LibreOfficeKit
-
-	local lodir=/usr/$(get_libdir)/libreoffice
-	# patching this would break tests
-	cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
-	sed -e "/^import sys/d" -e "/^import os/d" \
-		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
-	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
-	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
-	# more system pyuno mess
-	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
-		-i "${D}"${lodir}/program/officehelper.py || die
-
-	python_optimize "${D}"${lodir}/program
-	# link python bridge in site-packages, bug 667802
-	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
-	for py in uno.py unohelper.py officehelper.py; do
-		dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
-		while IFS="" read -d $'\0' -r pyc; do
-			pyc=${pyc//*\/}
-			dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
-		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
-	done
-
-	newinitd "${FILESDIR}/libreoffice.initd" libreoffice
-	newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}