commit:     3b226f6138e966e0629120e37d47a7f4412d6442
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 13:15:26 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 13:31:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b226f61

app-office/libreoffice: Drop 7.0.3.1

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

 app-office/libreoffice/Manifest                    |   2 -
 ...reoffice-7.0.3.1-fix-disable-pdfium-build.patch |  82 ---
 app-office/libreoffice/libreoffice-7.0.3.1.ebuild  | 664 ---------------------
 3 files changed, 748 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ccd5560cf58..788ba8b0c10 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,10 +18,8 @@ DIST dtoa-20180411.tgz 48893 BLAKE2B 
4a03dc67e44353ae1c0653c8305d2df9bcfef16b48d
 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B 
d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff
 SHA512 
9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 
2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b
 SHA512 
c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 
1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b
 SHA512 
ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
-DIST libreoffice-7.0.3.1.tar.xz 240706432 BLAKE2B 
4bf075fedb445a60a971adfb029fb7843afab1ee2009d32b149c91970d8eae990e4ac3ea7075d58815288f1f174846e0e9de7ce00655840ad97622a3790b43a2
 SHA512 
1680b5166ead7ca521130f7d23cb2bd73d3d4f801f94c9a3ab0066fb7763ced3c01d89fbe1b7a79a1826bcfd6ebcd3ce5fb3014ab6583034f08ed25969ab5f36
 DIST libreoffice-7.0.4.2.tar.xz 236477520 BLAKE2B 
859b5873444163f0493f7b7c4d7bd0c65d99b8de474e45c79f9ff2d04d5db6dc9b78c43b545c536156237c9937d34874c5ffafa0476e78c025bd3fd5a04af352
 SHA512 
cc65497b8d27f0e48ebfc5fa66b09d45948febe9454149300b447d9a6aafecd4be728403c3095c058852b9dc53570841d612bc196979f25595f6b8981f706d4b
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 
9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794
 SHA512 
a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
-DIST libreoffice-help-7.0.3.1.tar.xz 110855688 BLAKE2B 
3b0e845087fe0bd25ad3c06b8a8eac548f05568cf279efc10f7190ee51e8a9922c64749ad57c21b150aaac9b3249a6e184583f389a191fc6b86128153ff363be
 SHA512 
1acbc7575da99ce0a09a3092a8612f47c432ffd8d4b6029c885c782a857c6b0812bb2eee3873b0cdfa41ee42f84a0843c3d06109ccb651b5bba5ade1a6725a78
 DIST libreoffice-help-7.0.4.2.tar.xz 110758084 BLAKE2B 
0e5478613da0745b34914847137aed240a16fb3ab753935295500f414657a2be27359f6426f089205f614afd43d4b5d0e5d0adcc6240ac3d24c0428cb9c42941
 SHA512 
ba346fa8ee015479d799d9d0b2a315cb901071b5fba2c4d7eba2eeba41dd4cac72210d12542704220c8cbb82d6a7b37a9285c1933fe2407e8e149510df4d58fe
 DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 
8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe
 SHA512 
4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1

diff --git 
a/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch
 
