Version bump.

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

4 files changed, 205 insertions, 16 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/Manifest b/dev-db/sqlite/Manifest
index 809019105ed7..c37296d3a256 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,33 +1,24 @@
 AUX maketcllib.sh 879 RMD160 6d9a0e79a79d5a2efd6074e6b439d4634600980e SHA1 d5bb6054d3c9a4132c92bd8c172a547bf2cc9d85 SHA256 e101ed11d908bfb7f57519a99674160b0273d6500d191f758f8a0d1e6ed78120
-AUX sandbox-fix2.patch 432 RMD160 778fe532561642dbae6d1a3f572f6703828af42b SHA1 1b0eee83c7d6d2e36ffdf0265c8bdd14d1574a61 SHA256 21552219c14daad788380ae7e1ba6c665bb1ef9eadb611f676bd6249e3bde02d
 AUX sqlite-2.8.15-alignement-fix.patch 538 RMD160 12407bbe5f1bcae243d4247b43bf63ce0e8becea SHA1 d67a8bb2de26b1d6b7222175bd7f69d28afffb1e SHA256 f61f2f36fed61438d13dbb09902078ef11f0c3e8c8a119f84030689a2f2add8f
 AUX sqlite-2.8.16-multilib.patch 4038 RMD160 0e074a3ebac7c188dbbf9b86be87a79e0c23390a SHA1 8d38fd5820fd1037b35194d33666be19dcce9e98 SHA256 4ccbef245ea50f317e34bad5ed07e6917fc08d718c6e57884255799980d6e765
 AUX sqlite-3.6.22-dlopen.patch 452 RMD160 e9c7e77f3a7410e5b05f17bb6dfacf0270c1e036 SHA1 30adecb66b67ad401aafb56b6277f83bbfd1ea6f SHA256 840d684be229a898838560418d9f152a5c48095f7adce665f7ec75e4ef5c45f9
 AUX sqlite-3.6.22-interix-fixes-amalgamation.patch 717 RMD160 dfae5e2d22cddad5a2d375d4bbce639bc1da805e SHA1 c62fd67d3f32120c86d60299c426199169183107 SHA256 86995c345c3a51e396a4d520031231d7f76384e953829b58f9e9195ccb7a825b
 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
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
-DIST sqlite-3.6.22.tar.gz 2999137 RMD160 3de220362e58589649b068519b9d2aa021371ca4 SHA1 7a29a469d5e28040224a934ed0c28041412876d8 SHA256 c8cc19895caeb4398e74c815531f5c9710b983523f7308bc80639999a1cf57f6
-DIST sqlite-3.6.23.1.tar.gz 3086807 RMD160 03847176d21391cc44d2275fc685d556c56ab9d8 SHA1 718615fc37a5ef57fb4e7d06fc56ee7bda391d6f SHA256 1a0517438a573a68ab73e8ed75d194086d55d75883542ab1d5ae1080bbddd492
-DIST sqlite-3.7.0.tar.gz 3263369 RMD160 c97253a57f50cc234af0b66da5545e55077a1458 SHA1 7ad917b1732d53526db876cada21704baa0a9e6e SHA256 5668c25f5f0dace2b9a443d4b7b70a520e07916e7b64a52cd2868dd25abd417c
 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.6.22.tar.gz 1413926 RMD160 67452387486081a99107900eb14c816ba970f4ed SHA1 b0b87bd1945528723083f6830094f5c676829164 SHA256 68e2841b83b90252f51ccc41e7c00b87da9b2358bbef7de0bc8e78b101f5b8cc
-DIST sqlite-amalgamation-3.6.23.1.tar.gz 1421265 RMD160 6ab83f464a51b9862970f3473f25839319cdb7d5 SHA1 0f4a1390f6405b8f00ecc3694c99ba4e87b40308 SHA256 d080d724836fb8453dc9f3d5826c097b61e39d121b6c5da7b967764ca1523558
-DIST sqlite-amalgamation-3.7.0.tar.gz 1486712 RMD160 d2376d516645fd3b44783a92458bb557999aa460 SHA1 5ed43977c5682908ae05eb27841e4191635a4a96 SHA256 7ca87301c9a868a5c66b223e68c9e62268bc9a352ac4111a1ca83be30cd1798e
 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_docs_3_6_22.zip 2642221 RMD160 b96d9c4f499aef46fc2dd751633ba11be5946327 SHA1 e287700c79145aad0b3409215af0446c23c1d1e1 SHA256 8a8b92893cf4dd623a5ad4e75fe39524b29e368bbff7c6e2a069d79cce32f859
