non-maintainer commit: Added new local "unlock-notify" USE flag (bug #323651).
authorLars Wendler <polynomial-c@gentoo.org>
Sat, 26 Jun 2010 10:46:54 +0000 (10:46 +0000)
committerLars Wendler <polynomial-c@gentoo.org>
Sat, 26 Jun 2010 10:46:54 +0000 (10:46 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

dev-db/sqlite/ChangeLog
dev-db/sqlite/Manifest
dev-db/sqlite/metadata.xml
dev-db/sqlite/sqlite-2.8.16-r4.ebuild
dev-db/sqlite/sqlite-3.6.23.1-r1.ebuild [new file with mode: 0644]

index 9747b9c9b496ab985e85fd1df7e8322c98265cb8..32270beca06390f95439c443be5efd4aac9a7855 100644 (file)
@@ -1,6 +1,15 @@
 # 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.336 2010/06/04 19:25:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.337 2010/06/26 10:46:54 polynomial-c Exp $
+
+*sqlite-3.6.23.1-r1 (26 Jun 2010)
+
+  26 Jun 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +sqlite-3.6.23.1-r1.ebuild, metadata.xml:
+  non-maintainer commit: Added new local "unlock-notify" USE flag which
+  enables SQLITE_ENABLE_UNLOCK_NOTIFY (bug #323651). This is needed by
+  future mozilla products. Change added with kind permission from
+  Betelgeuse.
 
   04 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   sqlite-3.6.23.1.ebuild:
index 1f24aa0b7c02782b539f16c880bf7f9c85b05d45..06e9161d3053f3f188a41e6828bc91974e8e799b 100644 (file)
@@ -21,11 +21,12 @@ DIST sqlite_docs_3_6_20.zip 2463481 RMD160 0c03c44f1315b1554653ee5d0daa16da91d22
 DIST sqlite_docs_3_6_21.zip 2726288 RMD160 ecdfd0389d3472670612230ab6002eae7e7f86ef SHA1 d1b77bd898ba6d2693b277484d61d85e1f9c8937 SHA256 6812b5f2812530388c7e41d5b99d8fd958526ed6b8d1da92196c0fe817badd2a
 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
-EBUILD sqlite-2.8.16-r4.ebuild 2691 RMD160 84aeeda2955daa547583a9d995b1baf0de601ab6 SHA1 e33619ca7b88d29bd37e10f54156fd8b0339b8d3 SHA256 b2474871c4299d3e7c947921adfe74f18302903b7f6c2d193b966b56ee8d0981
+EBUILD sqlite-2.8.16-r4.ebuild 2693 RMD160 f0d7c0c813b135e75e32bc5489080d6d32492d17 SHA1 3d8b88705e097b77f4d05104ff47b942afe758d2 SHA256 c691b6a7628a48f1c446fe016970cc0cbde0dd0e0d019d28603b5f54b860c364
 EBUILD sqlite-3.6.20-r1.ebuild 3264 RMD160 5b307fd1d81f02fad1b29aa86b9cd57287a27492 SHA1 9974c58b76e002da9e225db1bffa4d1e61b8f383 SHA256 fa93f73e495b803aff8525db5a2fc7a2b4a0040eaaacd3a1cca7f5ef8679c09e
 EBUILD sqlite-3.6.21.ebuild 2911 RMD160 558c67302392ee2a4d08c73db57625c669087ffd SHA1 7371f67be6733737a63c449efac7a5e3e02a6959 SHA256 cd4fdff705cc481e2af3444108754c221762d5dcdf8f18666150a431c79e7b55
 EBUILD sqlite-3.6.22-r2.ebuild 3995 RMD160 dbcc04546e194034dbb9cc94a7107229c53d94e3 SHA1 2e9565d9b1a3d23cb8d500410db135ddace897c3 SHA256 cbe1303a57cb3f2baa88ec3d03467570ac1745a88ad219305d8849edcdbb7f93
+EBUILD sqlite-3.6.23.1-r1.ebuild 4729 RMD160 9305653a6ade8e942f02c64c15b728d2e6c2034b SHA1 591a36271375591795d815ccc62ca012bc0f89b6 SHA256 faf503a8e2c59175eb3d2d28ad36f3b2850ea199733302473d7e108288a9f676
 EBUILD sqlite-3.6.23.1.ebuild 4499 RMD160 364b5110bde25f66378bc133441aebdc13823c37 SHA1 fcf5788dac4a1a63c677d500713caa3e8a2e6bb7 SHA256 245bca691f715574b7b23ce0671975a8e0ab0b883c73345624cc9e4d5a24c9a9
 EBUILD sqlite-3.6.23.ebuild 4495 RMD160 1cf1b67f03cd82645b5feb8c34edbb49e501893f SHA1 7303709aad7159cbb7bc48ecff4bfd4092117b04 SHA256 31fb9342fae660da19987d408febcc97a94dd03faf254fbd03b46782ee87083b
-MISC ChangeLog 46283 RMD160 560a16f707f4442f5fd63e0cdf02ae0637201882 SHA1 fcfa40a9957d86e3963a13311bef7415ddcd5cc4 SHA256 cdea44cacc091d27def8105711043f944e31fac016155d30197e5fbc6662b571
-MISC metadata.xml 894 RMD160 fd8ba7aa7e0d9391d7d91e710547d057c7f07635 SHA1 48e94ded03dea88f4e38d273cd7d0f25014cad9b SHA256 e3afcc4357a2e5ca3d6352b501a158b7aea94240f870bb6c7ab4d74154ba37c8
+MISC ChangeLog 46642 RMD160 30d145c57f5ac6ca7fa80827080cde542a1ecbcc SHA1 2f2f2d3702c707eff83fafec19c387bf60e13578 SHA256 a3f78aef0bca63bde32b11533d261153f6baaca10b3f72819b4332cabc569a54
+MISC metadata.xml 1011 RMD160 02768455c7a2f2e980fcd51e16105d1a030a69cf SHA1 98ba789e4120f8d0a1e2f49285f6dbf49e0a35d0 SHA256 4b2dc7fa04d3909cac1f4b764daaddb237e5c4f9a05998d7fd04dc42a5775aae
index 2e0e4a7faa470770e720fe182582a9dbd068bc60..e8075ce93c59edbc78c3bfa8b959a675c85cf2e1 100644 (file)
@@ -17,5 +17,7 @@
   <flag name='soundex'>Enable the soundex function to compute soundex
     encodings of strings</flag>
   <flag name='threadsafe'>Enable thread safe operation of sqlite</flag>
+  <flag name='unlock-notify'>Adds API for notifications when a database is 
+    unlocked in shared-cache mode</flag>
 </use>
 </pkgmetadata>
index b103769cf41012ded9acbda5fd248fa2951d602a..a2af9d3ffbbcc19f41eecb917dfb71a821aacb58 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-2.8.16-r4.ebuild,v 1.20 2008/03/11 18:24:52 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r4.ebuild,v 1.21 2010/06/26 10:46:54 polynomial-c Exp $
 
 inherit eutils alternatives toolchain-funcs
 
diff --git a/dev-db/sqlite/sqlite-3.6.23.1-r1.ebuild b/dev-db/sqlite/sqlite-3.6.23.1-r1.ebuild
new file mode 100644 (file)
index 0000000..e0eea12
--- /dev/null
@@ -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.6.23.1-r1.ebuild,v 1.1 2010/06/26 10:46:54 polynomial-c Exp $
+
+EAPI="3"
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="http://www.sqlite.org/"
+DOC_BASE="$(get_version_component_range 1-3)"
+DOC_PV="$(replace_all_version_separators _ ${DOC_BASE})"
+
+SRC_URI="
+       tcl? ( http://www.sqlite.org/${P}.tar.gz )
+       !tcl? (
+               test? ( http://www.sqlite.org/${P}.tar.gz )
+               !test? ( http://www.sqlite.org/${PN}-amalgamation-${PV}.tar.gz )
+       )
+       doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip )"
+
+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 +threadsafe test unlock-notify"
+
+RDEPEND="icu? ( dev-libs/icu )
+       readline? ( sys-libs/readline )
+       tcl? ( dev-lang/tcl )"
+DEPEND="${RDEPEND}
+       test? ( dev-lang/tcl )
+       doc? ( app-arch/unzip )"
+
+src_prepare() {
+       if use icu; then
+               rm -f test/like.test
+       fi
+
+       if use tcl || use test; then
+               epatch "${FILESDIR}/${PN}-3.6.22-interix-fixes.patch"
+               epatch "${FILESDIR}/${PN}-3.6.22-dlopen.patch"  # bug 300836
+               eautoreconf  # dlopen.patch patches configure.ac
+       else
+               epatch "${FILESDIR}/${PN}-3.6.22-interix-fixes-amalgamation.patch"
+       fi
+
+       eautoreconf  # for MiNT and interix
+       epunt_cxx
+}
+
+src_configure() {
+       # 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 use tcl || use test; then
+                       # Normal tarball.
+                       sed -e "s/TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+               else
+                       # Amalgamation tarball.
+                       sed -e "s/LIBS = @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
+
+       # The amalgamation source doesn't have these via Makefile
+       if use debug; then
+               append-cppflags -DSQLITE_DEBUG
+       else
+               append-cppflags -DNDEBUG
+       fi
+
+       # Needed for >=net-libs/xulrunner-1.9.3,
+       # >=www-client/mozilla-firefox-3.6_alpha6 and
+       # >=www-client/seamonkey-2.1_alpha2
+       if use unlock-notify ; then
+               append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+       fi
+
+       local extensions_option
+       if use tcl || use test; then
+               extensions_option="load-extension"
+       else
+               extensions_option="dynamic-extensions"
+       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 tcl || use test; } && echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
+               $(use_enable threadsafe) \
+               $(use tcl && echo --enable-tcl) \
+               $(use !tcl && use test && echo --enable-tcl)
+}
+
+src_compile() {
+       emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" || die "emake failed"
+}
+
+src_test() {
+       if [[ "${EUID}" -ne "0" ]]; then
+               local test="test"
+               use debug && test="fulltest"
+               emake ${test} || die "Some test(s) failed"
+       else
+               ewarn "The userpriv feature must be enabled to run tests."
+               eerror "Testsuite will not be run."
+       fi
+}
+
+src_install() {
+       emake \
+               DESTDIR="${D}" \
+               TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" \
+               install \
+               || die "emake install failed"
+
+       doman sqlite3.1 || die "doman sqlite3.1 failed"
+
+       if use doc; then
+               # Naming scheme changes randomly between - and _ in releases
+               # http://www.sqlite.org/cvstrac/tktview?tn=3523
+               dohtml -r "${WORKDIR}"/${PN}-${DOC_PV}-docs/* || die "dohtml failed"
+       fi
+}