From: David Seifert <soap@gentoo.org>
Date: Sat, 11 Feb 2017 19:21:50 +0000 (+0100)
Subject: app-office/lyx: Depend on virtual/imagemagick-tools
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=439c744a1d81bacc7478caa639d97aec6b68a49b;p=gentoo.git

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 0c11900b1861..58a736b9ce8e 100644
--- 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 9b7343cc5c44..58b440cec3e5 100644
--- 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 9b7343cc5c44..58b440cec3e5 100644
--- 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 161f72c99861..33c2bd82d23b 100644
--- 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 161f72c99861..33c2bd82d23b 100644
--- 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 )