| 1 |
commit: 208a29262c64fe6a3a1545a0be65bd78f77e9a63 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 2 06:37:47 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 2 06:40:18 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=208a2926 |
| 7 |
|
| 8 |
app-editors/emacs: Depend on <media-gfx/imagemagick-7. |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/665058 |
| 11 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
| 12 |
|
| 13 |
app-editors/emacs/emacs-24.5-r5.ebuild | 3 ++- |
| 14 |
app-editors/emacs/emacs-24.5-r6.ebuild | 3 ++- |
| 15 |
app-editors/emacs/emacs-25.3-r4.ebuild | 3 ++- |
| 16 |
app-editors/emacs/emacs-25.3-r5.ebuild | 3 ++- |
| 17 |
app-editors/emacs/emacs-26.1-r1.ebuild | 3 ++- |
| 18 |
app-editors/emacs/emacs-26.1-r2.ebuild | 3 ++- |
| 19 |
6 files changed, 12 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild |
| 22 |
index ac413d6d571..60507ed72e6 100644 |
| 23 |
--- a/app-editors/emacs/emacs-24.5-r5.ebuild |
| 24 |
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild |
| 25 |
@@ -46,7 +46,8 @@ RDEPEND="sys-libs/ncurses:0= |
| 26 |
svg? ( >=gnome-base/librsvg-2.0 ) |
| 27 |
tiff? ( media-libs/tiff:0 ) |
| 28 |
xpm? ( x11-libs/libXpm ) |
| 29 |
- imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) |
| 30 |
+ imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= |
| 31 |
+ <media-gfx/imagemagick-7:0= ) |
| 32 |
xft? ( |
| 33 |
media-libs/fontconfig |
| 34 |
media-libs/freetype |
| 35 |
|
| 36 |
diff --git a/app-editors/emacs/emacs-24.5-r6.ebuild b/app-editors/emacs/emacs-24.5-r6.ebuild |
| 37 |
index 3f797276d19..422d3699a1b 100644 |
| 38 |
--- a/app-editors/emacs/emacs-24.5-r6.ebuild |
| 39 |
+++ b/app-editors/emacs/emacs-24.5-r6.ebuild |
| 40 |
@@ -46,7 +46,8 @@ RDEPEND="sys-libs/ncurses:0= |
| 41 |
svg? ( >=gnome-base/librsvg-2.0 ) |
| 42 |
tiff? ( media-libs/tiff:0 ) |
| 43 |
xpm? ( x11-libs/libXpm ) |
| 44 |
- imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) |
| 45 |
+ imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= |
| 46 |
+ <media-gfx/imagemagick-7:0= ) |
| 47 |
xft? ( |
| 48 |
media-libs/fontconfig |
| 49 |
media-libs/freetype |
| 50 |
|
| 51 |
diff --git a/app-editors/emacs/emacs-25.3-r4.ebuild b/app-editors/emacs/emacs-25.3-r4.ebuild |
| 52 |
index dcfdb8953d9..b5d95d7629e 100644 |
| 53 |
--- a/app-editors/emacs/emacs-25.3-r4.ebuild |
| 54 |
+++ b/app-editors/emacs/emacs-25.3-r4.ebuild |
| 55 |
@@ -48,7 +48,8 @@ RDEPEND="sys-libs/ncurses:0= |
| 56 |
svg? ( >=gnome-base/librsvg-2.0 ) |
| 57 |
tiff? ( media-libs/tiff:0 ) |
| 58 |
xpm? ( x11-libs/libXpm ) |
| 59 |
- imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) |
| 60 |
+ imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= |
| 61 |
+ <media-gfx/imagemagick-7:0= ) |
| 62 |
xft? ( |
| 63 |
media-libs/fontconfig |
| 64 |
media-libs/freetype |
| 65 |
|
| 66 |
diff --git a/app-editors/emacs/emacs-25.3-r5.ebuild b/app-editors/emacs/emacs-25.3-r5.ebuild |
| 67 |
index 4860c32fe92..df6905c6fd1 100644 |
| 68 |
--- a/app-editors/emacs/emacs-25.3-r5.ebuild |
| 69 |
+++ b/app-editors/emacs/emacs-25.3-r5.ebuild |
| 70 |
@@ -48,7 +48,8 @@ RDEPEND="sys-libs/ncurses:0= |
| 71 |
svg? ( >=gnome-base/librsvg-2.0 ) |
| 72 |
tiff? ( media-libs/tiff:0 ) |
| 73 |
xpm? ( x11-libs/libXpm ) |
| 74 |
- imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) |
| 75 |
+ imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= |
| 76 |
+ <media-gfx/imagemagick-7:0= ) |
| 77 |
xft? ( |
| 78 |
media-libs/fontconfig |
| 79 |
media-libs/freetype |
| 80 |
|
| 81 |
diff --git a/app-editors/emacs/emacs-26.1-r1.ebuild b/app-editors/emacs/emacs-26.1-r1.ebuild |
| 82 |
index 6b317d21619..9358e0b74a1 100644 |
| 83 |
--- a/app-editors/emacs/emacs-26.1-r1.ebuild |
| 84 |
+++ b/app-editors/emacs/emacs-26.1-r1.ebuild |
| 85 |
@@ -51,7 +51,8 @@ RDEPEND="sys-libs/ncurses:0= |
| 86 |
svg? ( >=gnome-base/librsvg-2.0 ) |
| 87 |
tiff? ( media-libs/tiff:0 ) |
| 88 |
xpm? ( x11-libs/libXpm ) |
| 89 |
- imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) |
| 90 |
+ imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= |
| 91 |
+ <media-gfx/imagemagick-7:0= ) |
| 92 |
xft? ( |
| 93 |
media-libs/fontconfig |
| 94 |
media-libs/freetype |
| 95 |
|
| 96 |
diff --git a/app-editors/emacs/emacs-26.1-r2.ebuild b/app-editors/emacs/emacs-26.1-r2.ebuild |
| 97 |
index d2dd29112e5..c3771c860ab 100644 |
| 98 |
--- a/app-editors/emacs/emacs-26.1-r2.ebuild |
| 99 |
+++ b/app-editors/emacs/emacs-26.1-r2.ebuild |
| 100 |
@@ -51,7 +51,8 @@ RDEPEND="sys-libs/ncurses:0= |
| 101 |
svg? ( >=gnome-base/librsvg-2.0 ) |
| 102 |
tiff? ( media-libs/tiff:0 ) |
| 103 |
xpm? ( x11-libs/libXpm ) |
| 104 |
- imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) |
| 105 |
+ imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= |
| 106 |
+ <media-gfx/imagemagick-7:0= ) |
| 107 |
xft? ( |
| 108 |
media-libs/fontconfig |
| 109 |
media-libs/freetype |
Archives