--- dirac-1.0.2.ebuild	2010-12-27 13:21:13.000000000 +0100
+++ dirac-1.0.2-r1.ebuild	2010-12-27 22:51:59.000000000 +0100
@@ -1,27 +1,30 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-video/dirac/dirac-1.0.2.ebuild,v 1.8 2009/05/30 09:17:32 ulm Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit eutils autotools
+inherit autotools eutils
 
 DESCRIPTION="Open Source video codec"
-HOMEPAGE="http://dirac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://diracvideo.org/"
+SRC_URI="http://diracvideo.org/download/${PN}-research/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="mmx debug doc"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc mmx test"
 
 DEPEND="doc? ( app-doc/doxygen
-	virtual/latex-base
-	media-gfx/graphviz
-	|| ( app-text/dvipdfm
-		app-text/ptex )
-		)"
+		virtual/latex-base
+		media-gfx/graphviz
+		|| ( app-text/dvipdfm
+			app-text/ptex )
+	)
+	test? ( dev-lang/perl
+		>=dev-util/cppunit-1.12.1
+	)"
 RDEPEND=""
 
 src_unpack() {
@@ -35,9 +38,9 @@
 
 src_compile() {
 	econf \
-		$(use_enable mmx) \
 		$(use_enable debug) \
 		$(use_enable doc) \
+		$(use_enable mmx) \
 		|| die "econf failed"
 
 	VARTEXFONTS="${T}/fonts" emake || die "emake failed"
@@ -45,11 +48,11 @@
 
 src_install() {
 	emake DESTDIR="${D}" \
-		htmldir="/usr/share/doc/${PF}/html" \
-		latexdir="/usr/share/doc/${PF}/programmers" \
 		algodir="/usr/share/doc/${PF}/algorithm" \
 		faqdir="/usr/share/doc/${PF}" \
+		htmldir="/usr/share/doc/${PF}/html" \
+		latexdir="/usr/share/doc/${PF}/programmers" \
 		install || die "emake install failed"
 
-	dodoc README AUTHORS NEWS TODO ChangeLog
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }