commit:     83fd7509ad72bfa4ece9d51a86f296a9f0f12e2d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 13:12:15 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 21:59:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83fd7509

app-office/libreoffice: 6.4.7.2 version bump

- 6.4.7.2-fix-wrong-setting-for-doc-properties.patch:
  Upstream commit 188ddcd482150b5fdeb44d97e57831e3e27b3f5b
  LO-Bug: https://bugs.documentfoundation.org/show_bug.cgi?id=136983

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

 app-office/libreoffice/Manifest                    |   2 +
 ....7.2-fix-wrong-setting-for-doc-properties.patch |  75 +++
 app-office/libreoffice/libreoffice-6.4.7.2.ebuild  | 593 +++++++++++++++++++++
 3 files changed, 670 insertions(+)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 75423a5c62c..bd974fb80fb 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,6 +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.6.2.tar.xz 232180876 BLAKE2B 
b2e01cc8e56b36c16fc3e39ff88617d7c31d6b0a0f4a5c05c8536313e7129862fb962e1a6efc7e86e9b56c34dff7c2d895416f33fbb23dc45e447b25813b5654
 SHA512 
377675494d4422c4d9363fe3857a8587e38f6ccd39aebec9c23337aa3a88cb2526608b8d0bcb27985ed8f821a98ca541dad4b48d69db441bcb27e9fb81beb9ba
+DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 
1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b
 SHA512 
ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B 
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 
919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba
 SHA512 
8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501
+DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 
9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794
 SHA512 
a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
 DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B 
cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0
 SHA512 
1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb

diff --git 
a/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch
 
b/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch
new file mode 100644
index 00000000000..9c9d417cde9
--- /dev/null
+++ 
b/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch
@@ -0,0 +1,75 @@
+From 188ddcd482150b5fdeb44d97e57831e3e27b3f5b Mon Sep 17 00:00:00 2001
+From: Justin Luth <justin_l...@sil.org>
+Date: Mon, 28 Sep 2020 20:21:52 +0300
+Subject: tdf#136983 partial revert NFC ww8 cleanup: remove unused variables
+
+This is a partial revert of LO 6.2
+commit 2ec0cf500222aef55d02df80154b47fbb92970c9
+
+I can't think of any excuse for how I possibly missed that
+xDocProps was being defined/used outside of this clause.
+Just plain stupid and blind.
+
+The good news is that the create and modified date still
+seem to be getting saved somehow/somewhere. So it isn't
+the disaster that it looks like it could have been.
+
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103565
+Tested-by: Jenkins
+Reviewed-by: Justin Luth <justin_l...@sil.org>
+(cherry picked from commit 1086654d6e8cc22f1f99195668db3f305437e570)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104495
+Reviewed-by: Miklos Vajna <vmik...@collabora.com>
+(cherry picked from commit 19b8ded3ae18dd4070a3e21d7b980782a27e5547)
+
+Change-Id: I72ef56fa50b9e92e4ce687b132b1919cfae6c1f6
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104497
+Tested-by: Jenkins
+Reviewed-by: Miklos Vajna <vmik...@collabora.com>
+---
+ sw/qa/extras/ww8export/ww8export3.cxx | 5 +++++
+ sw/source/filter/ww8/wrtww8.cxx       | 6 +++++-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/sw/qa/extras/ww8export/ww8export3.cxx 
b/sw/qa/extras/ww8export/ww8export3.cxx
+index 764ae66a20fa..9c83b6f62fa9 100644
+--- a/sw/qa/extras/ww8export/ww8export3.cxx
++++ b/sw/qa/extras/ww8export/ww8export3.cxx
+@@ -14,6 +14,7 @@
+ #include <com/sun/star/container/XIndexAccess.hpp>
+ #include <com/sun/star/drawing/FillStyle.hpp>
+ #include <com/sun/star/drawing/LineDash.hpp>
++#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+ #include <com/sun/star/graphic/XGraphic.hpp>
+ #include <com/sun/star/text/XFormField.hpp>
+ #include <com/sun/star/text/XTextTable.hpp>
+@@ -49,6 +50,10 @@ DECLARE_WW8EXPORT_TEST(testTdf37778_readonlySection, 
"tdf37778_readonlySection.d
+     // tdf#127862: page fill color (in this case white) was lost
+     uno::Reference<beans::XPropertySet> 
xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
+     CPPUNIT_ASSERT(drawing::FillStyle_NONE != 
getProperty<drawing::FillStyle>(xStyle, "FillStyle"));
++
++    // tdf#136983
++    uno::Reference<document::XDocumentPropertiesSupplier> xDPS(mxComponent, 
uno::UNO_QUERY);
++    CPPUNIT_ASSERT_EQUAL_MESSAGE("Last printed date", sal_Int16(2009), 
xDPS->getDocumentProperties()->getPrintDate().Year);
+ }
+ 
+ DECLARE_WW8EXPORT_TEST(testTdf122429_header, "tdf122429_header.doc")
+diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
+index e908cab35162..8d4add7b34bf 100644
+--- a/sw/source/filter/ww8/wrtww8.cxx
++++ b/sw/source/filter/ww8/wrtww8.cxx
+@@ -501,7 +501,11 @@ static void WriteDop( WW8Export& rWrt )
+     uno::Reference<beans::XPropertySet> xProps;
+     if ( pDocShell )
+     {
+-        xProps.set(pDocShell->GetModel(), uno::UNO_QUERY);
++        uno::Reference<lang::XComponent> xModelComp(pDocShell->GetModel(), 
uno::UNO_QUERY);
++        xProps.set(xModelComp, uno::UNO_QUERY);
++        uno::Reference<document::XDocumentPropertiesSupplier> 
xDPS(xModelComp, uno::UNO_QUERY_THROW);
++        xDocProps = xDPS->getDocumentProperties();
++        OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
+ 
+         rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash();
+     }
+-- 
+cgit v1.2.1

diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild 
b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
new file mode 100644
index 00000000000..59eabf0b026
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
@@ -0,0 +1,593 @@
+# 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 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=(
+       # QR code generating library for >=libreoffice-6.4
+       "${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 coinmp +cups +dbus debug eds 
firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+$(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 ~ppc64 ~x86 ~amd64-linux ~x86-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
+       >=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.15.0
+       dev-libs/librevenge
+       dev-libs/libxml2
+       dev-libs/libxslt
+       dev-libs/nspr
+       dev-libs/nss
+       >=dev-libs/redland-1.0.16
+       >=dev-libs/xmlsec-1.2.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
+       )
+       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
+               >=virtual/jdk-1.8
+       )
+       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? ( >=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"
+
+       # 6.4 branch (fixed in 6.4.8)
+       "${FILESDIR}/${P}-fix-wrong-setting-for-doc-properties.patch"
+
+       # git master
+       "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
+       "${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
+)
+
+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"
+
+       # optimization flags
+       export GMAKE_OPTIONS="${MAKEOPTS}"
+       # System python enablement:
+       export PYTHON_CFLAGS=$(python_get_CFLAGS)
+       export PYTHON_LIBS=$(python_get_LIBS)
+
+       if use kde; then
+               export QT_SELECT=5 # bug 639620 needs proper fix though
+               export QT5DIR="$(qt5_get_bindir)/../"
+               export MOC5="$(qt5_get_bindir)/moc"
+       fi
+
+       local gentoo_buildid="Gentoo official package"
+       if [[ -n ${LOCOREGIT_VERSION} ]]; then
+               gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+       fi
+
+       # system headers/libs/...: enforce using system packages
+       # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+       # --enable-cairo: ensure that cairo is always required
+       # --enable-*-link: link to the library rather than just dlopen on 
runtime
+       # --enable-release-build: build the libreoffice as release
+       # --disable-fetch-external: prevent dowloading during compile phase
+       # --enable-extension-integration: enable any extension integration 
support
+       # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+       # --disable-report-builder: too much java packages pulled in without 
pkgs
+       # --without-system-sane: just sane.h header that is used for scan in 
writer,
+       #   not linked or anything else, worthless to depend on
+       # --disable-pdfium: not yet packaged
+       # --without-system-qrencode: 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-build-version="${gentoo_buildid}"
+               --enable-extension-integration
+               --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+               --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+               --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+               --with-external-tar="${DISTDIR}"
+               --with-lang=""
+               --with-parallelism=$(makeopts_jobs)
+               --with-system-ucpp
+               --with-tls=nss
+               --with-vendor="Gentoo Foundation"
+               --with-x
+               --without-fonts
+               --without-myspell-dicts
+               --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_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}"
+                       --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+                       --with-jvm-path="${EPREFIX}/usr/lib/"
+               )
+
+               use libreoffice_extensions_scripting-beanshell && \
+                       myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar 
bsh bsh.jar) )
+
+               use libreoffice_extensions_scripting-javascript && \
+                       myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar 
rhino-1.6 js.jar) )
+       fi
+
+       is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+       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=$(get_libdir)/libreoffice/program
+       for py in uno.py unohelper.py officehelper.py; do
+               dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+               while IFS="" read -d $'\0' -r pyc; do
+                       pyc=${pyc//*\/}
+                       dosym ../../../../${loprogdir}/__pycache__/${pyc} 
$(python_get_sitedir)/__pycache__/${pyc}
+               done < <(find "${D}"${lodir}/program -type f -name 
${py/.py/*.pyc} -print0)
+       done
+}
+
+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