b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch
deleted file mode 100644
index 346699d5527..00000000000
--- 
a/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From b9e5d5347e5dece693fe56b88570abc07a30a8ba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caol...@redhat.com>
-Date: Thu, 29 Oct 2020 15:45:01 +0000
-Subject: [PATCH] fix --disable-pdfium build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Change-Id: I580972220bc39abe16288fa62c717e4ab25833d9
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105015
-Tested-by: Jenkins
-Tested-by: René Engelhard <r...@debian.org>
-Reviewed-by: René Engelhard <r...@debian.org>
-Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
----
- vcl/source/filter/ipdf/pdfread.cxx       |  2 +-
- xmlsecurity/source/pdfio/pdfdocument.cxx | 11 +++++++----
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
-index 3066c4deba4a..bf11578089e0 100644
---- a/vcl/source/filter/ipdf/pdfread.cxx
-+++ b/vcl/source/filter/ipdf/pdfread.cxx
-@@ -218,7 +218,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, 
std::vector<Bitmap>& rBi
-     (void)rBitmaps;
-     (void)nFirstPage;
-     (void)nPages;
--    (void)fResolutionDPI;
-+    (void)pSizeHint;
-     return 0;
- #endif // HAVE_FEATURE_PDFIUM
- }
-diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
-index c132d02cc2b0..b229206391f2 100644
---- a/xmlsecurity/source/pdfio/pdfdocument.cxx
-+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
-@@ -138,10 +138,10 @@ bool IsCompleteSignature(SvStream& rStream, 
vcl::filter::PDFDocument& rDocument,
-     return std::find(rAllEOFs.begin(), rAllEOFs.end(), nFileEnd) != 
rAllEOFs.end();
- }
- 
-+#if HAVE_FEATURE_PDFIUM
- /// Collects the checksum of each page of one version of the PDF.
- void AnalyizeSignatureStream(SvMemoryStream& rStream, 
std::vector<BitmapChecksum>& rPageChecksums)
- {
--#if HAVE_FEATURE_PDFIUM
-     auto pPdfium = vcl::pdf::PDFiumLibrary::get();
-     vcl::pdf::PDFiumDocument aPdfDocument(
-         FPDF_LoadMemDocument(rStream.GetData(), rStream.GetSize(), 
/*password=*/nullptr));
-@@ -158,10 +158,8 @@ void AnalyizeSignatureStream(SvMemoryStream& rStream, 
std::vector<BitmapChecksum
-         BitmapChecksum nPageChecksum = pPdfPage->getChecksum();
-         rPageChecksums.push_back(nPageChecksum);
-     }
--#else
--    (void)rStream;
--#endif
- }
-+#endif
- 
- /**
-  * Checks if incremental updates after singing performed valid modifications 
only.
-@@ -175,6 +173,7 @@ bool IsValidSignature(SvStream& rStream, 
vcl::filter::PDFObjectElement* pSignatu
-         return false;
-     }
- 
-+#if HAVE_FEATURE_PDFIUM
-     SvMemoryStream aSignatureStream;
-     sal_uInt64 nPos = rStream.Tell();
-     rStream.Seek(0);
-@@ -196,6 +195,10 @@ bool IsValidSignature(SvStream& rStream, 
vcl::filter::PDFObjectElement* pSignatu
-     // Fail if any page looks different after signing and at the end. 
Annotations/commenting doesn't
-     // count, though.
-     return aSignedPages == aAllPages;
-+#else
-+    (void)rStream;
-+    return true;
-+#endif
- }
- }
- 
--- 
-2.26.2
-

diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild 
b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
deleted file mode 100644
index 2d3f699e1f9..00000000000
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ /dev/null
@@ -1,664 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-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 eapi8-dosym 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, https://www.netlib.org/fp/dtoa.c
-       "${ADDONS_URI}/dtoa-20180411.tgz"
-       # not packaged in Gentoo, https://skia.org/
-       "${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"
-       # QR code generating library for >=libreoffice-6.4, bug #691740
-       "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
-       "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 vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-       base? ( firebird java )
-       bluetooth? ( dbus )
-       gtk? ( 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 ~amd64-linux"
-
-BDEPEND="
-       dev-util/intltool
-       sys-devel/bison
-       sys-devel/flex
-       sys-devel/gettext
-       virtual/pkgconfig
-       odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-       app-arch/unzip
-       app-arch/zip
-       app-crypt/gpgme[cxx]
-       app-text/hunspell:=
-       >=app-text/libabw-0.1.0
-       >=app-text/libebook-0.1
-       app-text/libepubgen
-       >=app-text/libetonyek-0.1
-       app-text/libexttextcat
-       app-text/liblangtag
-       >=app-text/libmspub-0.1.0
-       >=app-text/libmwaw-0.3.1
-       >=app-text/libnumbertext-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
-       dev-db/unixODBC
-       dev-lang/perl
-       >=dev-libs/boost-1.72.0:=[nls]
-       dev-libs/expat
-       dev-libs/hyphen
-       dev-libs/icu:=
-       dev-libs/libassuan
-       dev-libs/libgpg-error
-       dev-libs/liborcus:0/0.15
-       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.28[nss]
-       media-gfx/fontforge
-       media-gfx/graphite2
-       media-libs/fontconfig
-       media-libs/freetype:2
-       >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-       media-libs/lcms:2
-       >=media-libs/libcdr-0.1.0
-       >=media-libs/libepoxy-1.3.1[X]
-       >=media-libs/libfreehand-0.1.0
-       media-libs/libpagemaker
-       >=media-libs/libpng-1.4:0=
-       >=media-libs/libvisio-0.1.0
-       media-libs/libzmf
-       net-libs/neon
-       net-misc/curl
-       sci-mathematics/lpsolve
-       sys-libs/zlib
-       virtual/glu
-       virtual/jpeg:0
-       virtual/opengl
-       x11-libs/cairo[X]
-       x11-libs/libXinerama
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       accessibility? (
-               $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
-       )
-       bluetooth? (
-               dev-libs/glib:2
-               net-wireless/bluez
-       )
-       clang? (
-               || (
-                       (       sys-devel/clang:12
-                               sys-devel/llvm:12
-                               =sys-devel/lld-12*      )
-                       (       sys-devel/clang:11
-                               sys-devel/llvm:11
-                               =sys-devel/lld-11*      )
-                       (       sys-devel/clang:10
-                               sys-devel/llvm:10
-                               =sys-devel/lld-10*      )
-               )
-       )
-       coinmp? ( sci-libs/coinor-mp )
-       cups? ( net-print/cups )
-       dbus? ( sys-apps/dbus[X] )
-       eds? (
-               dev-libs/glib:2
-               gnome-base/dconf
-               gnome-extra/evolution-data-server
-       )
-       firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-       gstreamer? (
-               media-libs/gstreamer:1.0
-               media-libs/gst-plugins-base:1.0
-       )
-       gtk? (
-               dev-libs/glib:2
-               dev-libs/gobject-introspection
-               gnome-base/dconf
-               media-libs/mesa[egl]
-               x11-libs/gtk+:3
-               x11-libs/pango
-       )
-       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.6 )
-       mariadb? ( dev-db/mariadb-connector-c )
-       !mariadb? ( dev-db/mysql-connector-c )
-       pdfimport? ( app-text/poppler:=[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/1.5
-       media-libs/glm
-       sys-devel/ucpp
-       x11-base/xorg-proto
-       x11-libs/libXt
-       x11-libs/libXtst
-       java? (
-               dev-java/ant-core
-               || (
-                       dev-java/openjdk:11
-                       dev-java/openjdk-bin:11
-               )
-       )
-       test? (
-               app-crypt/gnupg
-               dev-util/cppunit
-               media-fonts/dejavu
-               media-fonts/liberation-fonts
-       )
-"
-RDEPEND="${COMMON_DEPEND}
-       !app-office/libreoffice-bin
-       !app-office/libreoffice-bin-debug
-       !app-office/openoffice
-       media-fonts/liberation-fonts
-       || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-       java? ( || (
-               dev-java/openjdk:11
-               dev-java/openjdk-jre-bin:11
-               >=virtual/jre-1.8
-       ) )
-       kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-       PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-       # Translations are not reliable on live ebuilds
-       # rather force people to use english only.
-       PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-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.0.3.1-qt5detect.patch"
-
-       # 7.0 branch
-       "${FILESDIR}/${P}-fix-disable-pdfium-build.patch"
-       "${FILESDIR}/${PN}-6.4.7.2-icu-68-1.patch" # bug 752021
-)
-
-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 chrom...@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}"
-
-       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"
-       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
-       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 CLANG_CC=${CC}
-       export 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
-
-       if use vulkan && ! use clang ; then
-               ewarn "Building skia with gcc may lead to performance issues. 
Disable vulkan or enable clang."
-       fi
-
-       # 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
-       # --without-system-qrcodegen: has no real build system and LO is the 
only user
-       local myeconfargs=(
-               --with-system-dicts
-               --with-system-epoxy
-               --with-system-headers
-               --with-system-jars
-               --with-system-libs
-               --enable-build-opensymbol
-               --enable-cairo-canvas
-               --enable-largefile
-               --enable-mergelibs
-               --enable-neon
-               --enable-python=system
-               --enable-randr
-               --enable-release-build
-               --disable-breakpad
-               --disable-bundle-mariadb
-               --disable-ccache
-               --disable-epm
-               --disable-fetch-external
-               --disable-gtk3-kde5
-               --disable-online-update
-               --disable-openssl
-               --disable-pdfium
-               --disable-vlc
-               --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-ucpp
-               --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-jfreereport
-               --without-system_apache_commons
-               --without-system-sane
-               --without-system-qrcodegen
-               $(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)
-       )
-
-       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}"
-               )
-               if has_version "dev-java/openjdk:11"; then
-                       myeconfargs+=( 
-with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
-               elif has_version "dev-java/openjdk-bin:11"; then
-                       myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
-               fi
-
-               use libreoffice_extensions_scripting-beanshell && \
-                       myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar 
bsh bsh.jar) )
-
-               use libreoffice_extensions_scripting-javascript && \
-                       myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar 
rhino-1.6 js.jar) )
-       fi
-
-       is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
-       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
-
-       local target
-       use test && target="build" || target="build-nocheck"
-
-       # this is not a proper make script
-       make ${target} || die
-}
-
-src_test() {
-       make unitcheck || die
-       make slowcheck || die
-}
-
-src_install() {
-       # This is not Makefile so no buildserver
-       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
-               dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
-               while IFS="" read -d $'\0' -r pyc; do
-                       pyc=${pyc//*\/}
-                       dosym8 -r ${loprogdir}/__pycache__/${pyc} 
$(python_get_sitedir)/__pycache__/${pyc}
-               done < <(find "${D}"${lodir}/program -type f -name 
${py/.py/*.pyc} -print0)
-       done
-
-       # bug 709450
-       mkdir -p "${ED}"/usr/share/metainfo || die
-       mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
-       rmdir "${ED}"/usr/share/appdata || die
-}
-
-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
-}

Reply via email to