gentoo auto-resync : 07:01:2024 - 12:53:51

author: V3n3RiX <venerix@koprulu.sector> 2024-01-07 12:53:51 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2024-01-07 12:53:51 +0000
commit: 02814fd00146251691678aa18d9937665c677086 (patch)
tree: 5408cf868c128b241de5bab0f807058065bea7c8 /app-office/libreoffice
parent: 79713e75fcc5c5cb55d1b1beac008683b57c8805 (diff)
7 files changed, 4 insertions, 2364 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a10d2e88b3a8..f5c13511659e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -2,9 +2,7 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a
 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
 AUX libreoffice-7.2.0.4-qt5detect.patch 536 BLAKE2B fd77876d1ca3973ad30c9ebb60bf28e163dd29dcaebaa2b94d84f4c2ab060617d96f4df3d5114f17f882b0cb8b9e2ecdb284fdd1e4aaf8a34cc0c1f06a295c04 SHA512 e1ac7dfc4743cbdea3050b18c1714d06c8bcca4abc51d56e13362c8379fbdd3d37a1916c962fcb1389783c9b1fd72783c9ee45fbb649538ca0fc0cb7b05bcacf
 AUX libreoffice-7.5.6.2-gcc-14.patch 2056 BLAKE2B 1bc549e8afcb2720f2c25b7df1facd4aabf239dd91e85014c5cf33392718a81408e0318f300ad297795f5c7f0dbf1ad7fd8d48428f54f56523c439a9137ab185 SHA512 0579a167aed562c40dfe949459d9d8417fbd27e5cfdd2fa952b34c8207e8e6064a466a1fdf22780eb91cfb0e0cc788c7d99b9f0145249025e18acba14f2e07b2
-AUX libreoffice-7.5.8.2-curl-8.3.0-mitigation.patch 11727 BLAKE2B a3c82b6802595b61ea6967b616820057ea6548626b6833e79c68345eb1e4317a7f8e26d3be737dc4cb37ed87e0add1aab5854fb761652f4d53fb406e66a521c1 SHA512 1a94ddfee57e2e1bd9794164682de11347cb4134b46da54748871d3684c0b2b63f2025eeeca5d74c6883f0b18a5393371d162cbbd27de38733c136c607215660
 AUX libreoffice-7.5.8.2-icu-74-compatibility.patch 5299 BLAKE2B b1c12af133c48ef3e586c41f2fa1cd4b7b6c4d7e93d783ada5c3670a30eb7e2bf3039df242d2f186270810b479621b38f4e91cde6428ee6453170eaffe326a56 SHA512 d64618c007d35ea873d25c7e40058fdc50de29ce1fe2c573aa8b9d628094d681af8ef31e4cd992b0baa996b097dec9c0a28e4d5881ac17b7916ec3bf330f4128
-AUX libreoffice-7.5.8.2-libcmis-0.6.patch 1501 BLAKE2B c9ca894061e1439ead362432d969a27ea8ae96d2a86baec46085ec3e9e62871ea127f52afa9be5ef214e5e9b91d8cf9600610c1867d14ea0230ecafb519c42ce SHA512 9fea4cc4e4378e48faa0b27db8d0308c50d974ff8fa3cc971bc4cad3f9b08467ab97c44e03424dd1f0fa73f27826cb6403bac04ae0879c6b8e3a0436110675c9
 AUX libreoffice-7.5.9.2-libxml2-2.12.patch 12445 BLAKE2B 3675c092e6a6d5f357a623fd0381faf53d20f66a555895450f0b437b0ca709a9bb2453a351abcf2e5caaad17dcaa8a9bebf2ede559ad6311c5f382088f44e460 SHA512 ffe0c6a3c696bf7549dcd4b6907d35b271361a53aa730502569b5073ecef15747f40886a554da0b369f549ab2fccb897dba7c1c04332f9271ba98d9ac11dc6ea
 AUX libreoffice.confd 228 BLAKE2B 7b9ed0d08b91b6e78dd3a2ac242cac48ef141c25bf25713b5fa6c4fdea3d5b0e16b4073a864fbec328edf4008729869fba5236e9cc113ba9bd3d6de5c10153c3 SHA512 6718cfd481b4349d70b718d4811f80ac0eff60d465b9f9eeff8ab9641de1fecb6197023f98bb1fca77a57b48ae2d8e38803f3af3a51191b1df71aa8cc5d33661
 AUX libreoffice.initd 507 BLAKE2B d49fd0f48254160fff3eb90a75294c6cf044805352a982ab3d2127426a18a6171e5043c071b59581a1f927a7c499c8abb58820081c6ba6e285097c883917f0e3 SHA512 fee4720898510b1aa07a9ed597d041d1e1edfb8f8b8e9596ef4254d4d3c1e8a959bbd65202a377289910ed28283f9c8a4bdc893d2d0835f37ee28cd3c7cb010d
