fix bugs

(Portage version: 2.0.53_rc7)

7 files changed, 171 insertions, 5 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index e6dc1e902ab0..5b08bb68c6b9 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.97 2005/10/12 19:17:55 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.98 2005/11/06 17:38:28 arj Exp $
 
+  06 Nov 2005; Anders Rune Jensen <arj@gentoo.org>
+  +sqlite-3.2.7-r1.ebuild, +sqlite-2.8.16-r2.ebuild:
+  Fix #102117
+	
+  06 Nov 2005; Anders Rune Jensen <arj@gentoo.org> sqlite-3.2.7.ebuild:
+  Marked stable on amd64. Fixes #106703
+	
   12 Oct 2005; Anders Rune Jensen <arj@gentoo.org> -sqlite-3.2.1-r1, 
   -sqlite-3.2.1-r2, -sqlite-3.2.2, -sqlite-3.2.5, -sqlite-3.2.6, 
   -sqlite-2.8.16:
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 7d48b3498319..ad6e4fed9506 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,10 +1,12 @@
-MD5 5b44abbf0e3ba1c3297a4cfa12e06f64 ChangeLog 13304
+MD5 3e4a07814cf799ef71a1bc4909306841 ChangeLog 13404
 MD5 c35f34620d18893001720951f8ea0c73 files/digest-sqlite-2.8.13 65
 MD5 c9c200833c7c14eb4d750bb00455199e files/digest-sqlite-2.8.14 65
 MD5 b4031f19b8a32fa2b9dd4dfaf4b57ad0 files/digest-sqlite-2.8.15 65
 MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16-r1 65
+MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16-r2 65
 MD5 9dce926cc47853cb563ab467d1c5ba28 files/digest-sqlite-3.2.1-r3 65
 MD5 b30bbb90979fff71122f08b8cbee4013 files/digest-sqlite-3.2.7 65
+MD5 b30bbb90979fff71122f08b8cbee4013 files/digest-sqlite-3.2.7-r1 65
 MD5 d0fc4c53a61d386992d16680140548d0 files/maketcllib.sh 879
 MD5 217c8f27a3185a30858423e31e1aa4d9 files/sqlite-2.8.15-alignement-fix.patch 538
 MD5 60fec205107aa53f0cf83d62c2300183 files/sqlite-2.8.16-multilib.patch 4038
@@ -15,5 +17,7 @@ MD5 fdbecebdb331496cd81f02ea4487e430 sqlite-2.8.13.ebuild 843
 MD5 99bf2a671c91f7499255003439d5eac0 sqlite-2.8.14.ebuild 862
 MD5 78d3fa35ae4558e4a5add1fd47fd814f sqlite-2.8.15.ebuild 969
 MD5 e70e6589155e500c411989e70270385a sqlite-2.8.16-r1.ebuild 1773
+MD5 cd4ab471be974f46b4742e825e518378 sqlite-2.8.16-r2.ebuild 1829
 MD5 2328b34bef313c5f4be5e780f9932dc3 sqlite-3.2.1-r3.ebuild 1574
