# HG changeset patch
# User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
# Date 2010-12-30 19:08:54
# Node ID a9be038f9b422cc28f80cd8aa56d6b98e4dca90a
# Parent  6cf54704c68a66ea6b66fa62123f622d3def13f1

dev-tex/tex4ht: Replace imagemagick RDEPEND with one on either imagemagick or graphicsmagick.

(Portage version: 2.2.0_alpha2-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050)

diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -3,22 +3,22 @@ Hash: SHA256
 
 AUX 50tex4ht.cnf 192 RMD160 5b1858ef986eee4d9cc353e2147bee99938d7529 SHA1 6e7e561eb5bbf86dcd32b058e55cd5947e59e783 SHA256 5c9659aad7091b763e4a1363d78629a1ad8e1fe5ba679c151b95c69f4de9d9c1
 DIST tex4ht-1.0.2009_06_11_1038.tar.gz 2576719 RMD160 09bce74e23058d02bc251305632cea4a4ee6595d SHA1 7d46488059316dec3234b6478cd0d2ca8f4d110f SHA256 9f3e259641bb7d5f32b8efaa85cb7c1a9f1a17f5fc6a859c81449d9984ec91a3
-EBUILD tex4ht-20090611_p1038-r1.ebuild 3349 RMD160 9c01b16453ed2ca0717fd640763e1b494b81dee5 SHA1 0453c84550a548dfc2166e78c05f0203610b2861 SHA256 8887a20622a17d6b4559769eefd027df7ef8ea28ce1afdcf29ba93a037a41e8c
+EBUILD tex4ht-20090611_p1038-r1.ebuild 3401 RMD160 1238dde43743df8a77a0bbe46c36ad9ab7f8b907 SHA1 77dd1641320e5bc71e7c56be907f060d27301a95 SHA256 379e578d9108ff4d5dc97d5c7d9e0323217e411b70238e6bd78222f7db85ec98
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNHRrPAAoJEHQ6UuhrqBBQgz4QALU4CLGF/uPrcDRCvK1ZV5V6
-hyuEnNh4eGrbSlWnM7LaklW61RfZd0Kbf/u1Tpg9UuDiLN7ec/w6zzmWPFX8rrMt
-7Z8sF7fEFXKpomdK3U4k/aUYDYe86TKnPgkSR0qfMgOEhrdR6VXV3/I7Fh6mFymS
-PIF9NIShkwv4P4d2jBBF5R45YtqRwkxdOHMlyjEZLuT043qEzrtwot0g8nhfpJNH
-44y7wJR670Tv7uVDZnSuKnyIx22DKgYC652U2gNOtCYycVU2kiw7AdCzhqa4LUhy
-qJWBQbrujB5pSgO8PZCBUZw+AQiMQdASk/pcN3ITRSX+LoY9COgUeyt9peC7pEVG
-RMz4S/kMgOowQLOLIBaM2psYZHkKHVwkLOl95M51jgdeFOaWBAy/efeRbbvjt6PA
-QdhTaQsX0NtCp1OJMG4VS0Ut2PPb6X/QSNjdaXhYUGIY2cT4VhIiuYG9M/pWt1Jq
-Dp7cqfT8qf8tX1cRd4RrtajTn8jLZ17DnbUuouWji6H3qjRFWnbo57XyZoPTWWCH
-oYJh9QjvQS0+foCX6LTATw9ak8v69WKD22c17FuYhLJ09IBStF6WRz8N8fU61FSI
-tj6YFT/xVfQPARQx2Hyrp5zoL63i0hn3K+1dkNJkZIru/8NtLgx/3YfLYvbuxz/N
-9FXHv4J3Plsx+TQ3jjM8
-=VRfY
+iQIcBAEBCAAGBQJNHR8WAAoJEHQ6UuhrqBBQNDsP/1zKGbnd2DIkBCply4J7xwcH
+v9eJ9WQSchkZcs3j8qz3W6/XPD1/Fjcod6HfMr+yZbS0Gip5Mf+6FBDVi83RtM2c
+yU5rk/Ax6ZU1ith1+9dlDz675UFHca1+Z8uONQ8NWenE20zMyHXS3Y6OlScRhuSS
+o7fvZMywd9J1qthuVtVZIrZL2IHDpUUmCm3nELEKOLvYiPqHGallUcOLLFNzhG5R
+gTVtTsNs5e9wtLcCvHLBFtPCQq+m/8mfNcAEKKplDAHaOVP4AbqWiA2ITOdqlnAF
+EmguUh6pBURXO/WjYxj2YbLxdZIBfsvuFXVvI9G8lAJVGQ8CDb3Jnk21dN0iV/qP
+88yN20yKvtkZFg3LXY8NWOor5/+lWPq+QehFUzbPlxO6jCsWjoUxlI8IOkWnNLIN
+EvtfXfmT3p4KZa2LBqfyki2EagoUHqwe7vu/dLvA3EW49iQMRi3RAQT4/DFe1vi0
+U0PXvOwv36bgIL5fUKbYEZSNZpHR1SGxuhfPKT1hXLxt8asIuuFtm8M+rCq2j/fh
+pv75PeMyk4j7q4GitetQiwy6z/DKJXQirArZ5+Oy33JVI5sFxp22pMhI0dLbwkYE
+PL+NApJO2M6AGQd5+ZF0Wxp3/mCFQB2uPQyH5Dw0ZlRGor3iWaimz39dJnqUDqei
+C8DqJFiIwr4RIFADmLSg
+=KJ+G
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r1.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r1.ebuild
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r1.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-tex/tex4ht/tex4ht-20090611_p1038-r1.ebuild,v 1.8 2010/07/18 12:25:15 nixnut Exp $
 
+EAPI="2"
+
 inherit latex-package toolchain-funcs java-pkg-opt-2
 
 IUSE=""
@@ -22,16 +24,16 @@ DEPEND=">=sys-apps/sed-4
 	java? ( >=virtual/jdk-1.5 )"
 
 RDEPEND="app-text/ghostscript-gpl
-	media-gfx/imagemagick
+	|| ( media-gfx/imagemagick
+		media-gfx/graphicsmagick[imagemagick] )
 	java? ( >=virtual/jre-1.5 )"
 
 IUSE="java"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}/texmf/tex4ht/base/unix"
+src_prepare() {
+	cd "${S}/texmf/tex4ht/base/unix" || die
 	sed -i -e \
 	's#~/tex4ht.dir#/usr/share#' tex4ht.env || die
 	sed -i -e \