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

diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild
index 09fda80f8ed370ce633ad211240d91615e88cb32..3f8a54bdb1cccbb07faf513d88e3dd16c3987fff 100644 (file)
--- 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 a60d29353474473079f29421432f6dca156dcd3e..036b1bcb628380dc51f79fdeeba6a947b1b0faeb 100644 (file)
--- 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? (