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

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 dbd684bcd329515b60764279a94f47ee1b87b423..8c382d7d21bc79b1f09412b224e2843127a329e0 100644 (file)
--- 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 2f524d73f936a078aa0cfe7d7c63807fc9ce4808..45c68df4c5fa11f6b1c1a3f12ab589981599af3e 100644 (file)
--- 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=(