app-office/lyx: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

diff --git a/app-office/lyx/lyx-2.0.8.1.ebuild b/app-office/lyx/lyx-2.0.8.1-r1.ebuild
similarity index 95%
rename from app-office/lyx/lyx-2.0.8.1.ebuild
rename to app-office/lyx/lyx-2.0.8.1-r1.ebuild
index 0c11900b186150dc343f6f911c6dbce1df13a7d1..58a736b9ce8e6f68ccf76284b035bae48a62b2b6 100644 (file)
--- a/app-office/lyx/lyx-2.0.8.1.ebuild
+++ b/app-office/lyx/lyx-2.0.8.1-r1.ebuild
@@ -39,7 +39,7 @@ COMMONDEPEND="dev-qt/qtgui:4
 
 RDEPEND="${COMMONDEPEND}
        dev-texlive/texlive-fontsextra
-       || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
+       virtual/imagemagick-tools[png,svg?]
        cups? ( net-print/cups )
        latex? (
                app-text/texlive
@@ -73,9 +73,7 @@ RDEPEND="${COMMONDEPEND}
        dia? ( app-office/dia )
        subversion? ( <dev-vcs/subversion-1.7.0 )
        rcs? ( dev-vcs/rcs )
-       svg? (  || ( media-gfx/imagemagick[svg] media-gfx/graphicsmagick[svg] )
-                       || ( gnome-base/librsvg media-gfx/inkscape )
-               )
+       svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
        gnumeric? ( app-office/gnumeric )
        hunspell? ( app-text/hunspell )
        aspell? ( app-text/aspell )

diff --git a/app-office/lyx/lyx-2.1.4.ebuild b/app-office/lyx/lyx-2.1.4-r1.ebuild
similarity index 95%
rename from app-office/lyx/lyx-2.1.4.ebuild
rename to app-office/lyx/lyx-2.1.4-r1.ebuild
index 9b7343cc5c44eee0dc0a4d0fc97a6215eb9d4482..58b440cec3e590fffa74f02bb2d84549255b78e6 100644 (file)
--- a/app-office/lyx/lyx-2.1.4.ebuild
+++ b/app-office/lyx/lyx-2.1.4-r1.ebuild
@@ -39,7 +39,7 @@ COMMONDEPEND="dev-qt/qtgui:4
 
 RDEPEND="${COMMONDEPEND}
        dev-texlive/texlive-fontsextra
-       || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
+       virtual/imagemagick-tools[png,svg?]
        cups? ( net-print/cups )
        latex? (
                app-text/texlive
@@ -73,9 +73,7 @@ RDEPEND="${COMMONDEPEND}
        dia? ( app-office/dia )
        subversion? ( dev-vcs/subversion )
        rcs? ( dev-vcs/rcs )
-       svg? (  || ( media-gfx/imagemagick[svg] media-gfx/graphicsmagick[svg] )
-                       || ( gnome-base/librsvg media-gfx/inkscape )
-               )
+       svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
        gnumeric? ( app-office/gnumeric )
        hunspell? ( app-text/hunspell )
        aspell? ( app-text/aspell )

diff --git a/app-office/lyx/lyx-2.1.5.ebuild b/app-office/lyx/lyx-2.1.5-r1.ebuild
similarity index 95%
rename from app-office/lyx/lyx-2.1.5.ebuild
rename to app-office/lyx/lyx-2.1.5-r1.ebuild
index 9b7343cc5c44eee0dc0a4d0fc97a6215eb9d4482..58b440cec3e590fffa74f02bb2d84549255b78e6 100644 (file)
--- a/app-office/lyx/lyx-2.1.5.ebuild
+++ b/app-office/lyx/lyx-2.1.5-r1.ebuild
@@ -39,7 +39,7 @@ COMMONDEPEND="dev-qt/qtgui:4
 
 RDEPEND="${COMMONDEPEND}
        dev-texlive/texlive-fontsextra
-       || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
+       virtual/imagemagick-tools[png,svg?]
        cups? ( net-print/cups )
        latex? (
                app-text/texlive
@@ -73,9 +73,7 @@ RDEPEND="${COMMONDEPEND}
        dia? ( app-office/dia )
        subversion? ( dev-vcs/subversion )
        rcs? ( dev-vcs/rcs )
-       svg? (  || ( media-gfx/imagemagick[svg] media-gfx/graphicsmagick[svg] )
-                       || ( gnome-base/librsvg media-gfx/inkscape )
-               )
+       svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
        gnumeric? ( app-office/gnumeric )
        hunspell? ( app-text/hunspell )
        aspell? ( app-text/aspell )

diff --git a/app-office/lyx/lyx-2.2.2.ebuild b/app-office/lyx/lyx-2.2.1-r1.ebuild
similarity index 95%
rename from app-office/lyx/lyx-2.2.2.ebuild
rename to app-office/lyx/lyx-2.2.1-r1.ebuild
index 161f72c99861bd4b0546423b432dbf2b6a79db3b..33c2bd82d23bfc9146fa98eee9f9d2617db7d358 100644 (file)
--- a/app-office/lyx/lyx-2.2.2.ebuild
+++ b/app-office/lyx/lyx-2.2.1-r1.ebuild
@@ -41,7 +41,7 @@ COMMONDEPEND=">=dev-libs/boost-1.34:=
 
 RDEPEND="${COMMONDEPEND}
        dev-texlive/texlive-fontsextra
-       || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
+       virtual/imagemagick-tools[png,svg?]
        cups? ( net-print/cups )
        latex? (
                app-text/texlive
@@ -75,9 +75,7 @@ RDEPEND="${COMMONDEPEND}
        dia? ( app-office/dia )
        subversion? ( dev-vcs/subversion )
        rcs? ( dev-vcs/rcs )
-       svg? (  || ( media-gfx/imagemagick[svg] media-gfx/graphicsmagick[svg] )
-                       || ( gnome-base/librsvg media-gfx/inkscape )
-               )
+       svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
        gnumeric? ( app-office/gnumeric )
        hunspell? ( app-text/hunspell )
        aspell? ( app-text/aspell )

diff --git a/app-office/lyx/lyx-2.2.1.ebuild b/app-office/lyx/lyx-2.2.2-r1.ebuild
similarity index 95%
rename from app-office/lyx/lyx-2.2.1.ebuild
rename to app-office/lyx/lyx-2.2.2-r1.ebuild
index 161f72c99861bd4b0546423b432dbf2b6a79db3b..33c2bd82d23bfc9146fa98eee9f9d2617db7d358 100644 (file)
--- a/app-office/lyx/lyx-2.2.1.ebuild
+++ b/app-office/lyx/lyx-2.2.2-r1.ebuild
@@ -41,7 +41,7 @@ COMMONDEPEND=">=dev-libs/boost-1.34:=
 
 RDEPEND="${COMMONDEPEND}
        dev-texlive/texlive-fontsextra
-       || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
+       virtual/imagemagick-tools[png,svg?]
        cups? ( net-print/cups )
        latex? (
                app-text/texlive
@@ -75,9 +75,7 @@ RDEPEND="${COMMONDEPEND}
        dia? ( app-office/dia )
        subversion? ( dev-vcs/subversion )
        rcs? ( dev-vcs/rcs )
-       svg? (  || ( media-gfx/imagemagick[svg] media-gfx/graphicsmagick[svg] )
-                       || ( gnome-base/librsvg media-gfx/inkscape )
-               )
+       svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
        gnumeric? ( app-office/gnumeric )
        hunspell? ( app-text/hunspell )
        aspell? ( app-text/aspell )