app-editors/emacs: Specify X dependencies more completely.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/app-editors/emacs/emacs-23.4-r16.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild
similarity index 96%
rename from app-editors/emacs/emacs-23.4-r16.ebuild
rename to app-editors/emacs/emacs-23.4-r17.ebuild
index 00d4f14a53a563eeb837839691d3fb715b72b6f5..73d6f0dcad3206c55cac8dc89f1ed188fe5bf6d7 100644 (file)
--- a/app-editors/emacs/emacs-23.4-r16.ebuild
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild
@@ -27,8 +27,11 @@ RDEPEND="sys-libs/ncurses:0=
        gpm? ( sys-libs/gpm )
        dbus? ( sys-apps/dbus )
        X? (
-               x11-libs/libXmu
-               x11-libs/libXt
+               media-libs/fontconfig
+               media-libs/freetype
+               x11-libs/libICE
+               x11-libs/libSM
+               x11-libs/libX11
                x11-misc/xbitmaps
                gconf? ( >=gnome-base/gconf-2.26.2 )
                gif? ( media-libs/giflib:0= )
@@ -38,9 +41,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? (
                                >=dev-libs/libotf-0.9.4
                                >=dev-libs/m17n-lib-1.5.1
@@ -52,10 +54,23 @@ RDEPEND="sys-libs/ncurses:0=
                                >=x11-libs/motif-2.3:0
                                x11-libs/libXp
                                x11-libs/libXpm
+                               x11-libs/libXext
+                               x11-libs/libXmu
+                               x11-libs/libXt
                        )
                        !motif? (
-                               Xaw3d? ( x11-libs/libXaw3d )
-                               !Xaw3d? ( athena? ( x11-libs/libXaw ) )
+                               Xaw3d? (
+                                       x11-libs/libXaw3d
+                                       x11-libs/libXext
+                                       x11-libs/libXmu
+                                       x11-libs/libXt
+                               )
+                               !Xaw3d? ( athena? (
+                                       x11-libs/libXaw
+                                       x11-libs/libXext
+                                       x11-libs/libXmu
+                                       x11-libs/libXt
+                               ) )
                        )
                )
        )"

diff --git a/app-editors/emacs/emacs-24.5-r4.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild
similarity index 96%
rename from app-editors/emacs/emacs-24.5-r4.ebuild
rename to app-editors/emacs/emacs-24.5-r5.ebuild
index 8360af8c48d8e5d16a93cd37219a1785580dc610..1b9958b58c02544ad474f90f4b2cfa677fa96e53 100644 (file)
--- a/app-editors/emacs/emacs-24.5-r4.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -32,8 +32,14 @@ RDEPEND="sys-libs/ncurses:0=
        ssl? ( net-libs/gnutls:0= )
        zlib? ( sys-libs/zlib )
        X? (
-               x11-libs/libXmu
-               x11-libs/libXt
+               media-libs/fontconfig
+               media-libs/freetype
+               x11-libs/libICE
+               x11-libs/libSM
+               x11-libs/libX11
+               x11-libs/libXext
+               x11-libs/libXinerama
+               x11-libs/libXrandr
                x11-misc/xbitmaps
                gconf? ( >=gnome-base/gconf-2.26.2 )
                gsettings? ( >=dev-libs/glib-2.28.6 )
@@ -45,9 +51,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? (
                                >=dev-libs/libotf-0.9.4
                                >=dev-libs/m17n-lib-1.5.1
@@ -62,10 +67,20 @@ RDEPEND="sys-libs/ncurses:0=
                                >=x11-libs/motif-2.3:0
                                x11-libs/libXp
                                x11-libs/libXpm
+                               x11-libs/libXmu
+                               x11-libs/libXt
                        )
                        !motif? (
-                               Xaw3d? ( x11-libs/libXaw3d )
-                               !Xaw3d? ( athena? ( x11-libs/libXaw ) )
+                               Xaw3d? (
+                                       x11-libs/libXaw3d
+                                       x11-libs/libXmu
+                                       x11-libs/libXt
+                               )
+                               !Xaw3d? ( athena? (
+                                       x11-libs/libXaw
+                                       x11-libs/libXmu
+                                       x11-libs/libXt
+                               ) )
                        )
                )
        )"

diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3-r1.ebuild
similarity index 96%
rename from app-editors/emacs/emacs-25.3.ebuild
rename to app-editors/emacs/emacs-25.3-r1.ebuild
index 286763c2e2366ddb277e1b774290cd35f7f00a3e..c88e891f9ae8d96bcdbe39071392301873e05e9e 100644 (file)
--- a/app-editors/emacs/emacs-25.3.ebuild
+++ b/app-editors/emacs/emacs-25.3-r1.ebuild
@@ -31,8 +31,14 @@ RDEPEND="sys-libs/ncurses:0=
        ssl? ( net-libs/gnutls:0= )
        zlib? ( sys-libs/zlib )
        X? (
-               x11-libs/libXmu
-               x11-libs/libXt
+               x11-libs/libICE
+               x11-libs/libSM
+               x11-libs/libX11
+               x11-libs/libXext
+               x11-libs/libXfixes
+               x11-libs/libXinerama
+               x11-libs/libXrandr
+               x11-libs/libxcb
                x11-misc/xbitmaps
                gconf? ( >=gnome-base/gconf-2.26.2 )
                gsettings? ( >=dev-libs/glib-2.28.6 )
@@ -47,6 +53,7 @@ RDEPEND="sys-libs/ncurses:0=
                        media-libs/fontconfig
                        media-libs/freetype
                        x11-libs/libXft
+                       x11-libs/libXrender
                        cairo? ( >=x11-libs/cairo-1.12.18 )
                        m17n-lib? (
                                >=dev-libs/libotf-0.9.4
@@ -62,10 +69,20 @@ RDEPEND="sys-libs/ncurses:0=
                                >=x11-libs/motif-2.3:0
                                x11-libs/libXp
                                x11-libs/libXpm
+                               x11-libs/libXmu
+                               x11-libs/libXt
                        )
                        !motif? (
-                               Xaw3d? ( x11-libs/libXaw3d )
-                               !Xaw3d? ( athena? ( x11-libs/libXaw ) )
+                               Xaw3d? (
+                                       x11-libs/libXaw3d
+                                       x11-libs/libXmu
+                                       x11-libs/libXt
+                               )
+                               !Xaw3d? ( athena? (
+                                       x11-libs/libXaw
+                                       x11-libs/libXmu
+                                       x11-libs/libXt
+                               ) )
                        )
                )
        )"