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? (
