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 \