add doc and tcltk flag

Package-Manager: portage-2.0.51.19

4 files changed, 47 insertions, 37 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 11489d10b75e..baa29362c61f 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.73 2005/04/04 13:34:43 gustavoz Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.74 2005/04/06 18:36:09 arj Exp $
+
+  05 Apr 2005; Anders Rune Jensen <arj@gentoo.org>
+  sqlite-2.8.16-r1.ebuild, sqlite-3.2.1-r1.ebuild:
+  Add useflag doc to install html documentation. This removes the
+  dependency on tcl by default. Thanks to Clinton James for the
+  suggestion. Add doc flag to 3.2.1-r1 as 3.2.1 now supports generating
+  documentation again.
+	
   04 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   sqlite-2.8.16-r1.ebuild:
   Stable on sparc
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index c084ef9b48db..a443c58d2ab0 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,27 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c341f189d403c53488204b63d57880b8 ChangeLog 10369
 MD5 4d4bfa913883e6229573e79b6f02aa3b metadata.xml 275
-MD5 fdbecebdb331496cd81f02ea4487e430 sqlite-2.8.13.ebuild 843
-MD5 99bf2a671c91f7499255003439d5eac0 sqlite-2.8.14.ebuild 862
+MD5 19a44977f4b11ba192cc0430ce0a1908 sqlite-2.8.16-r1.ebuild 1765
 MD5 78d3fa35ae4558e4a5add1fd47fd814f sqlite-2.8.15.ebuild 969
-MD5 bcc1b77342a62ecdd614e6ced4fb6f5e sqlite-3.2.1-r1.ebuild 1849
+MD5 fdbecebdb331496cd81f02ea4487e430 sqlite-2.8.13.ebuild 843
+MD5 86ad2d2037d8bd1b5b6b901a2f8a773f sqlite-3.2.1-r1.ebuild 1666
 MD5 8cda692208b4f43344d30e5bfa2ee396 sqlite-2.8.16.ebuild 1402
-MD5 7344521ba94c1c7d5ce954c14fa4f197 sqlite-2.8.16-r1.ebuild 1622
-MD5 c35f34620d18893001720951f8ea0c73 files/digest-sqlite-2.8.13 65
+MD5 65a4c5f63d311f330c19f51cbfff3354 ChangeLog 10693
+MD5 99bf2a671c91f7499255003439d5eac0 sqlite-2.8.14.ebuild 862
 MD5 c9c200833c7c14eb4d750bb00455199e files/digest-sqlite-2.8.14 65
-MD5 b4031f19b8a32fa2b9dd4dfaf4b57ad0 files/digest-sqlite-2.8.15 65
-MD5 9dce926cc47853cb563ab467d1c5ba28 files/digest-sqlite-3.2.1-r1 65
-MD5 d0fc4c53a61d386992d16680140548d0 files/maketcllib.sh 879
-MD5 217c8f27a3185a30858423e31e1aa4d9 files/sqlite-2.8.15-alignement-fix.patch 538
-MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16 65
+MD5 c35f34620d18893001720951f8ea0c73 files/digest-sqlite-2.8.13 65
 MD5 60fec205107aa53f0cf83d62c2300183 files/sqlite-2.8.16-multilib.patch 4038
+MD5 217c8f27a3185a30858423e31e1aa4d9 files/sqlite-2.8.15-alignement-fix.patch 538
 MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16-r1 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCUUKDKRy60XGEcJIRAjzrAKCOAS9vccHrs2sj1osSRu5QNBkj9QCgnMnj
-fOS7/mskKtY5VOKiUpGOOV4=
-=Pbnj
------END PGP SIGNATURE-----
+MD5 9dce926cc47853cb563ab467d1c5ba28 files/digest-sqlite-3.2.1-r1 65
+MD5 b4031f19b8a32fa2b9dd4dfaf4b57ad0 files/digest-sqlite-2.8.15 65
+MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16 65
+MD5 d0fc4c53a61d386992d16680140548d0 files/maketcllib.sh 879
diff --git a/dev-db/sqlite/sqlite-2.8.16-r1.ebuild b/dev-db/sqlite/sqlite-2.8.16-r1.ebuild
index 295541ce65fb..0b311881a54c 100644
--- a/dev-db/sqlite/sqlite-2.8.16-r1.ebuild
+++ b/dev-db/sqlite/sqlite-2.8.16-r1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r1.ebuild,v 1.2 2005/04/04 13:34:43 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r1.ebuild,v 1.3 2005/04/06 18:36:09 arj Exp $
 
 inherit eutils toolchain-funcs
 
