--- dev-db/sqlite/sqlite-3.5.4.ebuild
+++ dev-db/sqlite/sqlite-3.5.4.ebuild
@@ -13,12 +13,11 @@
 LICENSE="as-is"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="debug doc soundex tcl +threadsafe"
+IUSE="debug soundex tcl +threadsafe"
 RESTRICT="!tcl? ( test )"
 
-DEPEND="doc? ( dev-lang/tcl )
-		tcl? ( dev-lang/tcl )"
-RDEPEND="tcl? ( dev-lang/tcl )"
+DEPEND="tcl? ( dev-lang/tcl )"
+RDEPEND="${DEPEND}"
 
 SOURCE="/usr/bin/lemon"
 ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
@@ -57,10 +56,6 @@
 		$(use_enable tcl)
 
 	emake all || die "emake all failed"
-
-	if use doc ; then
-		emake doc || die "emake doc failed"
-	fi
 }
 
 src_test() {
@@ -80,12 +75,10 @@
 		DESTDIR="${D}" \
 		TCLLIBDIR="/usr/$(get_libdir)" \
 		install \
-		|| die "make install failed"
-
-	newbin lemon lemon-${SLOT} || die
+		|| die "emake install failed"
 
-	dodoc README VERSION || die
-	doman sqlite3.1 || die
+	newbin lemon lemon-${SLOT} || die "newbin lemon lemon-${SLOT} failed"
 
-	use doc && dohtml doc/* art/*.gif
+	dodoc README || die "dodoc README failed"
+	doman sqlite3.1 || die "doman sqlite3.1 failed"
 }