-DIST sqlite_docs_3_6_23.zip 2788665 RMD160 ca2674800fcb552af93e37c6cbf41b13d3c1facc SHA1 caef3584c8050a135f11d8809fa9ac7ff9696708 SHA256 21e3ad71475a65c2d14d02c9ed8a7bdc5ed6620d6cc1696e245f9d0bb8b26136
-DIST sqlite_docs_3_7_0.zip 2919734 RMD160 2db2782af30eeee5e2c704ed8bb14c2434333a35 SHA1 33e16d4f693796a7bd53f984b5fbb60893fe1cc8 SHA256 320081cc40a72d569e59fddd2e9d2cdeb9eb199897a0dc285899c7d1d03df5c7
+DIST sqlite-autoconf-3070400.tar.gz 1545086 RMD160 eb5d575b7dc1951f0c0f2997f50fbf7d206e502d SHA1 43848641320cb60fb7f445bc295b9870cdc127be SHA256 54ef0481d4318aaf0d701cbcccf67f80d96568e34279b949cfded900b1e4348c
+DIST sqlite-doc-3070400.zip 3486533 RMD160 f6892a7718c286e44dc7fb7dba8e1d3c47a34127 SHA1 7e41836201bd43e457f800b2430ff4786940c334 SHA256 6ed9d504c617232f861dc0d2f682bef9804c3eed45d85d18384ae959b0109195
+DIST sqlite-src-3070400.zip 3997962 RMD160 aaed6457cf2c633d3c83c46112aa7a868947adcf SHA1 c0d04178e5a18e1ce033e035a84dda9725ddd988 SHA256 e7540069fad017a9dec374241b346570ce6c360e2960749ddcacac81f965c9b4
 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.6.22-r2.ebuild 3995 RMD160 dbcc04546e194034dbb9cc94a7107229c53d94e3 SHA1 2e9565d9b1a3d23cb8d500410db135ddace897c3 SHA256 cbe1303a57cb3f2baa88ec3d03467570ac1745a88ad219305d8849edcdbb7f93
-EBUILD sqlite-3.6.23.1-r1.ebuild 4628 RMD160 4dbd0d3e0722f330319d45cc98102cf64b70378c SHA1 8d48db0d080f87e715b9eb6316a3aae7c3ca891f SHA256 ec2ee6e3a403a84ce8daf01718582e06b9e7a296b7d0726d7e2c6980ffded8c8
-EBUILD sqlite-3.6.23.1.ebuild 4487 RMD160 931e98508b18497e9544f380d7e4546796d6fa50 SHA1 0e2983f87a66a67594b992576cd9470a2fc71b61 SHA256 7d2f76798f61658e357ce069ce6928e190a40cfea27d49f9848b80c2a6d8786a
-EBUILD sqlite-3.7.0.ebuild 4622 RMD160 591d6721b8843297a364583d4ca90fe83b743300 SHA1 63eb5d3268527761025303140c7e62d65b2f90ed SHA256 1c3e4504ce5ab13d50ac9dc65b01a7c3ad592304d3b46ce4b410b55ceb9ded74
 EBUILD sqlite-3.7.2.ebuild 4705 RMD160 966f6f42913dc5be95b3fb5e0db958fa57b8a0d3 SHA1 9d2f6223487d699f6720ec80e183999c0ff8b3cf SHA256 d02efb1e66b1f8faa9c76c1b80eff2d7a10ae437764568f41b7faa9c4bcd9ca2
 EBUILD sqlite-3.7.3.ebuild 4713 RMD160 59ee5550a822a96b098de0a64fc3a50660e82b50 SHA1 ba276781e4aa2eef4218a7bde26872afab40e57a SHA256 5fabf7bc046f592d83a56f9cf4526325e57f551fe94f19260a62205438bdf7a1
-MISC ChangeLog 49174 RMD160 060c2f4cb20f0476902360104cd7ee8e9b958f48 SHA1 313f93ecbf7f71b414433a6356f121d0e3e18656 SHA256 9ef27cfab055adfc47d391c2d49d43dc17964b6d0eb9a89449f1a495e80f473d
+EBUILD sqlite-3.7.4.ebuild 4417 RMD160 e5185f2888c7f7a47680a27e1d44bec571672973 SHA1 6325bd9cd90af0221f0d2502b49e099505320f66 SHA256 fc6f0bddb61b10077b61836e56153e51eddabe450b2533b8e8b5bc5dddab804a
+MISC ChangeLog 49485 RMD160 8241a9a6234f343ca3dcea9fde89e58d96f53ee1 SHA1 a1d4fbcf0643b5edf1db33c182c838f48b6d1c9c SHA256 9a733268cce06d45cf8a756aafd460e7754638c2cc9fa19b6d078565f6b6a18f
 MISC metadata.xml 1011 RMD160 02768455c7a2f2e980fcd51e16105d1a030a69cf SHA1 98ba789e4120f8d0a1e2f49285f6dbf49e0a35d0 SHA256 4b2dc7fa04d3909cac1f4b764daaddb237e5c4f9a05998d7fd04dc42a5775aae
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
+}