[gentoo-commits] repo/gentoo:master commit in: x11-terms/roxterm/

[David Seifert]

commit:     fed8c6e66200ecf9b5f3242024777294aca4bf26
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 19:21:56 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 19:46:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed8c6e6

x11-terms/roxterm: Depend on virtual/imagemagick-tools

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

 ...erm-2.9.3-r1.ebuild => roxterm-2.9.3-r2.ebuild} |  2 +-
 ...oxterm-3.1.5.ebuild => roxterm-3.1.5-r1.ebuild} | 24 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/x11-terms/roxterm/roxterm-2.9.3-r1.ebuild b/x11-terms/roxterm/roxterm-2.9.3-r2.ebuild
similarity index 94%
rename from x11-terms/roxterm/roxterm-2.9.3-r1.ebuild
rename to x11-terms/roxterm/roxterm-2.9.3-r2.ebuild
index dbd684bcd3..8c382d7d21 100644
--- a/x11-terms/roxterm/roxterm-2.9.3-r1.ebuild
+++ b/x11-terms/roxterm/roxterm-2.9.3-r2.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	dev-python/lockfile
 	virtual/pkgconfig
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	virtual/imagemagick-tools
 	nls? ( app-text/po4a sys-devel/gettext )"
 
 src_configure() {

diff --git a/x11-terms/roxterm/roxterm-3.1.5.ebuild b/x11-terms/roxterm/roxterm-3.1.5-r1.ebuild
similarity index 78%
rename from x11-terms/roxterm/roxterm-3.1.5.ebuild
rename to x11-terms/roxterm/roxterm-3.1.5-r1.ebuild
index 2f524d73f9..45c68df4c5 100644
--- a/x11-terms/roxterm/roxterm-3.1.5.ebuild
+++ b/x11-terms/roxterm/roxterm-3.1.5-r1.ebuild
@@ -17,20 +17,20 @@ KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
-		dev-libs/glib:2
-		x11-libs/gtk+:3
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/vte:2.91
-		!x11-terms/roxterm:0"
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/vte:2.91
+	!x11-terms/roxterm:0"
 # slotted versions of roxterm need block one another due to file collisions. #565288
 DEPEND="${RDEPEND}
-		${PYTHON_DEPS}
-		dev-libs/libxslt
-		dev-python/lockfile
-		virtual/pkgconfig
-		|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-		nls? ( app-text/po4a sys-devel/gettext )"
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	dev-python/lockfile
+	virtual/pkgconfig
+	virtual/imagemagick-tools
+	nls? ( app-text/po4a sys-devel/gettext )"
 
 src_configure() {
 	local myconf=(