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 18546138334 for ; Thu, 22 Nov 2018 21:48:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28DAAE0977; Thu, 22 Nov 2018 21:48:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D8CBFE0977 for ; Thu, 22 Nov 2018 21:48:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66D22335CE7 for ; Thu, 22 Nov 2018 21:48:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C8B1291 for ; Thu, 22 Nov 2018 21:48:51 +0000 (UTC) From: "Andreas Sturmlechner" 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 Sturmlechner" Message-ID: <1542923316.9bf0329a1d5b3a355f8ea1e4c0132ed469bdfed7.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-6.1.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9bf0329a1d5b3a355f8ea1e4c0132ed469bdfed7 X-VCS-Branch: master Date: Thu, 22 Nov 2018 21:48:51 +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: e5141227-1c17-48a0-a217-236cc0820d90 X-Archives-Hash: f1f00ffa5c3bfe3d16738f0d67356b18 commit: 9bf0329a1d5b3a355f8ea1e4c0132ed469bdfed7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 19 00:12:37 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 22 21:48:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf0329a app-office/libreoffice: Fix font test deps Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/libreoffice/libreoffice-6.1.9999.ebuild | 4 ++-- app-office/libreoffice/libreoffice-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild index 94aaaa087d8..437ac1b2f00 100644 --- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild @@ -193,9 +193,7 @@ 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/breeze-icons:* ) @@ -213,6 +211,7 @@ fi # 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 @@ -238,6 +237,7 @@ DEPEND="${COMMON_DEPEND} app-crypt/gnupg dev-util/cppunit media-fonts/dejavu + media-fonts/liberation-fonts ) " diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 4cf5eb3b938..d2235c0033d 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -196,9 +196,7 @@ 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/breeze-icons:* ) @@ -216,6 +214,7 @@ fi # 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 @@ -241,6 +240,7 @@ DEPEND="${COMMON_DEPEND} app-crypt/gnupg dev-util/cppunit media-fonts/dejavu + media-fonts/liberation-fonts ) "