--- avrdude-5.5.ebuild	2008-07-30 09:05:28.000000000 +0200
+++ avrdude-5.6.ebuild	2009-04-12 11:37:26.008764217 +0200
@@ -5,55 +5,29 @@
 DESCRIPTION="AVR Downloader/UploaDEr"
 HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
 SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz
-	!doc? ( http://savannah.nongnu.org/download/${PN}/${PN}-doc-${PV}.tar.gz
+	doc? ( http://savannah.nongnu.org/download/${PN}/${PN}-doc-${PV}.tar.gz
 		http://savannah.nongnu.org/download/${PN}/${PN}-doc-${PV}.pdf )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~arm amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
-IUSE="doc"
-RDEPEND="dev-libs/libusb"
-DEPEND="${RDEPEND}
-	doc? ( app-text/texi2html
-		virtual/latex-base
-		sys-apps/texinfo )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# let the build system re-generate these, bug #120194
-	rm -f lexer.c config_gram.c config_gram.h
-}
+IUSE="doc html"
 
-src_compile() {
-	econf --disable-dependency-tracking --disable-doc || die "econf failed"
-
-	# Re-adding -j1 here (see bug #202576) but that should be fixed someday
-	emake -j1 || die "emake failed"
-
-	# We build docs separately since the makefile doesn't do it in a really nice way
-	if use doc ; then
-		cd doc
-		VARTEXFONTS="${T}/fonts" emake -j1 || die "emake doc failed"
-	fi
-}
+RDEPEND="dev-libs/libusb"
+DEPEND="${RDEPEND}"
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	dodoc AUTHORS NEWS README ChangeLog*
+	dodoc AUTHORS ChangeLog* NEWS README || die "dodoc failed"
 
-	# We either install docs we just built or those pre-made by upstream
-	insinto /usr/share/doc/${PF}
 	if use doc ; then
-		cd doc
-		doins avrdude.{ps,pdf}
-	else
-		newins "${DISTDIR}/${PN}-doc-${PV}.pdf" avrdude.pdf
-		cd "${WORKDIR}"
+		newdoc "${DISTDIR}/${PN}-doc-${PV}.pdf" avrdude.pdf || \
+			die "newdoc	failed"
+	fi
+
+	if use html; then
+		dohtml -r "${WORKDIR}/avrdude-html/" || die "dohtml failed"
 	fi
-	mv avrdude-html html
-	doins -r html
 }