Version bump (bug #353772). Fix building on FreeMiNT (bug #344353). Fixed building of tests with USE="-threadsafe" (bug #348435).

Package-Manager: portage-2.2.0_alpha20/cvs/Linux x86_64

4 files changed, 209 insertions, 3 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 7a796788c414..38946d862110 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,13 @@
 # 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.359 2010/12/13 04:43:54 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.360 2011/02/06 14:03:29 arfrever Exp $
+
+*sqlite-3.7.5 (06 Feb 2011)
+
+  06 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +sqlite-3.7.5.ebuild, +files/sqlite-3.7.5-utimes.patch:
+  Version bump (bug #353772). Fix building on FreeMiNT (bug #344353). Fixed
+  building of tests with USE="-threadsafe" (bug #348435).
 
   13 Dec 2010; Jeroen Roovers <jer@gentoo.org> sqlite-3.7.3.ebuild:
   Stable for HPPA PPC (bug #348079).
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index ddc52f56865b..5a62cc62faba 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -6,19 +6,24 @@ AUX sqlite-3.6.22-interix-fixes-amalgamation.patch 717 RMD160 dfae5e2d22cddad5a2
 AUX sqlite-3.6.22-interix-fixes.patch 614 RMD160 0492235d52c003620a84888c36541bd8f40b44d2 SHA1 48cacb6fcd220cf1875d1fc5c640ee9cd5b3dd2f SHA256 1990fca1660bf0781875dbc699078c9eac54a643e4fece82faf765f7ccf8aaad
 AUX sqlite-3.7.3-icu_tests.patch 7858 RMD160 eb2a653de13a2e276fc67b7784a91b85897c1a27 SHA1 578e82fd6765b0f953dbbf5f5cefe115a027a063 SHA256 4b4a92cd1e09c0945282862acde883ddc20ff01ce811b682dbd25c11fcc2320b
 AUX sqlite-3.7.4-utimes.patch 840 RMD160 d8c400732096c20bc9054bba90028ee831b07d19 SHA1 47b26eaa946a7a37bb0e68a41218f86d135493a5 SHA256 9570b925e7c34eea89fd6ca0a2a734dd24f99efdcfa295a1a80e999a75fae4fb
+AUX sqlite-3.7.5-utimes.patch 830 RMD160 168a123fedcd50db1141ae32f6bb647349f9e65a SHA1 e6f541f3748a19b8649d4b1e7f496e540128219d SHA256 e25d602aa72c5b607f82900598b61493d556ed202df2c7fe4e15072dd556e6c6
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
 DIST sqlite-3.7.2.tar.gz 3309139 RMD160 8f831cebeec41b21a0e009df1966822ab0546ff4 SHA1 b5e66d8d52ad7ef4761d0b10590bc24442b965be SHA256 bb53cad58f1c502662644d88e24a552dc8de982d650f80d8debaf13b15bb3b8a
 DIST sqlite-3.7.3.tar.gz 3410714 RMD160 c7f5f026a972d8ea03818cfc1f348dc4b62fc062 SHA1 2951de8f1e4a05172eb91710b7d3628fe3ea20a3 SHA256 dbf352e8fbb74829f5e7a88f9f6ceeb80a709537f668c36e4b6cdfb271309ef6
 DIST sqlite-amalgamation-3.7.2.tar.gz 1499007 RMD160 9f1fd0658b0f6df2288214cd7aebef533f3a6b00 SHA1 12aed8fc9c729444e82a27644ceb6d6a0e695cfc SHA256 74eb7f0299179ae3979f6630dd730b603f6e21889fc60cef56f06076fd02258a
 DIST sqlite-amalgamation-3.7.3.tar.gz 1512409 RMD160 9a09db08c40226a09a700cb2b6cea79d04a0bab9 SHA1 af3740819547f0dba52e096045525329f645c54f SHA256 3186631378474575dd766f46583219903db2b26af1f78cb15318e79c227a0080
 DIST sqlite-autoconf-3070400.tar.gz 1545086 RMD160 eb5d575b7dc1951f0c0f2997f50fbf7d206e502d SHA1 43848641320cb60fb7f445bc295b9870cdc127be SHA256 54ef0481d4318aaf0d701cbcccf67f80d96568e34279b949cfded900b1e4348c
+DIST sqlite-autoconf-3070500.tar.gz 1551070 RMD160 8bec6a7bfec1c8786dde0586916b0b99e509b2ce SHA1 4e1338497b8da50b84307191bb3418e9ec5715d7 SHA256 cb5b86926ec9f65882b2dddd244f2d620337d911ec73411863f77e48cf6a2f94
 DIST sqlite-doc-3070400.zip 3486533 RMD160 f6892a7718c286e44dc7fb7dba8e1d3c47a34127 SHA1 7e41836201bd43e457f800b2430ff4786940c334 SHA256 6ed9d504c617232f861dc0d2f682bef9804c3eed45d85d18384ae959b0109195
+DIST sqlite-doc-3070500.zip 3491310 RMD160 2e84f51d7f755af65fd502d64a44e3f7d0ffbd3a SHA1 d103de0bc344dde0153d170af74d56db0437d770 SHA256 812b6846d7a397546936ee8a5662a30bdd1b3b2792571f3f0211a2008cbb71de
 DIST sqlite-src-3070400.zip 3997962 RMD160 aaed6457cf2c633d3c83c46112aa7a868947adcf SHA1 c0d04178e5a18e1ce033e035a84dda9725ddd988 SHA256 e7540069fad017a9dec374241b346570ce6c360e2960749ddcacac81f965c9b4
+DIST sqlite-src-3070500.zip 3987471 RMD160 4d5f2091700e9c183e861613203a1ddb66217c0f SHA1 9706110d635c347e16ddb8cea1b4923385fecfac SHA256 1bb838c02b4946c514e28cfcd1c15b0079f8626f5fbcfcf2b48e2a075acc5c51
 DIST sqlite_docs_3_7_2.zip 3290342 RMD160 71dbd088d155c2b56d7e45f30cede09516e4193e SHA1 4a2ea2078ee9721a1d7e172e7ed02eecc8470412 SHA256 f78e8d24a3cb6b713370b4ff26ae60b770064526b67d20e6b0efbc109e3818c7
 DIST sqlite_docs_3_7_3.zip 3277639 RMD160 f44e79c0b299942c1351765c6cd5ac693261e3ed SHA1 49ef65bfd52f9dc275dd94c3cf10c5720c2de7e5 SHA256 94bd6143ff280a60474ecdc5faff29d339aa78b8c266c16d62259b3eea61ff5a
 EBUILD sqlite-2.8.16-r4.ebuild 2693 RMD160 f0d7c0c813b135e75e32bc5489080d6d32492d17 SHA1 3d8b88705e097b77f4d05104ff47b942afe758d2 SHA256 c691b6a7628a48f1c446fe016970cc0cbde0dd0e0d019d28603b5f54b860c364
 EBUILD sqlite-3.7.2.ebuild 4705 RMD160 966f6f42913dc5be95b3fb5e0db958fa57b8a0d3 SHA1 9d2f6223487d699f6720ec80e183999c0ff8b3cf SHA256 d02efb1e66b1f8faa9c76c1b80eff2d7a10ae437764568f41b7faa9c4bcd9ca2
 EBUILD sqlite-3.7.3.ebuild 4708 RMD160 1d368f54b794caf054d0ce9e637b54c2fe5c2fc5 SHA1 781350aa150c8357dba929e7646f68e2f5430d8e SHA256 a2b957285e5aba6d1759cd2914cc4bbfbf34e97a1e65976ca3eb6ff8e840a615
 EBUILD sqlite-3.7.4.ebuild 4417 RMD160 e5185f2888c7f7a47680a27e1d44bec571672973 SHA1 6325bd9cd90af0221f0d2502b49e099505320f66 SHA256 fc6f0bddb61b10077b61836e56153e51eddabe450b2533b8e8b5bc5dddab804a
-MISC ChangeLog 49586 RMD160 5bb9f3c6be2f850b7a1726c78e8bd0bc9492452e SHA1 f2a50fd3d30b7a8ec05ec11db22a1dfb7bb3dafe SHA256 cc7613134cca7a313a783c61d240a54f51da994f6d7ddb38ab12d76163242028
+EBUILD sqlite-3.7.5.ebuild 4495 RMD160 0e2d57c87eb558f106357147199108d4762f6adc SHA1 497d15242d6a4478b6769d5f649893af33422009 SHA256 194c7f98ec57986bc9ae9256d08282ee8c4e6ceedbff168418e0d119048b7f5f
+MISC ChangeLog 49886 RMD160 1ce69586aebc7db717796888fd970883dcfe1e96 SHA1 ad8444e2059c4c4c7d16b67142ac8b1b35598276 SHA256 bcbdb972e2d2636e2fd3608ee9f1565912cb358be3e23f0c0ef3925446a96794
 MISC metadata.xml 1011 RMD160 02768455c7a2f2e980fcd51e16105d1a030a69cf SHA1 98ba789e4120f8d0a1e2f49285f6dbf49e0a35d0 SHA256 4b2dc7fa04d3909cac1f4b764daaddb237e5c4f9a05998d7fd04dc42a5775aae
diff --git a/dev-db/sqlite/files/sqlite-3.7.5-utimes.patch b/dev-db/sqlite/files/sqlite-3.7.5-utimes.patch
new file mode 100644
index 000000000000..4e8732926a2a
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.7.5-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
+@@ -122,6 +122,9 @@
+ #ifndef SQLITE_OMIT_WAL
+ #include <sys/mman.h>
+ #endif
++#ifndef HAVE_UTIMES
++#include <utime.h>
++#endif
+ 
+ #if SQLITE_ENABLE_LOCKING_STYLE
+ # include <sys/ioctl.h>
+@@ -1610,7 +1613,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.5.ebuild b/dev-db/sqlite/sqlite-3.7.5.ebuild
new file mode 100644
index 000000000000..534d69c14165
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.7.5.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.5.ebuild,v 1.1 2011/02/06 14:03:29 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
+
+	if [[ "${CHOST}" == *-mint* ]]; then
+		append-cppflags -DSQLITE_OMIT_WAL
+	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
+}