From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB60D139085 for ; Sat, 17 Dec 2016 15:57:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAB6DE0CBC; Sat, 17 Dec 2016 15:57:21 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87F97E0CBC for ; Sat, 17 Dec 2016 15:57:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E919634121E for ; Sat, 17 Dec 2016 15:57:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0EDD24F0 for ; Sat, 17 Dec 2016 15:57:10 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1481990201.a047b47c27d60ba0e456578a9aa84135c61416e1.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: a047b47c27d60ba0e456578a9aa84135c61416e1 X-VCS-Branch: master Date: Sat, 17 Dec 2016 15:57:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3acd8f02-fb2d-4ba5-9cb8-53ac3b67fa0a X-Archives-Hash: e213824bf7016114f22d14e9f2df60b4 commit: a047b47c27d60ba0e456578a9aa84135c61416e1 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Nov 26 10:38:33 2016 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Sat Dec 17 15:56:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a047b47c app-office/libreoffice: Fix DEPENDs, drop --enable-graphite Option turned mandatory. Upstream commits: 67936ee7ed717eb385b608d7eedcefa61fe13295 b9fe5dc791f56df55495d171ae901a246907c68b glew -> epoxy Upstream commit 482d7ce61b423600b41b459eb26a2cc221cd0acf Package-Manager: portage-2.3.0 app-office/libreoffice/libreoffice-9999.ebuild | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 732c963..c9bad32 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -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 \