-MD5 2451c13fe8280dc16b60090244c3f3c6 sqlite-3.2.7.ebuild 1545
+MD5 81f67dc3189261d1a3122160dd530ae8 sqlite-3.2.7-r1.ebuild 1594
+MD5 f68cd234019c43d1a44e4e643f62b4ad sqlite-3.2.7.ebuild 1544
diff --git a/dev-db/sqlite/files/digest-sqlite-2.8.16-r2 b/dev-db/sqlite/files/digest-sqlite-2.8.16-r2
new file mode 100644
index 000000000000..f63e1aac46f1
--- /dev/null
+++ b/dev-db/sqlite/files/digest-sqlite-2.8.16-r2
@@ -0,0 +1 @@
+MD5 9c79b461ff30240a6f9d70dd67f8faea sqlite-2.8.16.tar.gz 981834
diff --git a/dev-db/sqlite/files/digest-sqlite-3.2.7-r1 b/dev-db/sqlite/files/digest-sqlite-3.2.7-r1
new file mode 100644
index 000000000000..5bb8bb3f1a83
--- /dev/null
+++ b/dev-db/sqlite/files/digest-sqlite-3.2.7-r1
@@ -0,0 +1 @@
+MD5 34c92821b3b46380f192c0aaf2b2b217 sqlite-3.2.7.tar.gz 1521075
diff --git a/dev-db/sqlite/sqlite-2.8.16-r2.ebuild b/dev-db/sqlite/sqlite-2.8.16-r2.ebuild
new file mode 100644
index 000000000000..6cbae0aa5c40
--- /dev/null
+++ b/dev-db/sqlite/sqlite-2.8.16-r2.ebuild
@@ -0,0 +1,84 @@
+# 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-r2.ebuild,v 1.1 2005/11/06 17:38:28 arj Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="SQLite: An SQL Database Engine in a C Library"
+HOMEPAGE="http://www.sqlite.org/"
+SRC_URI="http://www.sqlite.org/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="nls doc tcltk"
+
+DEPEND="doc? ( dev-lang/tcl )
+	tcltk? ( dev-lang/tcl )"
+
+src_unpack() {
+	unpack ${A}
+
+	use hppa && epatch ${FILESDIR}/${PN}-2.8.15-alignement-fix.patch
+
+	epatch ${FILESDIR}/${P}-multilib.patch
+
+	epunt_cxx
+
+	if use nls; then
+		ENCODING=${ENCODING-"UTF8"}
+	else
+		ENCODING="ISO8859"
+	fi
+
+	sed -i -e "s:@@S@@:${S}:g" \
+	       -e "s:@@CC@@:$(tc-getCC):g" \
+	       -e "s:@@CFLAGS@@:${CFLAGS}:g" \
+	       -e "s:@@AR@@:$(tc-getAR):g" \
+	       -e "s:@@RANLIB@@:$(tc-getRANLIB):g" \
+	       -e "s:@@ENCODING@@:${ENCODING}:g" \
+	       ${S}/Makefile.linux-gcc
+}
+
+src_compile() {
+	local myconf
+	myconf="--enable-incore-db --enable-tempdb-in-ram"
+	myconf="${myconf} `use_enable nls utf8`"
+	econf ${myconf} || 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 () {
+	dodir /usr/{bin,include,$(get_libdir)}
+
+	make DESTDIR="${D}" install || die
+
+	if ! [ -e ${DESTDIR}/usr/bin/lemon ]
+	then
+	dobin lemon
+	fi
+
+	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.7-r1.ebuild b/dev-db/sqlite/sqlite-3.2.7-r1.ebuild
new file mode 100644
index 000000000000..e09244819e93
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.2.7-r1.ebuild
@@ -0,0 +1,69 @@
+# 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.7-r1.ebuild,v 1.1 2005/11/06 17:38:28 arj Exp $
+
+inherit eutils
+
+DESCRIPTION="SQLite: An SQL Database Engine in a C Library"
+HOMEPAGE="http://www.sqlite.org/"
+SRC_URI="http://www.sqlite.org/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="nothreadsafe doc"
+
+DEPEND="virtual/libc
+	doc? ( dev-lang/tcl )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${P}
+	epatch ${FILESDIR}/sqlite-3.2.1-tcl-fix.patch
+	epunt_cxx
+}
+
+src_compile() {
+	local myconf
+	myconf="--enable-incore-db --enable-tempdb-in-ram"
+	# Yes, this is ridiculous, but I'm not the maintainer for this ebuild,
+	#   and yet it's broken w/o thread support, so this has to do for now
+	#   - 20041203, Armando Di Cianno <fafhrd@gentoo.org>
+	if ! use nothreadsafe; then
+		myconf="${myconf} --enable-threadsafe"
+	else
+		myconf="${myconf} --disable-threadsafe"
+	fi
+	econf ${myconf} || die
+	emake all || die
+
+	if use doc; then
+	emake doc
+	fi
+}
+
+# In case we ever want testing support; note: this needs more work, as
+#   as it causes some sandbox issues.
+#   - 20041203, Armando Di Cianno <fafhrd@gentoo.org>
+#src_test() {
+#	cd ${S}
+#	emake fulltest || die "some test failed"
+#}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+
+	if ! [ -e ${DESTDIR}/usr/bin/lemon ]
+	then
+	dobin lemon
+	fi
+
+	dodoc README VERSION
+	doman sqlite3.1
+
+	if use doc; then
+	docinto html
+	dohtml doc/*.html doc/*.txt doc/*.png
+	fi
+}
diff --git a/dev-db/sqlite/sqlite-3.2.7.ebuild b/dev-db/sqlite/sqlite-3.2.7.ebuild
index f0d8a4725365..1fed0cdeedb4 100644
--- a/dev-db/sqlite/sqlite-3.2.7.ebuild
+++ b/dev-db/sqlite/sqlite-3.2.7.ebuild
@@ -1,6 +1,6 @@
 # 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.7.ebuild,v 1.1 2005/10/07 22:11:08 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.2.7.ebuild,v 1.2 2005/11/06 17:38:28 arj Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.sqlite.org/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 IUSE="nothreadsafe doc"
 
 DEPEND="virtual/libc