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

diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild
index ac413d6d5712809f18ca9000f158d8ac2ff19ca0..60507ed72e68533eb56fa0b1779c43322e8d59fb 100644 (file)
--- 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 3f797276d1963d7bddc8016cee5093e39a830d0a..422d3699a1bc98f268f004e8695f3c3020336fa9 100644 (file)
--- 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 dcfdb8953d9cb9a03005050145a76d2589bdde31..b5d95d7629e837d70d08ee28e382b3ebaea92782 100644 (file)
--- 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 4860c32fe92a66ea7f45825b7c195bba2fdccb2b..df6905c6fd16b3d9adbce0dab4c5a0dab0e54829 100644 (file)
--- 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 6b317d216193a22c793476c606dc259fd9d9229a..9358e0b74a1651344014eb6d1f63c408feffbf03 100644 (file)
--- 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 d2dd29112e54fe04ed659597a9a44ac1fb6bcd3e..c3771c860ab7ee1b8a4368c40a348a63ac2c145f 100644 (file)
--- 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