app-office/libreoffice: Update DEPENDs, pyuno patch, add 5.1 stable branch
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>
Wed, 21 Oct 2015 23:37:12 +0000 (01:37 +0200)
committerAndreas K. Hüttel <dilfridge@gentoo.org>
Mon, 22 Feb 2016 17:05:24 +0000 (18:05 +0100)
- Pin mdds DEPEND to slot 0
- Relax library dependencies, see commit
517e2522adcd7d091009bfd9e9f9704374ec02a7 and following
- Upstream dropped gconf integration, see commit
3cf557c12d27f1b2250e69a543136da098112d80
- pyuno patch: Only a small change in desktop/scripts/soffice.sh context

Package-Manager: portage-2.2.27

app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch [new file with mode: 0644]
app-office/libreoffice/libreoffice-4.4.6.3.ebuild
app-office/libreoffice/libreoffice-4.4.9999.ebuild
app-office/libreoffice/libreoffice-5.0.3.2.ebuild
app-office/libreoffice/libreoffice-5.0.4.2.ebuild
app-office/libreoffice/libreoffice-5.0.5.2.ebuild
app-office/libreoffice/libreoffice-5.0.9999.ebuild
app-office/libreoffice/libreoffice-5.1.9999.ebuild [new file with mode: 0644]
app-office/libreoffice/libreoffice-9999.ebuild

diff --git a/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch
new file mode 100644 (file)
index 0000000..e06f81f
--- /dev/null
@@ -0,0 +1,44 @@
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
+index a259bf6..672fa23 100755
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
+@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then
+     exit 1;
+ fi
+ 
++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
++export PYTHONPATH
++
+ case "`uname -s`" in
+ NetBSD|OpenBSD|DragonFly)
+ # this is a temporary hack until we can live with the default search paths
+diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
+index 4ff2606..6a05eed 100644
+--- a/pyuno/source/module/uno.py
++++ b/pyuno/source/module/uno.py
+@@ -16,8 +16,12 @@
+ #   except in compliance with the License. You may obtain a copy of
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
++import os
+ import sys
+ 
++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
++    os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
+ import pyuno
+ 
+ try:
+diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
+index 99d3b03..704edab 100755
+--- a/pyuno/source/officehelper.py
++++ b/pyuno/source/officehelper.py
+@@ -44,7 +44,7 @@ def bootstrap():
+         if "UNO_PATH" in os.environ:
+             sOffice = os.environ["UNO_PATH"]
+         else:
+-            sOffice = "" # lets hope for the best
++            sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
+         sOffice = os.path.join(sOffice, "soffice")
+         if platform.startswith("win"): 
+             sOffice += ".exe"
index 863f7c97bb7d212d94d0df86a45bb8bfd1cc25cf..1dad190b5ae1be25c9e60d5ff08d3e79f076db88 100644 (file)
@@ -220,7 +220,7 @@ DEPEND="${COMMON_DEPEND}
        dev-util/cppunit
        >=dev-util/gperf-3
        dev-util/intltool
-       >=dev-util/mdds-0.11.2:=
+       >=dev-util/mdds-0.11.2:0=
        media-libs/glm
        net-misc/npapi-sdk
        >=sys-apps/findutils-4.4.2
index 863f7c97bb7d212d94d0df86a45bb8bfd1cc25cf..1dad190b5ae1be25c9e60d5ff08d3e79f076db88 100644 (file)
@@ -220,7 +220,7 @@ DEPEND="${COMMON_DEPEND}
        dev-util/cppunit
        >=dev-util/gperf-3
        dev-util/intltool
-       >=dev-util/mdds-0.11.2:=
+       >=dev-util/mdds-0.11.2:0=
        media-libs/glm
        net-misc/npapi-sdk
        >=sys-apps/findutils-4.4.2
index 15d59be51f1f7a77122aba125da28a705991e68c..6b99676cba33eb379759d9663c7c6422a1aa2ee8 100644 (file)
@@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
        dev-util/cppunit
        >=dev-util/gperf-3
        dev-util/intltool
-       >=dev-util/mdds-0.12.0:=
+       >=dev-util/mdds-0.12.0:0=
        media-libs/glm
        net-misc/npapi-sdk
        >=sys-apps/findutils-4.4.2
