From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Sun, 12 Feb 2017 23:22:11 +0000 (+0100)
Subject: Revert "x11-plugins/wmudmount: Depend on virtual/imagemagick-tools"
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c21d86862e276807a96f83b2362069ba4ab20b5a;p=gentoo.git

Revert "x11-plugins/wmudmount: Depend on virtual/imagemagick-tools"

This reverts commit 66db7e0ca3dd9acdcf2682794939e26780cbc95d.
---

diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild b/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild
index ee477870d1f6..4a317efe8244 100644
--- a/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild
+++ b/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils gnome2-utils
+EAPI=6
+inherit eutils gnome2-utils xdg
 
 DESCRIPTION="A filesystem mounter that uses udisks to handle notification and mounting"
 HOMEPAGE="https://sourceforge.net/projects/wmudmount/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gnome-keyring libnotify"
 
 RDEPEND="sys-fs/udisks:2
@@ -20,7 +20,7 @@ RDEPEND="sys-fs/udisks:2
 	libnotify? ( >=x11-libs/libnotify-0.7 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	virtual/imagemagick-tools[png]"
+	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )"
 
 DOCS="ChangeLog"
 
diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild b/x11-plugins/wmudmount/wmudmount-2.2.ebuild
similarity index 80%
rename from x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
rename to x11-plugins/wmudmount/wmudmount-2.2.ebuild
index 32e4f34064bd..bfdfa9dc1e3a 100644
--- a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
+++ b/x11-plugins/wmudmount/wmudmount-2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
-inherit eutils gnome2-utils xdg
+EAPI=5
+inherit eutils gnome2-utils
 
 DESCRIPTION="A filesystem mounter that uses udisks to handle notification and mounting"
 HOMEPAGE="https://sourceforge.net/projects/wmudmount/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome-keyring libnotify"
 
 RDEPEND="sys-fs/udisks:2
@@ -20,7 +20,7 @@ RDEPEND="sys-fs/udisks:2
 	libnotify? ( >=x11-libs/libnotify-0.7 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	virtual/imagemagick-tools[png]"
+	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )"
 
 DOCS="ChangeLog"