commit: 208a29262c64fe6a3a1545a0be65bd78f77e9a63 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun Sep 2 06:37:47 2018 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Sep 2 06:40:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=208a2926
app-editors/emacs: Depend on <media-gfx/imagemagick-7. Bug: https://bugs.gentoo.org/665058 Package-Manager: Portage-2.3.48, Repoman-2.3.10 app-editors/emacs/emacs-24.5-r5.ebuild | 3 ++- app-editors/emacs/emacs-24.5-r6.ebuild | 3 ++- app-editors/emacs/emacs-25.3-r4.ebuild | 3 ++- app-editors/emacs/emacs-25.3-r5.ebuild | 3 ++- app-editors/emacs/emacs-26.1-r1.ebuild | 3 ++- app-editors/emacs/emacs-26.1-r2.ebuild | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild index ac413d6d571..60507ed72e6 100644 --- a/app-editors/emacs/emacs-24.5-r5.ebuild +++ b/app-editors/emacs/emacs-24.5-r5.ebuild @@ -46,7 +46,8 @@ RDEPEND="sys-libs/ncurses:0= svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= + <media-gfx/imagemagick-7:0= ) xft? ( media-libs/fontconfig media-libs/freetype diff --git a/app-editors/emacs/emacs-24.5-r6.ebuild b/app-editors/emacs/emacs-24.5-r6.ebuild index 3f797276d19..422d3699a1b 100644 --- a/app-editors/emacs/emacs-24.5-r6.ebuild +++ b/app-editors/emacs/emacs-24.5-r6.ebuild @@ -46,7 +46,8 @@ RDEPEND="sys-libs/ncurses:0= svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= + <media-gfx/imagemagick-7:0= ) xft? ( media-libs/fontconfig media-libs/freetype diff --git a/app-editors/emacs/emacs-25.3-r4.ebuild b/app-editors/emacs/emacs-25.3-r4.ebuild index dcfdb8953d9..b5d95d7629e 100644 --- a/app-editors/emacs/emacs-25.3-r4.ebuild +++ b/app-editors/emacs/emacs-25.3-r4.ebuild @@ -48,7 +48,8 @@ RDEPEND="sys-libs/ncurses:0= svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= + <media-gfx/imagemagick-7:0= ) xft? ( media-libs/fontconfig media-libs/freetype diff --git a/app-editors/emacs/emacs-25.3-r5.ebuild b/app-editors/emacs/emacs-25.3-r5.ebuild index 4860c32fe92..df6905c6fd1 100644 --- a/app-editors/emacs/emacs-25.3-r5.ebuild +++ b/app-editors/emacs/emacs-25.3-r5.ebuild @@ -48,7 +48,8 @@ RDEPEND="sys-libs/ncurses:0= svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= + <media-gfx/imagemagick-7:0= ) xft? ( media-libs/fontconfig media-libs/freetype diff --git a/app-editors/emacs/emacs-26.1-r1.ebuild b/app-editors/emacs/emacs-26.1-r1.ebuild index 6b317d21619..9358e0b74a1 100644 --- a/app-editors/emacs/emacs-26.1-r1.ebuild +++ b/app-editors/emacs/emacs-26.1-r1.ebuild @@ -51,7 +51,8 @@ RDEPEND="sys-libs/ncurses:0= svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= + <media-gfx/imagemagick-7:0= ) xft? ( media-libs/fontconfig media-libs/freetype diff --git a/app-editors/emacs/emacs-26.1-r2.ebuild b/app-editors/emacs/emacs-26.1-r2.ebuild index d2dd29112e5..c3771c860ab 100644 --- a/app-editors/emacs/emacs-26.1-r2.ebuild +++ b/app-editors/emacs/emacs-26.1-r2.ebuild @@ -51,7 +51,8 @@ RDEPEND="sys-libs/ncurses:0= svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= + <media-gfx/imagemagick-7:0= ) xft? ( media-libs/fontconfig media-libs/freetype