-IUSE="nls"
+IUSE="nls doc tcltk"
 
 DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
 SRC_URI="http://www.sqlite.org/${P}.tar.gz"
 HOMEPAGE="http://www.sqlite.org"
 DEPEND="virtual/libc
-	dev-lang/tcl"
+	doc? (dev-lang/tcl)
+	tcltk? (dev-lang/tcl)"
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 ~ppc sparc ~alpha ~arm ~mips ~hppa ~ppc64 amd64 ~ppc-macos"
@@ -42,11 +43,17 @@ src_compile() {
 	myconf="--enable-incore-db --enable-tempdb-in-ram"
 	myconf="${myconf} `use_enable nls utf8`"
 	econf ${myconf} || die
-	emake all doc || die
+	emake all || die
 
+	if use doc; then
+	emake doc || die
+	fi
+
+	if use tcltk; then
 	cp -P ${FILESDIR}/maketcllib.sh ${S}
 	chmod +x ./maketcllib.sh
 	./maketcllib.sh
+	fi
 }
 
 src_install () {
@@ -57,10 +64,15 @@ src_install () {
 	dobin lemon
 	dodoc README VERSION
 	doman sqlite.1
+
+	if use doc; then
 	docinto html
 	dohtml doc/*.html doc/*.txt doc/*.png
+	fi
 
+	if use tcltk; then
 	mkdir ${D}/usr/lib/tclsqlite${PV}
 	cp ${S}/tclsqlite.so ${D}/usr/lib/tclsqlite${PV}/
 	cp ${S}/pkgIndex.tcl ${D}/usr/lib/tclsqlite${PV}/
+	fi
 }
diff --git a/dev-db/sqlite/sqlite-3.2.1-r1.ebuild b/dev-db/sqlite/sqlite-3.2.1-r1.ebuild
index fd0dbcf0da96..c0740c5d4600 100644
--- a/dev-db/sqlite/sqlite-3.2.1-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.2.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.2.1-r1.ebuild,v 1.1 2005/04/02 20:11:34 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.2.1-r1.ebuild,v 1.2 2005/04/06 18:36:09 arj Exp $
 
 inherit eutils
 
-IUSE="nothreadsafe"
+IUSE="nothreadsafe doc"
 
 DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
 SRC_URI="http://www.sqlite.org/${P}.tar.gz"
@@ -15,18 +15,13 @@ HOMEPAGE="http://www.sqlite.org"
 #   - 20041203, Armando Di Cianno <fafhrd@gentoo.org>
 DEPEND="virtual/libc
 	!nothreadsafe? ( !ppc-macos? ( sys-libs/glibc ) )
-	dev-lang/tcl"
+	doc? (dev-lang/tcl)"
 SLOT="3"
 LICENSE="as-is"
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
 
 src_compile() {
-	# sqlite includes a doc directory making it impossible to generate docs, 
-	# which are very important to people adding support for sqlite3 to their
-	# programs.
-	rm -rf doc/
-
 	local myconf
 	myconf="--enable-incore-db --enable-tempdb-in-ram"
 	# Yes, this is ridiculous, but I'm not the maintainer for this ebuild,
@@ -37,9 +32,12 @@ src_compile() {
 	else
 		myconf="${myconf} --disable-threadsafe"
 	fi
-	myconf="--with-tcl=/usr/$(get_libdir)/"
 	econf ${myconf} || die
-	emake all || die # doc is not working yet in 3.1.2
+	emake all || die
+
+	if use doc; then
+	emake doc
+	fi
 }
 
 # In case we ever want testing support; note: this needs more work, as
@@ -56,6 +54,9 @@ src_install () {
 	dobin lemon
 	dodoc README VERSION
 	doman sqlite3.1
+
+	if use doc; then
 	docinto html
 	dohtml doc/*.html doc/*.txt doc/*.png
+	fi
 }