--- /media/system/repositories/portage/media-video/dvdauthor/dvdauthor-0.6.14.ebuild	2011-02-21 19:01:18.000000000 +0100
+++ dvdauthor-0.7.0.ebuild	2011-02-21 20:34:16.749896667 +0100
@@ -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/media-video/dvdauthor/dvdauthor-0.6.14.ebuild,v 1.4 2011/02/21 17:43:40 vapier Exp $
+# $Header: $
 
 EAPI="2"
 
@@ -12,21 +12,43 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="media-libs/libdvdread
-	>=media-gfx/imagemagick-5.5.7.14
-	>=dev-libs/libxml2-2.6.0
-	media-libs/freetype
+RDEPEND="
+	media-libs/libdvdread
+	media-libs/libpng
+	|| (
+		>=media-gfx/imagemagick-5.5.7.14
+		media-gfx/graphicsmagick[imagemagick]
+	)
+	media-libs/fontconfig
 	dev-libs/fribidi
-	media-libs/libpng"
+	media-libs/freetype
+	>=dev-libs/libxml2-2.6.0
+	"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext
+	app-text/docbook-sgml-utils
+"
+
+S=${WORKDIR}/${PN}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libpng-1.5.patch #355039
 }
 
+src_configure() {
+	econf \
+		--enable-largefile \
+		--disable-dependency-tracking \
+		--disable-localize-filenames \
+		--disable-rpath \
+		--disable-xmltest
+}
+
 src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc README TODO ChangeLog
+	make install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog README TODO || die
 }