Bug #365385 - Remove graphicsmagick choice since it doesn't have compatible headers.

(Portage version: 2.2.0_alpha30_p33/cvs/Linux i686)

4 files changed, 12 insertions, 7 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 3249003a7065..985d90b7fbb0 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.145 2011/04/30 17:02:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.146 2011/05/02 16:02:06 zmedico Exp $
+
+  02 May 2011; Zac Medico <zmedico@gentoo.org> calibre-0.7.54.ebuild,
+  calibre-0.7.56.ebuild, calibre-0.7.59.ebuild:
+  Bug #365385 - Remove graphicsmagick choice since it doesn't have compatible
+  headers.
 
 *calibre-0.7.59 (30 Apr 2011)
 
diff --git a/app-text/calibre/calibre-0.7.54.ebuild b/app-text/calibre/calibre-0.7.54.ebuild
index 9d1933c8e026..9d328c26c2e5 100644
--- a/app-text/calibre/calibre-0.7.54.ebuild
+++ b/app-text/calibre/calibre-0.7.54.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.54.ebuild,v 1.1 2011/04/11 17:42:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.54.ebuild,v 1.2 2011/05/02 16:02:06 zmedico Exp $
 
 EAPI=3
 PYTHON_DEPEND=2:2.7
@@ -34,7 +34,7 @@ SHARED_DEPEND="
 	>=dev-python/mechanize-0.1.11
 	>=dev-python/python-dateutil-1.4.1
 	>=dev-python/PyQt4-4.8.2[X,svg,webkit]
-	|| ( >=media-gfx/imagemagick-6.5.9 media-gfx/graphicsmagick[imagemagick] )
+	>=media-gfx/imagemagick-6.5.9
 	>=media-libs/libwmf-0.2.8
 	virtual/libusb:0
 	>=x11-misc/xdg-utils-1.0.2"
diff --git a/app-text/calibre/calibre-0.7.56.ebuild b/app-text/calibre/calibre-0.7.56.ebuild
index d03412c278ad..1f1d5253b904 100644
--- a/app-text/calibre/calibre-0.7.56.ebuild
+++ b/app-text/calibre/calibre-0.7.56.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.56.ebuild,v 1.1 2011/04/18 01:33:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.56.ebuild,v 1.2 2011/05/02 16:02:06 zmedico Exp $
 
 EAPI=3
 PYTHON_DEPEND=2:2.7
@@ -34,7 +34,7 @@ SHARED_DEPEND="
 	>=dev-python/mechanize-0.1.11
 	>=dev-python/python-dateutil-1.4.1
 	>=dev-python/PyQt4-4.8.2[X,svg,webkit]
-	|| ( >=media-gfx/imagemagick-6.5.9 media-gfx/graphicsmagick[imagemagick] )
+	>=media-gfx/imagemagick-6.5.9
 	>=media-libs/libwmf-0.2.8
 	virtual/libusb:0
 	>=x11-misc/xdg-utils-1.0.2"
diff --git a/app-text/calibre/calibre-0.7.59.ebuild b/app-text/calibre/calibre-0.7.59.ebuild
index b1453edc14ae..90077bcd2033 100644
--- a/app-text/calibre/calibre-0.7.59.ebuild
+++ b/app-text/calibre/calibre-0.7.59.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.59.ebuild,v 1.1 2011/04/30 17:02:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.59.ebuild,v 1.2 2011/05/02 16:02:06 zmedico Exp $
 
 EAPI=3
 PYTHON_DEPEND=2:2.7
@@ -34,7 +34,7 @@ SHARED_DEPEND="
 	>=dev-python/mechanize-0.1.11
 	>=dev-python/python-dateutil-1.4.1
 	>=dev-python/PyQt4-4.8.2[X,svg,webkit]
-	|| ( >=media-gfx/imagemagick-6.5.9 media-gfx/graphicsmagick[imagemagick] )
+	>=media-gfx/imagemagick-6.5.9
 	>=media-libs/libwmf-0.2.8
 	virtual/libusb:0
 	>=x11-misc/xdg-utils-1.0.2"