Version bump.

(Portage version: 2.2.0_alpha7_p8/cvs/Linux x86_64)

3 files changed, 199 insertions, 1 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index ddbc567827c1..38d42bb9369a 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.357 2010/11/28 15:15:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.358 2010/12/12 19:32:45 arfrever Exp $
+
+*sqlite-3.7.4 (12 Dec 2010)
+
+  12 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -files/sandbox-fix2.patch, -sqlite-3.6.22-r2.ebuild, -sqlite-3.6.23.1.ebuild,
+  -sqlite-3.6.23.1-r1.ebuild, -sqlite-3.7.0.ebuild, +sqlite-3.7.4.ebuild,
+  +files/sqlite-3.7.4-utimes.patch:
+  Version bump.
 
   28 Nov 2010; Brent Baude <ranger@gentoo.org> sqlite-3.7.3.ebuild:
   Marking sqlite-3.7.3 ppc64 for bug 342323
diff --git a/dev-db/sqlite/files/sqlite-3.7.4-utimes.patch b/dev-db/sqlite/files/sqlite-3.7.4-utimes.patch
new file mode 100644
index 000000000000..ddfa0451326a
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.7.4-utimes.patch
@@ -0,0 +1,35 @@
+--- configure.ac
++++ configure.ac
+@@ -127,7 +127,7 @@
+ #########
+ # Figure out whether or not we have these functions
+ #
+-AC_CHECK_FUNCS([usleep fdatasync localtime_r gmtime_r localtime_s])
++AC_CHECK_FUNCS([usleep utimes fdatasync localtime_r gmtime_r localtime_s])
+ 
+ #########
+ # By default, we use the amalgamation (this may be changed below...)
+--- src/os_unix.c
++++ src/os_unix.c
+@@ -120,6 +120,9 @@
+ #include <sys/time.h>
+ #include <errno.h>
+ #include <sys/mman.h>
++#ifndef HAVE_UTIMES
++#include <utime.h>
++#endif
+ 
+ #if SQLITE_ENABLE_LOCKING_STYLE
+ # include <sys/ioctl.h>
+@@ -1608,7 +1611,11 @@
+     pFile->eFileLock = eFileLock;
+ #if !OS_VXWORKS
+     /* Always update the timestamp on the old file */
++#ifdef HAVE_UTIMES
+     utimes(zLockFile, NULL);
++#else
++    utime(zLockFile, NULL);
++#endif
+ #endif
+     return SQLITE_OK;
+   }
diff --git a/dev-db/sqlite/sqlite-3.7.4.ebuild b/dev-db/sqlite/sqlite-3.7.4.ebuild
new file mode 100644
index 000000000000..2725483e4ad0
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.7.4.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.4.ebuild,v 1.1 2010/12/12 19:32:45 arfrever Exp $
+
+EAPI="3"
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="http://sqlite.org/"
+SRC_URI="doc? ( http://sqlite.org/${PN}-doc-${MY_PV}.zip )
+	tcl? ( http://sqlite.org/${PN}-src-${MY_PV}.zip )
+	!tcl? (
+		test? ( http://sqlite.org/${PN}-src-${MY_PV}.zip )
+		!test? ( http://sqlite.org/${PN}-autoconf-${MY_PV}.tar.gz )
+	)"
+
+LICENSE="as-is"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc +extensions +fts3 icu +readline secure-delete soundex tcl test +threadsafe unlock-notify"
+
+RDEPEND="icu? ( dev-libs/icu )
+	readline? ( sys-libs/readline )
+	tcl? ( dev-lang/tcl )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		dev-lang/tcl
+	)"
+
+amalgamation() {
+	use !tcl && use !test
+}
+
+pkg_setup() {
+	if amalgamation; then
+		S="${WORKDIR}/${PN}-autoconf-${MY_PV}"
+	else
+		S="${WORKDIR}/${PN}-src-${MY_PV}"
+	fi
+}
+
+src_prepare() {
+	if amalgamation; then
+		epatch "${FILESDIR}/${PN}-3.6.22-interix-fixes-amalgamation.patch"
+	else
+		epatch "${FILESDIR}/${P}-utimes.patch"
+		epatch "${FILESDIR}/${PN}-3.6.22-dlopen.patch"
+	fi
+
+	eautoreconf
+	epunt_cxx
+}
+
+src_configure() {
+	# `configure` from amalgamation tarball doesn't add -DSQLITE_DEBUG or -DNDEBUG flag.
+	if amalgamation; then
+		if use debug; then
+			append-cppflags -DSQLITE_DEBUG
+		else
+			append-cppflags -DNDEBUG
+		fi
+	fi
+
+	# Support column metadata, bug #266651
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support R-trees, bug #257646
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	if use icu; then
+		append-cppflags -DSQLITE_ENABLE_ICU
+		if amalgamation; then
+			sed -e "s/LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		else
+			sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+		fi
+	fi
+
+	# Support FTS3, bug #207701
+	if use fts3; then
+		append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
+	fi
+
+	# Enable secure_delete pragma by default
+	if use secure-delete; then
+		append-cppflags -DSQLITE_SECURE_DELETE -DSQLITE_CHECK_PAGES -DSQLITE_CORE
+	fi
+
+	# Support soundex, bug #143794
+	if use soundex; then
+		append-cppflags -DSQLITE_SOUNDEX
+	fi
+
+	# Enable unlock notification
+	if use unlock-notify; then
+		append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+	fi
+
+	local extensions_option
+	if amalgamation; then
+		extensions_option="dynamic-extensions"
+	else
+		extensions_option="load-extension"
+	fi
+
+	# Starting from 3.6.23, SQLite has locking strategies that are specific to
+	# OSX.  By default they are enabled, and use semantics that only make sense
+	# on OSX.  However, they require gethostuuid() function for that, which is
+	# only available on OSX starting from 10.6 (Snow Leopard).  For earlier
+	# versions of OSX we have to disable all this nifty locking options, as
+	# suggested by upstream.
+	if [[ "${CHOST}" == *-darwin[56789] ]]; then
+		append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE=0
+	fi
+
+	# `configure` from amalgamation tarball doesn't support
+	# --with-readline-inc and --(enable|disable)-tcl options.
+	econf \
+		$(use_enable extensions ${extensions_option}) \
+		$(use_enable readline) \
+		$(use_enable threadsafe) \
+		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
+		$(amalgamation || use_enable debug) \
+		$(amalgamation || echo --enable-tcl)
+}
+
+src_compile() {
+	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" || die "emake failed"
+}
+
+src_test() {
+	if [[ "${EUID}" -eq "0" ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	local test="test"
+	use debug && test="fulltest"
+	emake ${test} || die "Test failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install || die "emake install failed"
+	doman sqlite3.1 || die "doman failed"
+
+	if use doc; then
+		dohtml -r "${WORKDIR}/${PN}-doc-${MY_PV}/"* || die "dohtml failed"
+	fi
+}