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

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

commit:     eed7c643bbd0418cfd8b98e9d5e57cad5fb33ece
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 23:14:21 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 23:14:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed7c643

app-office/libreoffice: Drop 6.0.0.3

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-office/libreoffice/Manifest                    |   2 -
 .../files/libreoffice-6.0.0.1-poppler-0.62.patch   |  44 --
 .../files/libreoffice-6.0.0.3-jpeg-9.patch         |  41 --
 app-office/libreoffice/libreoffice-6.0.0.3.ebuild  | 571 ---------------------
 4 files changed, 658 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e4802dfc595..266e3bc93e3 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,9 +6,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
 DIST libreoffice-5.4.4.2.tar.xz 193657116 BLAKE2B 1be8565481bbdf930f6bbbd894dbe5d0be7faeba068517e15a2b23acfd2d8d06960e5991fd9d990c49ad13857177020e22fdb5c272587bc25cac4bdf23bb7fa1 SHA512 f7142fd73aa037b0bbffd3fa5af58049ab6688900976296ba2e53956227aef8920cb229aad4eec05ff36c8dde584415f7893893cc81cac72b305f67b80e36882
 DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9
-DIST libreoffice-6.0.0.3.tar.xz 203284136 BLAKE2B 2d8190499439addddfa017f12b22c4b80001169af5021a546cdbf5eaea3c47a2ac1d190e98efe5022050431805417824c29295068631ec596a6357b13528c52d SHA512 2b2c0fafec5db23317a2c3236b482b0cef9c0edfabab94495a0fd3007b271eaa1dbfa97711819b3b8fb2e2375fbdfb4c662df4ffc8c519255ac84357b4c45e62
 DIST libreoffice-6.0.1.1.tar.xz 203420780 BLAKE2B 80478e0627843abcf61c067592f3220f83ae43123d95dcab82197389f538f843001a6fabdc0d67e3cbca734cf68f2effdc09fa7d15e7b49c719f26d9ebf70791 SHA512 dc9dbef56a5c1df0ac0a4418a42e9200fe1a2e52d3708ad9d86ad1b35171c258fa9a88a4427992aeae83f5e0f22613cf885f068c99e76e5fe376888f4edf7855
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226
-DIST libreoffice-help-6.0.0.3.tar.xz 2972556 BLAKE2B 6805f6a28cf29c6d55732051763f12ad2dc2c76c27c518dc40b85f2ef8f7ad4943de3a55629da4de77ee1ebd3b62a8e225e0ee260081f3c25cbffc60a21970c1 SHA512 9058edf71e34e55e23f5559af94d12d5f12c38385b30d75919283f435eac07dfc790d116b556aca0d0aa30f5119aea39f07a123a1f1e5ad172f5b19b3f7dc4b0
 DIST libreoffice-help-6.0.1.1.tar.xz 2972872 BLAKE2B fed3b8182a9459453a71c0cf76b53220081b33bf4a5f88ef603b39101a19a80f4545033c5e2f817c973d0edfdca48c954249761246d53c1eea798a5059ee2800 SHA512 bbebc878b25f80642c6ebd961e8531cf4f1379cc409a63391ca731e83e71e4e83e2a7ef6ae00b56812a8a4ae2c5de5ea5465aba70b357850b7b9c5f672521336

diff --git a/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch
deleted file mode 100644
index f0ecc3b990b..00000000000
--- a/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version.
-
---- a/configure.ac	2017-12-12 18:45:07.000000000 +0100
-+++ b/configure.ac	2018-01-04 23:57:16.410999542 +0100
-@@ -10403,7 +10403,7 @@
-     if test "$with_system_poppler" = "yes"; then
-         AC_MSG_RESULT([external])
-         SYSTEM_POPPLER=TRUE
--        PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 )
-+        PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 )
-         AC_LANG_PUSH([C++])
-         save_CXXFLAGS=$CXXFLAGS
-         save_CPPFLAGS=$CPPFLAGS
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2017-12-12 18:45:07.000000000 +0100
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2018-01-05 00:29:16.541246738 +0100
-@@ -32,13 +32,11 @@
- #pragma warning(push, 1)
- #endif
- 
--// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
- // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
- //        because the internal poppler does not provide poppler-version.h and the macro always returns 0
--#if POPPLER_CHECK_VERSION(0, 21, 1)
--#include <UTF8.h>
--#elif POPPLER_CHECK_VERSION(0, 21, 0)
--#include "UTF.h"
-+// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0
-+#if POPPLER_CHECK_VERSION(0, 62, 0)
-+#include "UnicodeMapFuncs.h"
- #else
- #include "UTF8.h"
- #endif
-@@ -918,7 +916,11 @@
-             );
- 
-     // silence spurious warning
-+#if POPPLER_CHECK_VERSION(0, 62, 0)
-+    (void)&mapUTF16;
-+#else
-     (void)&mapUCS2;
-+#endif
- 
-     char buf[9];
-     for( int i=0; i<uLen; ++i )