@@ -29,18 +27,11 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e
 DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
-DIST libreoffice-7.5.6.2.tar.xz 270583764 BLAKE2B f30ec810cfa2c465efa5dfe6488d3c9c9f428d3f3b103c5bbf7290f0704c2c01c1a1936973f4ada386da9cf6bf162ce816f4d48ed9e0e4f6da581532adc4e7a3 SHA512 12847528621cf34cce858a5a067ef296094d4371544fd3b70327c52968289d22457064fd413f88afd6161822526bf17f43c7e6c8816a1d7ea64642438cf5c6d7
-DIST libreoffice-7.5.8.2.tar.xz 270645960 BLAKE2B 6948d9bcf53aa8be45702a416acb9cf2220e7a2a37f1b3a635ebdd7eaff515f290883fc963cc7474b75195417e635db9690f5f3f6ba919db3877ab02c2231162 SHA512 e36677cab0ea3f5ed68dbdcd3e90d7611390447be838c7ce9e681991a31c10866f3743836e85fc65f638e41f5153522f1569db77189a348aef73f741ba2a3721
 DIST libreoffice-7.5.9.2.tar.xz 270609308 BLAKE2B 8fbbe665b31aa6b85d17fa279da44da87817b8521abf40d80a40383b726e6cfb4026f9db50ac0a9bea92e88dc8be96a922a6937992d35b3766fda54f9fa7377a SHA512 36a012c044d755b2a9c1b0cea42290239647bdf81af198245075d89e19fb25b0e404a71db6beff743f738f059a85818bc89adb051c24b09234a763f42008b6e1
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.5.6.2.tar.xz 166236964 BLAKE2B fb9110ab5555f915a1106493e0689606a969e2bc296df644815ef24b7344ec3c7562271f6c7eb4c1be14d52b9e78aa49291b70392c6595ffed26f8163914c5e4 SHA512 0c4441058d57abb967c4c403bec432141663de07416eeb101ac180472bd45e8cc428e8357ee1443e340ad1ea60516a989ce3044530d64b07fface6cad3993434
-DIST libreoffice-help-7.5.8.2.tar.xz 166237912 BLAKE2B b98875bb372ccebd5b92cf9a0effa38ed4dbd189e6ec72c31a3458133c67d4e8b91ce742a0e37478413d0c56799bb030380415617f14a72ac8e74f1a93091cd9 SHA512 aaac46ffeb6fa06fa535d097cf76ca02e52d15864e9fb3c1a80ada80710284cfaf79119273334f1ae38290abc7b4849609737ee4a15f97a41d747481d9b3314a
 DIST libreoffice-help-7.5.9.2.tar.xz 166236976 BLAKE2B c4c6c1e0ace4ebf43f1110edc21d9debb42b3a3756320ebec7d6e9f42b258c6d959a45778a4fc60aba85b4e7e852dbd9089a5694e32d37f5aa39f84ce826a18f SHA512 a3ad0005d0b09f0cc221a92f822c666a2d954cbf74d5f7c16e083cfaa4cfbc7a442d12dbcb51a3eaf3a7b3bd774f17614d79b6ec7553cec46edcb341c97ecf5b
 DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
 DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
