Add "extensions" USE flag (bug #233994).

Package-Manager: portage-15189-svn/cvs/Linux x86_64

4 files changed, 23 insertions, 11 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 7468f2a2ae7b..7a2430ac4e1b 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,10 @@
 # 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.315 2010/01/10 13:40:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.316 2010/01/10 21:26:57 arfrever Exp $
+
+  10 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  sqlite-3.6.22.ebuild, metadata.xml:
+  Add "extensions" USE flag (bug #233994).
 
   10 Jan 2010; Brent Baude <ranger@gentoo.org> sqlite-3.6.21.ebuild:
   Marking sqlite-3.6.21 ppc64 for bug 300145
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 66c4d2603aaf..c9abac0b6a7e 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -22,6 +22,6 @@ EBUILD sqlite-3.6.19.ebuild 2968 RMD160 8d6939e082cca47993fa9d0794dcca8ae1271579
 EBUILD sqlite-3.6.20-r1.ebuild 3264 RMD160 5b307fd1d81f02fad1b29aa86b9cd57287a27492 SHA1 9974c58b76e002da9e225db1bffa4d1e61b8f383 SHA256 fa93f73e495b803aff8525db5a2fc7a2b4a0040eaaacd3a1cca7f5ef8679c09e
 EBUILD sqlite-3.6.20.ebuild 2934 RMD160 c9b77defb3974599eb40056dbdc4c4512d943f62 SHA1 3693dbd197e3bdcb28fd8d97b335247200e357ef SHA256 b909bb05a61eff9961a16f0572ff3c607ee2486a48d1bd332effeb24300bc4bb
 EBUILD sqlite-3.6.21.ebuild 2917 RMD160 a53b7637c143336397c584978df85a3aee5510a6 SHA1 e3ed836cf124bc61456736e11158c64e3beb41da SHA256 e0818b7327097126ed8128a2ff756b33301179004237eab7960addb14e4a903a
-EBUILD sqlite-3.6.22.ebuild 3260 RMD160 4e9a66aa42c54e675661570230e5288d64995382 SHA1 df6fda92dc4f911c0aa75a1cefddd94a401f3bad SHA256 2cc5f7c3d1452aeae8252d04e86f648000199afdff79677149373836ff0fa49f
-MISC ChangeLog 42977 RMD160 16fd7f048fbc01a78c07210307c67069086b5b08 SHA1 bf7c76c723b29ca82561d254578acbf78406f91b SHA256 dfd59c1d61c73757f8b9158f8b03f5c0fd7a60c9734d66bf969ed08fa0fa2c4a
-MISC metadata.xml 643 RMD160 ea04328f1133181b162ab919c6c221fbbf85c808 SHA1 76bc55999b5481e28cfe13c97eac54f039e0ea0c SHA256 edbc4a70b6504db4a408c5081439ab5055af567e1f222216bd52560fe92487de
+EBUILD sqlite-3.6.22.ebuild 3482 RMD160 31ca671ad3f83b43b4495c8fe34343ef704f476d SHA1 d1303a86e9f2ec1c285742883fd9b5c0e64738b8 SHA256 8d68327da7363cac1e2e25b417efa36fada79afd5d0836cb96707ff7a9aa44f3
+MISC ChangeLog 43134 RMD160 94afc41ebbaa5c8262edc98aa60259428330a45b SHA1 dbbab3ef69ec1f50fc9fc40f90bcf1f09f028165 SHA256 0e9126da59c1c44169f57ac8b688f4207b1b05cd6c4c28dd748da875c583ecfe
+MISC metadata.xml 725 RMD160 cf12436b1fcf3770ae5a98d76375d3e02c689f1e SHA1 28614567476728a406a6c61414971022bfd4862f SHA256 a8e78c25506cdb2136062be0ea3cb8974c3e416b3d1234907d312ce2feb20dbf
diff --git a/dev-db/sqlite/metadata.xml b/dev-db/sqlite/metadata.xml
index c609876bfb71..0891ecef59c8 100644
--- a/dev-db/sqlite/metadata.xml
+++ b/dev-db/sqlite/metadata.xml
@@ -11,6 +11,7 @@
   <description>Take if you want it</description>
 </maintainer>
 <use>
+  <flag name='extensions'>Enable support for dynamic loading of extensions</flag>
   <flag name='fts3'>Full text search using the fts3 module</flag>
   <flag name='soundex'>Enable the soundex function to compute soundex
     encodings of strings</flag>
diff --git a/dev-db/sqlite/sqlite-3.6.22.ebuild b/dev-db/sqlite/sqlite-3.6.22.ebuild
index 0de4c3737967..791a6698ceb0 100644
--- a/dev-db/sqlite/sqlite-3.6.22.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.22.ebuild
@@ -1,10 +1,10 @@
 # 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.22.ebuild,v 1.3 2010/01/09 22:08:47 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.22.ebuild,v 1.4 2010/01/10 21:26:57 arfrever Exp $
 
 EAPI="2"
 
-inherit eutils flag-o-matic multilib versionator toolchain-funcs
+inherit eutils flag-o-matic multilib versionator
 
 DESCRIPTION="an SQL Database Engine in a C Library"
 HOMEPAGE="http://www.sqlite.org/"
@@ -22,7 +22,7 @@ SRC_URI="
 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 +fts3 icu +readline soundex tcl +threadsafe test"
+IUSE="debug doc extensions +fts3 icu +readline soundex tcl +threadsafe test"
 
 RDEPEND="icu? ( dev-libs/icu )
 	readline? ( sys-libs/readline )
@@ -74,14 +74,21 @@ src_configure() {
 		append-cppflags -DNDEBUG
 	fi
 
-	# amalgamation doesn't have tcl
+	if use tcl || use test; then
+		extensions_option="load-extension"
+	else
+		extensions_option="dynamic-extensions"
+	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) \
-		--with-readline-inc=-I"${EPREFIX}"/usr/include/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 --disable-tcl) \
-		$(tc-is-static-only && echo --enable-dynamic-extensions=no)
+		$(use !tcl && use test && echo --disable-tcl)
 }
 
 src_compile() {