From 3915461b5b8a95bbb9e70f2084d4f187c607c632 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Sun, 11 Feb 2018 16:42:07 +0100 Subject: app-editors/emacs-vcs: Specify X dependencies more completely. Package-Manager: Portage-2.3.24, Repoman-2.3.6 --- app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild | 28 ++++++++++++++++++---- app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild | 28 ++++++++++++++++++---- .../emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild | 28 ++++++++++++++++++---- app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild | 28 ++++++++++++++++++---- 4 files changed, 92 insertions(+), 20 deletions(-) (limited to 'app-editors') diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild index 7aa4dd5eab52..aea3982875e2 100644 --- a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild @@ -49,8 +49,14 @@ RDEPEND="sys-libs/ncurses:0= systemd? ( sys-apps/systemd ) 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 ) @@ -65,6 +71,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 @@ -73,8 +80,9 @@ RDEPEND="sys-libs/ncurses:0= ) gtk? ( xwidgets? ( - x11-libs/gtk+:3 net-libs/webkit-gtk:4= + x11-libs/gtk+:3 + x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) @@ -86,10 +94,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-vcs/emacs-vcs-26.0.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild index 7aa4dd5eab52..aea3982875e2 100644 --- a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild @@ -49,8 +49,14 @@ RDEPEND="sys-libs/ncurses:0= systemd? ( sys-apps/systemd ) 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 ) @@ -65,6 +71,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 @@ -73,8 +80,9 @@ RDEPEND="sys-libs/ncurses:0= ) gtk? ( xwidgets? ( - x11-libs/gtk+:3 net-libs/webkit-gtk:4= + x11-libs/gtk+:3 + x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) @@ -86,10 +94,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-vcs/emacs-vcs-26.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild index 7aa4dd5eab52..aea3982875e2 100644 --- a/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild @@ -49,8 +49,14 @@ RDEPEND="sys-libs/ncurses:0= systemd? ( sys-apps/systemd ) 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 ) @@ -65,6 +71,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 @@ -73,8 +80,9 @@ RDEPEND="sys-libs/ncurses:0= ) gtk? ( xwidgets? ( - x11-libs/gtk+:3 net-libs/webkit-gtk:4= + x11-libs/gtk+:3 + x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) @@ -86,10 +94,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-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild index e45d3a68bbe7..9cc034479416 100644 --- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild @@ -49,8 +49,14 @@ RDEPEND="sys-libs/ncurses:0= systemd? ( sys-apps/systemd ) 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 ) @@ -65,6 +71,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 @@ -73,8 +80,9 @@ RDEPEND="sys-libs/ncurses:0= ) gtk? ( xwidgets? ( - x11-libs/gtk+:3 net-libs/webkit-gtk:4= + x11-libs/gtk+:3 + x11-libs/libXcomposite ) !xwidgets? ( gtk3? ( x11-libs/gtk+:3 ) @@ -86,10 +94,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 + ) ) ) ) )" -- cgit v1.2.3-65-gdbad