-EBUILD libreoffice-7.5.6.2.ebuild 19508 BLAKE2B a12bf03111640e607a873110f17d1e2097b27d6e7c6a6a4d0f5b16fe1e440c7a36cc376dfeabaf831c1984637b29e7c3dadf3ef70598811846941c0068426fdd SHA512 4313cde8bb9aca1da06284cd3fab82e4f847d076829df939505c6160fe7919b0b81f2863319e03b50f02d4034386bffd7ee8276bd20adbd90102df8f13256969
-EBUILD libreoffice-7.5.8.2-r2.ebuild 19806 BLAKE2B 8359f36a067819cbaec66116120b54734f17b84df9e5026a2ba60124fa0bd7454e1dcf9e436b3049fbbe738e37bc576195f31265f36fb3563a01c7be9a61f444 SHA512 a6644854c6974ecb91aa6ca37bd6406cbfa17aa045302023247400eacce2d7783f5faf8b1fda797c128d259807b874a735b216bc1b17d23289959a1f1e3c9395
-EBUILD libreoffice-7.5.8.2.ebuild 19586 BLAKE2B 455f43625e0b355ee283fdc5cb9e13937143f4e1350462046febd6c3ecb9d6c53cdc88442a6132cb857d02e057904a56a12706505345a548d8bb3e8d9906b77d SHA512 f5fc3841688adf83dc6e6811fdc84f7343fba592e3468d12784778a99003c60d198edb1cd88ea38e62ce14c4bb3c5646e186e082185a1b87ba2dd169f89790ec
 EBUILD libreoffice-7.5.9.2.ebuild 19757 BLAKE2B 5a85415d393aaabb1b7384435b63813ed5b437df93ce9a07ee5410dda2fa292724ccb639b2384cbacf19b11df581e4e9a0df586036d1b802216a4100e737bdd4 SHA512 8cdc5a7dac90a6db3a76fbe5831217166ce3cf0a5defed805c5748c8c640e5685e4279026545a22035904f83714e1cd67e7132a464f0c7831bcf1ef519e2df5e
-EBUILD libreoffice-9999.ebuild 19511 BLAKE2B f2843e53964f04678ddf769bed6aab395b308c81b5e163d73fc42558a3f7a722821cff8d221ac4ff73ae90cffea4a045304c450318800153266fc69c7b283472 SHA512 558ac6afc77e3c745d022fe1ff3daab63b63fc1c3fc8b5a6ae531d1f9104f8907959fe0689a8faa901f489bc88d4d05d64b562309c668322331694d803342bde
+EBUILD libreoffice-9999.ebuild 19511 BLAKE2B c377898d882cfa62e386d11ad70ab05370cfb5caebcdda6be557df36300474923c4166b5de54f6b7cddd19e36b2ce0b8fc7c5952ab52fc59b61b8655c6e874fb SHA512 97a26bd7b2e13fe95c7930eba02f82694f8b1491c89ed5e9f795dc2008c0a3f9f5fce60cb0074992ec06608d9889bfb2369cff55e4feea5b111659425c0b9fc7
 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
