app-office/libreoffice: Fix DEPENDs, drop --enable-graphite
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>
Sat, 26 Nov 2016 10:38:33 +0000 (11:38 +0100)
committerAndreas K. Hüttel <dilfridge@gentoo.org>
Sat, 17 Dec 2016 15:56:41 +0000 (16:56 +0100)
Option turned mandatory. Upstream commits:
67936ee7ed717eb385b608d7eedcefa61fe13295
b9fe5dc791f56df55495d171ae901a246907c68b

glew -> epoxy
Upstream commit 482d7ce61b423600b41b459eb26a2cc221cd0acf

Package-Manager: portage-2.3.0

app-office/libreoffice/libreoffice-9999.ebuild

index 732c9634f10e96048661a7f4d86abb30af96ec98..c9bad32b055eb2977a2beeca08551f8f62983cee 100644 (file)
@@ -121,10 +121,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
        media-gfx/graphite2
        media-libs/fontconfig
        media-libs/freetype:2
-       >=media-libs/glew-1.10:=
-       media-libs/harfbuzz:=[graphite,icu]
+       >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
        media-libs/lcms:2
        >=media-libs/libcdr-0.1.0
+       >=media-libs/libepoxy-1.3.1
        >=media-libs/libfreehand-0.1.0
        media-libs/libpagemaker
        >=media-libs/libpng-1.4:0=
@@ -151,7 +151,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
                gnome-extra/evolution-data-server
        )
        firebird? ( >=dev-db/firebird-2.5 )
-       gltf? ( media-libs/libgltf )
+       gltf? ( >=media-libs/libgltf-0.1.0 )
        gnome? ( gnome-base/dconf )
        gstreamer? (
                media-libs/gstreamer:1.0
@@ -414,7 +414,6 @@ src_configure() {
        # 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-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
@@ -424,13 +423,12 @@ src_configure() {
        # --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-dicts \
+               --with-system-epoxy \
                --with-system-headers \
                --with-system-jars \
                --with-system-libs \
                --enable-cairo-canvas \
-               --enable-graphite \
                --enable-largefile \
                --enable-mergelibs \
                --enable-neon \