From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1004457-garchives=archives.gentoo.org@lists.gentoo.org> 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 5078B1382C5 for <garchives@archives.gentoo.org>; Mon, 19 Feb 2018 09:42:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6491FE0AF0; Mon, 19 Feb 2018 09:42:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 43C33E0AF0 for <gentoo-commits@lists.gentoo.org>; Mon, 19 Feb 2018 09:42:40 +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 2D0B6335C09 for <gentoo-commits@lists.gentoo.org>; Mon, 19 Feb 2018 09:42:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D967022D for <gentoo-commits@lists.gentoo.org>; Mon, 19 Feb 2018 09:42:33 +0000 (UTC) From: "Ulrich Müller" <ulm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org> Message-ID: <1519033292.0a6efbaee0181355134dfaf3ed6aa425d5242dc4.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs/emacs-23.4-r17.ebuild app-editors/emacs/emacs-24.5-r5.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 0a6efbaee0181355134dfaf3ed6aa425d5242dc4 X-VCS-Branch: master Date: Mon, 19 Feb 2018 09:42:33 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c0bcd868-c62c-492f-a407-b0a784efa9e6 X-Archives-Hash: 91bfc99475499e9e1e6f6cb6e6498106 commit: 0a6efbaee0181355134dfaf3ed6aa425d5242dc4 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Mon Feb 19 09:38:13 2018 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Mon Feb 19 09:41:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a6efbae app-editors/emacs: Move dependencies back under the xft conditional. With USE="-xft", media-libs/fontconfig and media-libs/freetype are not linked against, even if configure checks for their presence. Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-editors/emacs/emacs-23.4-r17.ebuild | 4 ++-- app-editors/emacs/emacs-24.5-r5.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild index 09fda80f8ed..3f8a54bdb1c 100644 --- a/app-editors/emacs/emacs-23.4-r17.ebuild +++ b/app-editors/emacs/emacs-23.4-r17.ebuild @@ -27,8 +27,6 @@ RDEPEND="sys-libs/ncurses:0= gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) X? ( - media-libs/fontconfig - media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -41,6 +39,8 @@ RDEPEND="sys-libs/ncurses:0= tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( + media-libs/fontconfig + media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild index a60d2935347..036b1bcb628 100644 --- a/app-editors/emacs/emacs-24.5-r5.ebuild +++ b/app-editors/emacs/emacs-24.5-r5.ebuild @@ -32,8 +32,6 @@ RDEPEND="sys-libs/ncurses:0= ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( - media-libs/fontconfig - media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -51,6 +49,8 @@ RDEPEND="sys-libs/ncurses:0= xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( + media-libs/fontconfig + media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? (