diff --git a/app-office/libreoffice/files/libreoffice-7.5.8.2-curl-8.3.0-mitigation.patch b/app-office/libreoffice/files/libreoffice-7.5.8.2-curl-8.3.0-mitigation.patch
deleted file mode 100644
index 78afc0e88692..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.5.8.2-curl-8.3.0-mitigation.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-From 045bef390a025c3615d904524bf5ee21fa697ca4 Mon Sep 17 00:00:00 2001
-From: Michael Stahl <michael.stahl@allotropia.de>
-Date: Fri, 3 Nov 2023 20:16:09 +0100
-Subject: [PATCH] curl: mitigate migration to OpenSSL on Linux
-
-The problem is that curl 8.3.0 removed the NSS backend, so we now
-have no other choice than to use the bundled OpenSSL on Linux.
-
-Currently any curl https connection fails with:
-
-  CurlSession.cxx:963: curl_easy_perform failed: (60) SSL certificate problem: unable to get local issuer certificate
-
-Apparently this requires manually telling curl which CA certificates to
-trust; there is a configure flag --with-ca-bundle but that is useless as
-it tries to load the file relative to whatever is the current working
-directory, and also did i mention that there are at least 3 different
-locations where a Linux system may store its system trusted CA
-certificates because ALL ABOUT CHOICE.
-
-So add a new header with an init function to try out various file
-locations listed in this nice blog article and call it from way too many
-places that independently use curl.
-
-https://www.happyassassin.net/posts/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/
-
-TODO: perhaps bundle a cacert.pem as a fallback in case the system chose
-to innovate by putting its certificates in yet another unexpected place
-
-(regression from commit c2930ebff82c4f7ffe8377ab82627131f8544226)
-
-Change-Id: Ibf1cc0069bc2ae011ecead9a4c2b455e94b01241
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158915
-Tested-by: Jenkins
-Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-(cherry picked from commit 11f439b861922b9286b2e47ed326f3508a48d44e)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159125
-Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
----
- desktop/source/app/updater.cxx                |  4 ++
- desktop/source/minidump/minidump.cxx          |  4 ++
- extensions/source/update/check/download.cxx   |  4 ++
- include/curlinit.hxx                          | 59 +++++++++++++++++++
- .../languagetool/languagetoolimp.cxx          |  5 ++
- linguistic/source/translate.cxx               |  4 ++
- svl/source/crypto/cryptosign.cxx              |  6 ++
- ucb/source/ucp/cmis/cmis_content.cxx          |  5 ++
- ucb/source/ucp/ftp/ftploaderthread.cxx        |  4 ++
- ucb/source/ucp/webdav-curl/CurlSession.cxx    |  2 +
- 10 files changed, 97 insertions(+)
- create mode 100644 include/curlinit.hxx
-
-diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
-index 5fb18dfad0bf8..4e4d2cda413ff 100644
---- a/desktop/source/app/updater.cxx
-+++ b/desktop/source/app/updater.cxx
-@@ -37,6 +37,8 @@
- #include <orcus/json_document_tree.hpp>
- #include <orcus/config.hpp>
- #include <orcus/pstring.hpp>
-+
-+#include <curlinit.hxx>
- #include <comphelper/hash.hxx>
- 
- #include <com/sun/star/container/XNameAccess.hpp>
-@@ -546,6 +548,8 @@ std::string download_content(const OString& rURL, bool bFile, OUString& rHash)
-     if (!curl)
-         return std::string();
- 
-+    ::InitCurl_easy(curl.get());
-+
-     curl_easy_setopt(curl.get(), CURLOPT_URL, rURL.getStr());
-     curl_easy_setopt(curl.get(), CURLOPT_USERAGENT, kUserAgent);
-     bool bUseProxy = false;
-diff --git a/desktop/source/minidump/minidump.cxx b/desktop/source/minidump/minidump.cxx
-index 0bf20f2aa419e..7fbb0884987d8 100644
---- a/desktop/source/minidump/minidump.cxx
-+++ b/desktop/source/minidump/minidump.cxx
-@@ -17,6 +17,8 @@
- 
- #include <curl/curl.h>
- 
-+#include <curlinit.hxx>
-+
- #ifdef _WIN32
- #include <memory>
- #include <windows.h>
-@@ -95,6 +97,8 @@ static bool uploadContent(std::map<std::string, std::string>& parameters, std::s
-     if (!curl)
-         return false;
- 
-+    ::InitCurl_easy(curl);
-+
-     std::string proxy, proxy_user_pwd, ca_certificate_file, file, url, version;
- 
-     getProperty("Proxy", proxy, parameters);
-diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
-index ba371bdee570b..cdbbe2c327343 100644
---- a/extensions/source/update/check/download.cxx
-+++ b/extensions/source/update/check/download.cxx
-@@ -23,6 +23,8 @@
- 
- #include <curl/curl.h>
- 
-+#include <curlinit.hxx>
-+
- #include <o3tl/string_view.hxx>
- #include <osl/diagnose.h>
- #include <osl/file.h>
-@@ -222,6 +224,8 @@ static bool curl_run(std::u16string_view rURL, OutData& out, const OString& aPro
- 
-     if( nullptr != pCURL )
-     {
-+        ::InitCurl_easy(pCURL);
-+
-         out.curl = pCURL;
- 
-         OString aURL(OUStringToOString(rURL, RTL_TEXTENCODING_UTF8));
-diff --git a/include/curlinit.hxx b/include/curlinit.hxx
-new file mode 100644
-index 0000000000000..8b3a9968419da
---- /dev/null
-+++ b/include/curlinit.hxx
-@@ -0,0 +1,59 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
-+/*
-+ * This file is part of the LibreOffice project.
-+ *
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+ */
-+
-+#pragma once
-+
-+#include <curl/curl.h>
-+
-+#if defined(LINUX) && !defined(SYSTEM_CURL)
-+#include <com/sun/star/uno/RuntimeException.hpp>
-+
-+#include <unistd.h>
-+
-+static char const* GetCABundleFile()
-+{
-+    // try system ones first; inspired by:
-+    // https://www.happyassassin.net/posts/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/
-+    auto const candidates = {
-+        "/etc/pki/tls/certs/ca-bundle.crt",
-+        "/etc/pki/tls/certs/ca-bundle.trust.crt",
-+        "/etc/ssl/certs/ca-certificates.crt",
-+        "/var/lib/ca-certificates/ca-bundle.pem",
-+    };
-+    for (char const* const candidate : candidates)
-+    {
-+        if (access(candidate, R_OK) == 0)
-+        {
-+            return candidate;
-+        }
-+    }
-+
-+    throw css::uno::RuntimeException("no OpenSSL CA certificate bundle found");
-+}
-+
-+static void InitCurl_easy(CURL* const pCURL)
-+{
-+    char const* const path = GetCABundleFile();
-+    auto rc = curl_easy_setopt(pCURL, CURLOPT_CAINFO, path);
-+    if (rc != CURLE_OK) // only if OOM?
-+    {
-+        throw css::uno::RuntimeException("CURLOPT_CAINFO failed");
-+    }
-+}
-+
-+#else
-+
-+static void InitCurl_easy(CURL* const)
-+{
-+    // these don't use OpenSSL so CAs work out of the box
-+}
-+
-+#endif
-+
-+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
-diff --git a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
-index 4fa88ac0118f4..455fa12803d51 100644
---- a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
-+++ b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
-@@ -35,6 +35,9 @@
- #include <boost/property_tree/json_parser.hpp>
- #include <algorithm>
- #include <string_view>
-+
-+#include <curlinit.hxx>
-+
- #include <sal/log.hxx>
- #include <svtools/languagetoolcfg.hxx>
- #include <tools/color.hxx>
-@@ -336,6 +339,8 @@ std::string LanguageToolGrammarChecker::makeHttpRequest(std::string_view aURL, H
-     if (!curl)
-         return {}; // empty string
- 
-+    ::InitCurl_easy(curl.get());
-+
-     bool isPremium = false;
-     SvxLanguageToolOptions& rLanguageOpts = SvxLanguageToolOptions::Get();
-     OString apiKey = OUStringToOString(rLanguageOpts.getApiKey(), RTL_TEXTENCODING_UTF8);
-diff --git a/linguistic/source/translate.cxx b/linguistic/source/translate.cxx
-index 12f5491e21297..fdd95fca2988e 100644
---- a/linguistic/source/translate.cxx
-+++ b/linguistic/source/translate.cxx
-@@ -4,6 +4,7 @@
- #include <rtl/string.h>
- #include <boost/property_tree/ptree.hpp>
- #include <boost/property_tree/json_parser.hpp>
-+#include <curlinit.hxx>
- #include <vcl/htmltransferable.hxx>
- #include <tools/long.hxx>
- 
-@@ -16,6 +17,9 @@ OString Translate(const OString& rTargetLang, const OString& rAPIUrl, const OStr
- 
-     std::unique_ptr<CURL, std::function<void(CURL*)>> curl(curl_easy_init(),
-                                                            [](CURL* p) { curl_easy_cleanup(p); });
-+
-+    ::InitCurl_easy(curl.get());
-+
-     (void)curl_easy_setopt(curl.get(), CURLOPT_URL, rAPIUrl.getStr());
-     (void)curl_easy_setopt(curl.get(), CURLOPT_FAILONERROR, 1L);
-     (void)curl_easy_setopt(curl.get(), CURLOPT_TIMEOUT, CURL_TIMEOUT);
-diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
-index 1d63378455690..b5e2eb0155e13 100644
---- a/svl/source/crypto/cryptosign.cxx
-+++ b/svl/source/crypto/cryptosign.cxx
-@@ -15,6 +15,10 @@
- #include <svl/sigstruct.hxx>
- #include <config_crypto.h>
- 
-+#if USE_CRYPTO_NSS
-+#include <curlinit.hxx>
-+#endif
-+
- #include <rtl/character.hxx>
- #include <rtl/strbuf.hxx>
- #include <rtl/string.hxx>
-@@ -1081,6 +1085,8 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer)
-             return false;
-         }
- 
-+        ::InitCurl_easy(curl);
-+
-         SAL_INFO("svl.crypto", "Setting curl to verbose: " << (curl_easy_setopt(curl, CURLOPT_VERBOSE, 1) == CURLE_OK ? "OK" : "FAIL"));
- 
-         if ((rc = curl_easy_setopt(curl, CURLOPT_URL, OUStringToOString(m_aSignTSA, RTL_TEXTENCODING_UTF8).getStr())) != CURLE_OK)
-diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
-index 0bd38ea31f651..2ec1c336a706b 100644
---- a/ucb/source/ucp/cmis/cmis_content.cxx
-+++ b/ucb/source/ucp/cmis/cmis_content.cxx
-@@ -56,6 +56,8 @@
- #include <ucbhelper/proxydecider.hxx>
- #include <ucbhelper/macros.hxx>
- #include <sax/tools/converter.hxx>
-+#include <curlinit.hxx>
-+
- #include <utility>
- 
- #include "auth_provider.hxx"
-@@ -335,6 +337,9 @@ namespace cmis
-                     new CertValidationHandler( xEnv, m_xContext, aBindingUrl.GetHost( ) ) );
-             libcmis::SessionFactory::setCertificateValidationHandler( certHandler );
- 
-+            // init libcurl callback
-+            libcmis::SessionFactory::setCurlInitProtocolsFunction(&::InitCurl_easy);
-+
-             // Get the auth credentials
-             AuthProvider aAuthProvider(xEnv, m_xIdentifier->getContentIdentifier(), m_aURL.getBindingUrl());
-             AuthProvider::setXEnv( xEnv );
-diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
-index f5ebfe36cdda5..91130fc1bc9cf 100644
---- a/ucb/source/ucp/ftp/ftploaderthread.cxx
-+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
-@@ -25,6 +25,8 @@
- #include "ftploaderthread.hxx"
- #include "curl.hxx"
- 
-+#include <curlinit.hxx>
-+
- using namespace ftp;
- 
- 
-@@ -75,6 +77,8 @@ CURL* FTPLoaderThread::handle() {
-     if(!ret) {
-         ret = curl_easy_init();
-         if (ret != nullptr) {
-+            ::InitCurl_easy(ret);
-+
-             // Make sure curl is not internally using environment variables like
-             // "ftp_proxy":
-             if (curl_easy_setopt(ret, CURLOPT_PROXY, "") != CURLE_OK) {
-diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx
-index 4839a1f85e03d..346d58b5969d5 100644
---- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
-+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
-@@ -34,6 +34,7 @@
- #include <rtl/uri.hxx>
- #include <rtl/strbuf.hxx>
- #include <rtl/ustrbuf.hxx>
-+#include <curlinit.hxx>
- #include <config_version.h>
- 
- #include <map>
-@@ -679,6 +680,7 @@ CurlSession::CurlSession(uno::Reference<uno::XComponentContext> xContext,
-     assert(rc == CURLE_OK);
-     rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_HEADERFUNCTION, &header_callback);
-     assert(rc == CURLE_OK);
-+    ::InitCurl_easy(m_pCurl.get());
-     // tdf#149921 by default, with schannel (WNT) connection fails if revocation
-     // lists cannot be checked; try to limit the checking to when revocation
-     // lists can actually be retrieved (usually not the case for self-signed CA)
diff --git a/app-office/libreoffice/files/libreoffice-7.5.8.2-libcmis-0.6.patch b/app-office/libreoffice/files/libreoffice-7.5.8.2-libcmis-0.6.patch
deleted file mode 100644
index ae029a3c9a2c..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.5.8.2-libcmis-0.6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e9320e567d6bca32783d0f716f386761d03a875a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
-Date: Mon, 13 Nov 2023 10:13:50 +0000
-Subject: upgrade libcmis
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Change-Id: Ie2d5f3f8208f9952db5be10905b5905cd03b91de
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159366
-Tested-by: Jenkins
-Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
-(cherry picked from commit 3368447e826d4204086e4d8bfe59af4412c16233)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159454
-Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-(cherry picked from commit 25b159729f1202ca2a42de5e76f22718d68400c8)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159589
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'configure.ac')
-
-diff --git a/configure.ac b/configure.ac
-index a88c81646c40..bdd08abeeeb5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7532,7 +7532,7 @@ AC_SUBST(GPERF)
- dnl ===================================================================
- dnl Check for system libcmis
- dnl ===================================================================
--libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.2],enabled)
-+libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.6 >= 0.6.1],enabled)
- 
- dnl ===================================================================
- dnl C++11
--- 
-cgit v1.2.1
-
diff --git a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
deleted file mode 100644
index 7ec34f336fdf..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
+++ /dev/null
@@ -1,661 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-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} )"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
-[[ -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://skia.org/
-	"${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.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.5.2-r2
-	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.17.2:0/0.17
-	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
-		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.0
-	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-util/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
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	clang? (
-		|| (
-			(	sys-devel/clang:16
-				sys-devel/llvm:16
-				=sys-devel/lld-16*	)
-			(	sys-devel/clang:15
-				sys-devel/llvm:15
-				=sys-devel/lld-15*	)
-			(	sys-devel/clang:14
-				sys-devel/llvm:14
-				=sys-devel/lld-14*	)
-		)
-	)
-	odk? ( >=app-doc/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"
-
-	# git master
-	"${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
-	"${FILESDIR}/${PN}-7.5.6.2-gcc-14.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 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-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
-
-	is-flagq "-flto*" && 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
-}
diff --git a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
deleted file mode 100644
index 984ca1c390bb..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
+++ /dev/null
@@ -1,671 +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} )"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
-[[ -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://skia.org/
-	"${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.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.17.2:0/0.17
-	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
-		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.0
-	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-util/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
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	clang? (
-		|| (
-			(	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*	)
-			(	sys-devel/clang:14
-				sys-devel/llvm:14
-				=sys-devel/lld-14*	)
-		)
-	)
-	odk? ( >=app-doc/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}/libreoffice-7.5.8.2-icu-74-compatibility.patch"
-
-	# 7.5.9.1
-	"${FILESDIR}/${P}-libcmis-0.6.patch" # prerequisite for below
-	"${FILESDIR}/${P}-curl-8.3.0-mitigation.patch" # bug 891903(?)
-
-	# git master
-	"${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
-	"${FILESDIR}/${PN}-7.5.6.2-gcc-14.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 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-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
-
-	is-flagq "-flto*" && 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
-}
diff --git a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
deleted file mode 100644
index c0a3d703ff40..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
+++ /dev/null
@@ -1,664 +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} )"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
-[[ -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://skia.org/
-	"${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.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.5.2-r2: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.17.2:0/0.17
-	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
-		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.0
-	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-util/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
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	clang? (
-		|| (
-			(	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*	)
-			(	sys-devel/clang:14
-				sys-devel/llvm:14
-				=sys-devel/lld-14*	)
-		)
-	)
-	odk? ( >=app-doc/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"
-
-	# git master
-	"${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
-	"${FILESDIR}/${PN}-7.5.6.2-gcc-14.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 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-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
-
-	is-flagq "-flto*" && 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
-}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3341480b61da..15e07e5ccb7c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -264,6 +264,9 @@ BDEPEND="
 	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*	)
@@ -273,9 +276,6 @@ BDEPEND="
 			(	sys-devel/clang:15
 				sys-devel/llvm:15
 				=sys-devel/lld-15*	)
-			(	sys-devel/clang:14
-				sys-devel/llvm:14
-				=sys-devel/lld-14*	)
 		)
 	)
 	odk? ( >=app-doc/doxygen-1.8.4 )
author	V3n3RiX <venerix@koprulu.sector>	2024-01-07 12:53:51 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2024-01-07 12:53:51 +0000
commit	02814fd00146251691678aa18d9937665c677086 (patch)
tree	5408cf868c128b241de5bab0f807058065bea7c8 /app-office/libreoffice
parent	79713e75fcc5c5cb55d1b1beac008683b57c8805 (diff)