index 4cc1a495d37e2ff85ded68a25d0a441835c13c1e..1cf15be1f732dda5e080aebdecc5d49444a82516 100644 (file)
@@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
        dev-util/cppunit
        >=dev-util/gperf-3
        dev-util/intltool
-       >=dev-util/mdds-0.12.0:=
+       >=dev-util/mdds-0.12.0:0=
        media-libs/glm
        net-misc/npapi-sdk
        >=sys-apps/findutils-4.4.2
index 4cc1a495d37e2ff85ded68a25d0a441835c13c1e..abeb761c38871f3b671042ea6376c6e52f9d5891 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
        dev-util/cppunit
        >=dev-util/gperf-3
        dev-util/intltool
-       >=dev-util/mdds-0.12.0:=
+       >=dev-util/mdds-0.12.0:0=
        media-libs/glm
        net-misc/npapi-sdk
        >=sys-apps/findutils-4.4.2
index 4cc1a495d37e2ff85ded68a25d0a441835c13c1e..abeb761c38871f3b671042ea6376c6e52f9d5891 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
        dev-util/cppunit
        >=dev-util/gperf-3
        dev-util/intltool
-       >=dev-util/mdds-0.12.0:=
+       >=dev-util/mdds-0.12.0:0=
        media-libs/glm
        net-misc/npapi-sdk
        >=sys-apps/findutils-4.4.2
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
new file mode 100644 (file)
index 0000000..18d7177
--- /dev/null
@@ -0,0 +1,587 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+       http://dev-builds.libreoffice.org/pre-releases/src
+       http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+       http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+       for i in ${DEV_URI}; do
+               for mod in ${MODULES}; do
+                       if [[ ${mod} == core ]]; then
+                               SRC_URI+=" ${i}/${P}.tar.xz"
+                       else
+                               SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+                       fi
+               done
+               unset mod
+       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=(
+       "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+       "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+       "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+       "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 EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+       IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+       ${PYTHON_DEPS}
+       app-arch/zip
+       app-arch/unzip
+       >=app-text/hunspell-1.3.2-r3
+       app-text/mythes
+       >=app-text/libabw-0.1.0
+       >=app-text/libexttextcat-3.4.4
+       >=app-text/libebook-0.1
+       >=app-text/libetonyek-0.1
+       app-text/liblangtag
+       >=app-text/libmspub-0.1.0
+       >=app-text/libmwaw-0.3.1
+       >=app-text/libodfgen-0.1.0
+       app-text/libwpd:0.10[tools]
+       app-text/libwpg:0.3
+       >=app-text/libwps-0.4
+       >=app-text/poppler-0.16:=[cxx]
+       >=dev-cpp/clucene-2.3.3.4-r2
+       =dev-cpp/libcmis-0.5*
+       dev-db/unixODBC
+       >=dev-libs/boost-1.55:=
+       dev-libs/expat
+       >=dev-libs/hyphen-2.7.1
+       >=dev-libs/icu-4.8.1.1:=
+       =dev-libs/liborcus-0.9*
+       >=dev-libs/librevenge-0.0.1
+       >=dev-libs/nspr-4.8.8
+       >=dev-libs/nss-3.12.9
+       >=dev-lang/perl-5.0
+       !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+       libressl? ( dev-libs/libressl )
+       >=dev-libs/redland-1.0.16
+       media-gfx/graphite2
+       >=media-libs/fontconfig-2.8.0
+       media-libs/freetype:2
+       >=media-libs/glew-1.10
+       >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+       media-libs/lcms:2
+       >=media-libs/libpng-1.4:0=
+       >=media-libs/libcdr-0.1.0
+       >=media-libs/libfreehand-0.1.0
+       media-libs/libpagemaker
+       >=media-libs/libvisio-0.1.0
+       >=net-misc/curl-7.21.4
+       net-libs/neon
+       net-nds/openldap
+       sci-mathematics/lpsolve
+       virtual/jpeg:0
+       >=x11-libs/cairo-1.10.0[X]
+       x11-libs/libXinerama
+       x11-libs/libXrandr
+       x11-libs/libXrender
+       virtual/glu
+       virtual/opengl
+       bluetooth? ( net-wireless/bluez )
+       coinmp? ( sci-libs/coinor-mp )
+       collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+       cups? ( net-print/cups )
+       dbus? ( >=dev-libs/dbus-glib-0.92 )
+       eds? (
+               dev-libs/glib:2
+               gnome-extra/evolution-data-server
+       )
+       firebird? ( >=dev-db/firebird-2.5 )
+       gltf? ( media-libs/libgltf )
+       gtk? (
+               x11-libs/gdk-pixbuf[X]
+               >=x11-libs/gtk+-2.24:2
+       )
+       gtk3? (
+               dev-libs/glib:2
+               dev-libs/gobject-introspection
+               >=x11-libs/gtk+-3.8:3
+       )
+       gstreamer? (
+               media-libs/gstreamer:1.0
+               media-libs/gst-plugins-base:1.0
+       )
+       jemalloc? ( dev-libs/jemalloc )
+       libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+       libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+       mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+       postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+       telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+       !app-office/libreoffice-bin
+       !app-office/libreoffice-bin-debug
+       !<app-office/openoffice-bin-3.4.0-r1
+       !app-office/openoffice
+       media-fonts/libertine
+       media-fonts/liberation-fonts
+       media-fonts/urw-fonts
+       java? ( >=virtual/jre-1.6 )
+       kde? ( $(add_kdeapps_dep kioclient) )
+       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}
+       >=dev-libs/libatomic_ops-7.2d
+       >=dev-libs/libxml2-2.7.8
+       dev-libs/libxslt
+       dev-perl/Archive-Zip
+       dev-util/cppunit
+       >=dev-util/gperf-3
+       dev-util/intltool
+       >=dev-util/mdds-0.12.0:0=
+       media-libs/glm
+       net-misc/npapi-sdk
+       >=sys-apps/findutils-4.4.2
+       sys-devel/bison
+       sys-apps/coreutils
+       sys-devel/flex
+       sys-devel/gettext
+       >=sys-devel/make-3.82
+       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? (
+               >=virtual/jdk-1.6
+               >=dev-java/ant-core-1.7
+       )
+       odk? ( >=app-doc/doxygen-1.8.4 )
+       test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="
+       ${PYTHON_REQUIRED_USE}
+       bluetooth? ( dbus )
+       collada? ( gltf )
+       eds? ( gnome )
+       gnome? ( gtk )
+       telepathy? ( 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}-4.4-system-pyuno.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+       local pgslot
+
+       use java || \
+               ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               check-reqs_pkg_pretend
+
+               if [[ $(gcc-major-version) -lt 4 ]] || {
+                       [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
+               then
+                       eerror "Compilation with gcc older than 4.7 is not supported"
+                       die "Too old gcc found."
+               fi
+       fi
+
+       # Ensure pg version but we have to be sure the pg is installed (first
+       # install on clean system)
+       if use postgres && has_version dev-db/postgresql; then
+                pgslot=$(postgresql-config show)
+                if [[ ${pgslot//.} -lt 90 ]] ; then
+                       eerror "PostgreSQL slot must be set to 9.0 or higher."
+                       eerror "    postgresql-config set 9.0"
+                       die "PostgreSQL slot is not set to 9.0 or higher."
+                fi
+       fi
+}
+
+pkg_setup() {
+       java-pkg-opt-2_pkg_setup
+       kde4-base_pkg_setup
+       python-single-r1_pkg_setup
+
+       [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+       local mod
+
+       [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+       use branding && unpack "${BRANDING}"
+
+       if [[ ${PV} != *9999* ]]; then
+               unpack "${P}.tar.xz"
+               for mod in ${MODULES}; do
+                       [[ ${mod} == core ]] && continue
+                       unpack "${PN}-${mod}-${PV}.tar.xz"
+               done
+       else
+               local base_uri branch checkout mypv
+               base_uri="git://anongit.freedesktop.org"
+               for mod in ${MODULES}; do
+                       branch="master"
+                       mypv=${PV/.9999}
+                       [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+                       git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+                       [[ ${mod} != core ]] && checkout="${S}/${mod}"
+                       [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+                       git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+               done
+       fi
+}
+
+src_prepare() {
+       # patchset
+       if [[ -n ${PATCHSET} ]]; then
+               EPATCH_FORCE="yes" \
+               EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+               EPATCH_SUFFIX="patch" \
+               epatch
+       fi
+
+       epatch "${PATCHES[@]}"
+       epatch_user
+
+       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
+
+       if use branding; then
+               # hack...
+               mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+       fi
+}
+
+src_configure() {
+       local java_opts
+       local internal_libs
+       local lo_ext
+       local ext_opts
+
+       # optimization flags
+       export GMAKE_OPTIONS="${MAKEOPTS}"
+       # System python enablement:
+       export PYTHON_CFLAGS=$(python_get_CFLAGS)
+       export PYTHON_LIBS=$(python_get_LIBS)
+
+       if use collada; then
+               export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+               export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+       fi
+
+       # sane: just sane.h header that is used for scan in writer, not
+       #       linked or anything else, worthless to depend on
+       # vigra: just uses templates from there
+       #        it is serious pain in the ass for packaging
+       #        should be replaced by boost::gil if someone interested
+       internal_libs+="
+               --without-system-sane
+               --without-system-vigra
+       "
+
+       # libreoffice extensions handling
+       for lo_xt in ${LO_EXTS}; do
+               if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+                       ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+               else
+                       ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+               fi
+       done
+
+       if use java; then
+               # hsqldb: system one is too new
+               java_opts="
+                       --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 && \
+                       java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+               use libreoffice_extensions_scripting-javascript && \
+                       java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+       fi
+
+       # system headers/libs/...: enforce using system packages
+       # --enable-cairo: ensure that cairo is always required
+       # --enable-graphite: disabling causes build breakages
+       # --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
+       # --disable-systray: quickstarter does not actually work at all so do not
+       #   promote it
+       # --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
+       econf \
+               --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+               --with-system-headers \
+               --with-system-libs \
+               --with-system-jars \
+               --with-system-dicts \
+               --enable-cairo-canvas \
+               --enable-graphite \
+               --enable-largefile \
+               --enable-mergelibs \
+               --enable-neon \
+               --enable-python=system \
+               --enable-randr \
+               --enable-randr-link \
+               --enable-release-build \
+               --disable-hardlink-deliver \
+               --disable-ccache \
+               --disable-crashdump \
+               --disable-dependency-tracking \
+               --disable-epm \
+               --disable-fetch-external \
+               --disable-gstreamer-0-10 \
+               --disable-report-builder \
+               --disable-online-update \
+               --disable-systray \
+               --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 \
+               --without-sun-templates \
+               $(use_enable bluetooth sdremote-bluetooth) \
+               $(use_enable coinmp) \
+               $(use_enable collada) \
+               $(use_enable cups) \
+               $(use_enable debug) \
+               $(use_enable dbus) \
+               $(use_enable eds evolution2) \
+               $(use_enable firebird firebird-sdbc) \
+               $(use_enable gltf) \
+               $(use_enable gnome gio) \
+               $(use_enable gstreamer gstreamer-1-0) \
+               $(use_enable gtk) \
+               $(use_enable gtk3) \
+               $(use_enable kde kde4) \
+               $(use_enable mysql ext-mariadb-connector) \
+               $(use_enable odk) \
+               $(use_enable postgres postgresql-sdbc) \
+               $(use_enable telepathy) \
+               $(use_enable vlc) \
+               $(use_with coinmp system-coinmp) \
+               $(use_with collada system-opencollada) \
+               $(use_with gltf system-libgltf) \
+               $(use_with java) \
+               $(use_with mysql system-mysql-cppconn) \
+               $(use_with odk doxygen) \
+               ${internal_libs} \
+               ${java_opts} \
+               ${ext_opts}
+}
+
+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=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+               perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+                       -dir=icon-themes/galaxy/res/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
+
+       # Fix bash completion placement
+       newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
+       bashcomp_alias \
+               libreoffice \
+               unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+       rm -rf "${ED}"etc/ || die
+
+       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
+
+       # Remove desktop files for support to old installs that can't parse mime
+       rm -r "${ED}"usr/share/mimelnk/ || die
+
+       # FIXME: Hack add missing file
+       exeinto /usr/$(get_libdir)/${PN}/program
+       doexe "${S}"/instdir/program/libsaxlo.so
+
+       pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+       pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+       # Cache updates - all handled by kde eclass for all environments
+       kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+       kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+       kde4-base_pkg_postrm
+}
index 3907338d0b0116db9dbfd9a2fbc00d0975cfd973..9e2bd12efee3b36028bd0d5a36f1547dad404f72 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -59,7 +59,6 @@ unset DEV_URI
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
 ADDONS_SRC=(
-       "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
        "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
        "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
        "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
@@ -106,15 +105,15 @@ COMMON_DEPEND="
        app-text/mythes
        >=app-text/libabw-0.1.0
        >=app-text/libexttextcat-3.4.4
-       >=app-text/libebook-0.1.1
-       >=app-text/libetonyek-0.1.2
+       >=app-text/libebook-0.1
+       >=app-text/libetonyek-0.1
        app-text/liblangtag
        >=app-text/libmspub-0.1.0
-       >=app-text/libmwaw-0.3.6
+       >=app-text/libmwaw-0.3.1
        >=app-text/libodfgen-0.1.0
        app-text/libwpd:0.10[tools]
        app-text/libwpg:0.3
-       >=app-text/libwps-0.4.2
+       >=app-text/libwps-0.4
        >=app-text/poppler-0.16:=[cxx]
        >=dev-cpp/clucene-2.3.3.4-r2
        =dev-cpp/libcmis-0.5*
@@ -158,10 +157,12 @@ COMMON_DEPEND="
        collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
        cups? ( net-print/cups )
        dbus? ( >=dev-libs/dbus-glib-0.92 )
-       eds? ( gnome-extra/evolution-data-server )
+       eds? (
+               dev-libs/glib:2
+               gnome-extra/evolution-data-server
+       )
        firebird? ( >=dev-db/firebird-2.5 )
        gltf? ( media-libs/libgltf )
-       gnome? ( dev-libs/glib:2 )
        gtk? (
                x11-libs/gdk-pixbuf[X]
                >=x11-libs/gtk+-2.24:2
@@ -215,9 +216,8 @@ DEPEND="${COMMON_DEPEND}
        dev-util/cppunit
        >=dev-util/gperf-3
        dev-util/intltool
-       >=dev-util/mdds-0.12.0:=
+       dev-util/mdds:1=
        media-libs/glm
-       net-misc/npapi-sdk
        >=sys-apps/findutils-4.4.2
        sys-devel/bison
        sys-apps/coreutils
@@ -247,7 +247,7 @@ REQUIRED_USE="
        collada? ( gltf )
        eds? ( gnome )
        gnome? ( gtk )
-       telepathy? ( gnome )
+       telepathy? ( gtk )
        libreoffice_extensions_nlpsolver? ( java )
        libreoffice_extensions_scripting-beanshell? ( java )
        libreoffice_extensions_scripting-javascript? ( java )
@@ -256,7 +256,7 @@ REQUIRED_USE="
 
 PATCHES=(
        # not upstreamable stuff
-       "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+       "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
 )
 
 CHECKREQS_MEMORY="512M"
@@ -365,7 +365,6 @@ src_prepare() {
 
 src_configure() {
        local java_opts
-       local internal_libs
        local lo_ext
        local ext_opts
 
@@ -380,16 +379,6 @@ src_configure() {
                export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
        fi
 
-       # sane: just sane.h header that is used for scan in writer, not
-       #       linked or anything else, worthless to depend on
-       # vigra: just uses templates from there
-       #        it is serious pain in the ass for packaging
-       #        should be replaced by boost::gil if someone interested
-       internal_libs+="
-               --without-system-sane
-               --without-system-vigra
-       "
-
        # libreoffice extensions handling
        for lo_xt in ${LO_EXTS}; do
                if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
@@ -427,6 +416,8 @@ src_configure() {
        # --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
        econf \
                --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
                --with-system-headers \
@@ -440,7 +431,6 @@ src_configure() {
                --enable-neon \
                --enable-python=system \
                --enable-randr \
-               --enable-randr-link \
                --enable-release-build \
                --disable-hardlink-deliver \
                --disable-ccache \
@@ -469,6 +459,7 @@ src_configure() {
                --without-help \
                --with-helppack-integration \
                --without-sun-templates \
+               --without-system-sane \
                $(use_enable bluetooth sdremote-bluetooth) \
                $(use_enable coinmp) \
                $(use_enable collada) \
@@ -494,7 +485,6 @@ src_configure() {
                $(use_with java) \
                $(use_with mysql system-mysql-cppconn) \
                $(use_with odk doxygen) \
-               ${internal_libs} \
                ${java_opts} \
                ${ext_opts}
 }