diff --git a/app-office/libreoffice/files/libreoffice-6.0.0.3-jpeg-9.patch b/app-office/libreoffice/files/libreoffice-6.0.0.3-jpeg-9.patch
deleted file mode 100644
index 40dfb08d56a..00000000000
--- a/app-office/libreoffice/files/libreoffice-6.0.0.3-jpeg-9.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5184506ffddca982f22eede24cffad64ff3576e3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Sat, 3 Feb 2018 16:39:12 +0000
-Subject: tdf#115416 allow build with classic libjpeg
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Change-Id: I96252e1a78dbc52d21095e11b7bdb0807e5d76b6
-Reviewed-on: https://gerrit.libreoffice.org/49187
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-Tested-by: Caolán McNamara <caolanm@redhat.com>
----
- vcl/source/filter/jpeg/jpegc.cxx | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
-index 570c036..059ec20 100644
---- a/vcl/source/filter/jpeg/jpegc.cxx
-+++ b/vcl/source/filter/jpeg/jpegc.cxx
-@@ -244,6 +244,7 @@ void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputStream,
-                 eScanlineFormat = ScanlineFormat::N8BitPal;
-                 nPixelSize = 1;
-             }
-+#if defined(JCS_EXTENSIONS)
-             else if (eFinalFormat == ScanlineFormat::N32BitTcBgra)
-             {
-                 best_out_color_space = JCS_EXT_BGRA;
-@@ -262,7 +263,7 @@ void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputStream,
-                 eScanlineFormat = eFinalFormat;
-                 nPixelSize = 4;
-             }
--
-+#endif
-             if (rContext.cinfo.jpeg_color_space == JCS_YCCK)
-                 rContext.cinfo.out_color_space = JCS_CMYK;
- 
--- 
-cgit v1.1
-

diff --git a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
deleted file mode 100644
index 170a95f8825..00000000000
--- a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
+++ /dev/null
@@ -1,571 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# 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/${PV:0:5}/
-	https://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.0.3-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-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 [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${P}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	=dev-libs/liborcus-0.13*
-	dev-libs/librevenge
-	dev-libs/nspr
-	dev-libs/nss
-	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
-	libressl? ( dev-libs/libressl )
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.24[nss]
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( dev-libs/dbus-glib )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
-	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
-		x11-libs/gtk+:3
-	)
-	gtk2? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtwidgets:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/libertine
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/oxygen-icons:* )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-	!<sys-devel/make-3.82
-	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3
-	dev-util/intltool
-	>=dev-util/mdds-1.2.3:1=
-	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/ucpp
-	sys-libs/zlib
-	virtual/pkgconfig
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-proto/randrproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? (
-		dev-util/cppunit
-		media-fonts/dejavu
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	kde? ( gtk )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
-	# TODO: upstream
-	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-	"${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
-
-	# gtk3-kde5 vcl plugin backported from master
-	"${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-	# 6.1 branch
-	"${FILESDIR}/${P}-jpeg-9.patch"
-)
-
-pkg_pretend() {
-	use java || \
-		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
-	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
-		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
-		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
-		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
-	fi
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${PV/.9999}
-		[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-
-		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
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/officehelper.py || die
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/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"
-
-	# 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
-
-	# 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-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-ccache
-		--disable-dependency-tracking
-		--disable-epm
-		--disable-fetch-external
-		--disable-gstreamer-0-10
-		--disable-online-update
-		--disable-pdfium
-		--disable-report-builder
-		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
-		--with-build-version="Gentoo official package"
-		--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-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--without-help
-		--with-helppack-integration
-		--with-system-gpgmepp
-		--without-system-sane
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk gtk3)
-		$(use_enable gtk2 gtk)
-		$(use_enable kde gtk3-kde5)
-		$(use_enable kde qt5)
-		$(use_enable mysql ext-mariadb-connector)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable vlc)
-		$(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 mysql system-mysql-cppconn)
-		$(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
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=helpcontent2/source/media/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || \
-			ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# bug 593514
-	if use gtk; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
-	fi
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}