--- cogito-0.18.1.ebuild	2006-11-14 12:15:03.000000000 +0100
+++ cogito-0.18.2.ebuild	2006-11-26 22:41:42.000000000 +0100
@@ -4,42 +4,47 @@
 
 inherit eutils
 
-MY_PV=${PV//_/}
-
 DESCRIPTION="The GIT scripted toolkit"
 HOMEPAGE="http://kernel.org/pub/software/scm/cogito/"
-SRC_URI="mirror://kernel/software/scm/${PN}/${PN}-${MY_PV}.tar.bz2
-		mirror://gentoo/${PN}-doc-${MY_PV}.tar.bz2"
+SRC_URI="mirror://kernel/software/scm/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="doc"
 
-DEPEND=">=dev-util/git-1.4.3"
+DEPEND=">=dev-util/git-1.4.3
+	doc? ( app-text/asciidoc app-text/xmlto )"
 
-RDEPEND="app-text/rcs
+RDEPEND=">=dev-util/git-1.4.3
+	app-text/rcs
 	net-misc/curl"
 
-S=${WORKDIR}/${PN}-${MY_PV}
-SDOC=${WORKDIR}/${PN}-doc-${MY_PV}
-
 src_unpack() {
-	unpack ${A} ; cd "${S}"
+	unpack ${A}; cd "${S}"
 
 	# t9300-seek won't work under the sandbox
 	rm t/t9300-seek.sh
 }
 
+src_compile() {
+	if use doc; then
+		emake -C "${S}/Documentation" prefix="/usr" \
+			docdir="/usr/share/doc/${PF}" || die "docs generation failed"
+	fi
+}
+
 src_install() {
 	emake install DESTDIR="${D}" prefix="/usr" || die "install failed"
-	dodoc README* VERSION COPYING
-
-	doman "${SDOC}"/man?/*
+	
+	dodoc README TODO VERSION
 
-	dodir /usr/share/doc/${PF}/{,html,contrib}
-	cp "${SDOC}"/html/* "${D}"/usr/share/doc/${PF}/html
-	cp "${S}"/contrib/* "${D}"/usr/share/doc/${PF}/contrib
+	if use doc; then
+		doman "${S}"/Documentation/*.{1,7}
+		dodir /usr/share/doc/${PF}/{,html,contrib}
+		cp "${S}"/Documentation/*.html "${D}"/usr/share/doc/${PF}/html
+		cp "${S}"/contrib/* "${D}"/usr/share/doc/${PF}/contrib
+	fi
 }
 
 src_test() {