Version bump. Add multilib support (bug #496014). Ebuild by Arfrever.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 181 insertions, 15 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 65b3e677620c..45b766beb939 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.508 2014/02/01 03:28:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.509 2014/02/09 17:46:26 floppym Exp $
+
+*sqlite-3.8.3 (09 Feb 2014)
+
+  09 Feb 2014; Mike Gilbert <floppym@gentoo.org> +sqlite-3.8.3.ebuild:
+  Version bump. Add multilib support (bug #496014). Ebuild by Arfrever.
 
   01 Feb 2014; Mike Frysinger <vapier@gentoo.org> sqlite-3.8.2.ebuild:
   Mark s390/sh stable.
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index c83b9c948fe4..d4b385f3e9c6 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -10,26 +10,20 @@ AUX sqlite-3.8.1-src-dlopen_check.patch 331 SHA256 a8d5a07e3acb65232d33a512567dd
 AUX sqlite-3.8.1-tests-icu-52.patch 1866 SHA256 ca2ec1060cb7dce3e4d56ef1a27866abebf776e7d5d82ac373be2a182fb91abe SHA512 e17eec1d875e3c5fc1a3b664f7bb4d2b015ea1a544150e3eaa199f3fd0ee84f4924f3410182a4e62e280281278b32225c0779d97d85a56e272b6ccd0d900d3d1 WHIRLPOOL e77a681efc81ee4d212f3c68464cbd625b24b06b80ca22a72eaa1ec2b5d3ae0ad42596bae3aa953018569ca9131b686d06b1b68147f4102a33c20dc1c5d4595e
 DIST sqlite-2.8.16.tar.gz 981834 SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e SHA512 262cacbb9a6e615cd6ce7c2992c4dd5b0cd59de096daa74925e81baef4c0e4b3d9a7e4ebf8f4ba949afac4fe2fbf2c627ead29fa72ff38dffe6446ae46c40d4a WHIRLPOOL 78c4dc05f94d97483c03b1f1eee67f86fd5d9499e82b082ba3951878867d10d18ecbb5cac9086ce509c0cb1cb47b57661709a28d2ee7e61038512d1c11c77bff
 DIST sqlite-autoconf-3080200.tar.gz 1917056 SHA256 a0851d06092c8208e4dd947f569f40db476b472b22e3e10e2f52f3c5e94fef92 SHA512 31d47f366db9176df8c244361cab2295fcbcc06e47e3d9f758622a134f19f565c02e587f947939e2387bc488bbb2ad443dd1ba9e5520cc7f39bf398a44695bb1 WHIRLPOOL d3075381e43e82da79bc8186d02e88df125671950c4cff1b62b5ade186934ef6ac9d70f22784dd62149a7093395ae25bff0042ad34cc7bd9fdd947e54687988b
+DIST sqlite-autoconf-3080300.tar.gz 1923594 SHA256 dabe38cf6732a9dfd57e9a2d2629dfb12ea3f2bf8948987f91318d01e6f72a26 SHA512 8e4e6133e99b31b026e969f28dcae6d57a9a099f08c98bb522f601527e1f287cf804007a12287a6f1105d7d5a7e655713ae257c38ee5478a44479b4e699c02c6 WHIRLPOOL 2b050d0bdf150392899591a66bfee05aa7f1c3959aaf32792fce6a65c9155f742ff954e022a84d7cdd7185c3e994071cf9d53a650c50377cbc0508b4137328af
 DIST sqlite-doc-3080200.zip 4272848 SHA256 384aa6735bd10e561820c4c61e7fd25f6b2416663f201151f31162741b868603 SHA512 b96de0be9ac2f7bbbe198c6b5ccf6b283aebe6d38533efdc384f20051b5a6c98bed6dadd13d2cc83f114200c15ea432e20d3e0aadf7f7000f618622f389efb8a WHIRLPOOL 348b7046a8111269e32f9e8023710c7f74401f6fc997396cd4853e1e4c804f26029d688b15333970f56d1a7404ab2cfdbeabe23a504974ea79a347408b8cba6d
+DIST sqlite-doc-3080300.zip 4600279 SHA256 5bf632eba7f9ce324dd9b345448cc7875e6ee081c9df2f7d7dd2fb3c0fb02a23 SHA512 cf48c6c6cf0e2513cb8f43387d4ff5328f039f951ba10fdd3f41d2d179e879f79039edfb1e0d5655b7555eff0e4bbb74c1de196fa8a51634a0ca1ad2909b62ef WHIRLPOOL 04cf870fce40759c1c66fa2f323e7d54c8e80fdc5c0bf55f8e3f4f7f317bcf72316b322065287559718e1a3af56c8bda11a17e4783d3b920d12c0808b169d8f4
 DIST sqlite-src-3080200.zip 5522243 SHA256 aede689b0ce255036fa3631f7794dbf639438617343503c73a9e9c518fe386cf SHA512 65969b214d88e66c9ad55d78b6a1f624eab427679f8b21dc694aa843346d7891bf267e65380222220304ecd2561138ceb236fbea619a25000f03ea89dd7b26e2 WHIRLPOOL 1fe1d1c482c025c7cc28a3822088d04d39824db0b61e56782df15dc62383ab30409302dc6fbbbd2f36c3333dc3fc7539214038cf58be8e73cc6e0b25bc11a586
+DIST sqlite-src-3080300.zip 5552384 SHA256 801af0d50c8bf0b648383a0a2c8f2b41a6d51aae9fda1ae9e64205410117c642 SHA512 f0a1fbd54e8da9fc5374b7a0a286439346c4c1753c9382f934c197f7111c5a3c0504961123691c9bea15d0058f13c53f4171735bd218fdec5922ca87606edb37 WHIRLPOOL 4123be5a67b93abde5873a218efbe1e89893b27ab455a6047425a861f368f89ac65c9eb58c49f321b4078e910b3bb30c50501607eb0dc64262f82ec5df489efb
 EBUILD sqlite-2.8.16-r5.ebuild 2908 SHA256 daca9e85af72e7e3defa71794ee56b2c724a428116a7cb696619de7c9548b7eb SHA512 16b1f35f138e3808a4e3db60b644a8051d8b138670f2c1a9df00c98eec05a7c7cb711a9aa096a7486384eeb6aa6aeb5f2eeab690c5b6cb9f124319bdb6a3b8dd WHIRLPOOL a5df9e17fd81d4c374335db841411ce0ab7959c2a86fa8dddcd735026ecc831d4239ce6f82a456fccf325fbcf69c6d2097fa8c959f1422258df63739b478e00c
 EBUILD sqlite-3.8.2.ebuild 4932 SHA256 90d4089475dca8da4801dd3827fc60e157dbad86071399cb9da16702912bb859 SHA512 6b8b96708ab7cda8412e42222010039d5e0c2faea50e8cc97a8e3706f602b98ad402af621e0513701da30ea8c6b4074e61dbc63308398cc4deb1c5707bf6a81c WHIRLPOOL 92241f441aa5cbfe8bf453611dc20911784b287bff6092e4d7744602972b0b951e303c75b71cac8e99a1ded320d2858b76fe3f7e4618ae131c98a8e028cfd362
-MISC ChangeLog 68380 SHA256 b34f69343d810ee315554d6b5d62e03609b48b1078024ab78eb4c10d006af98e SHA512 c1425b0d4563afd68b7ad47c96ffd748cf440acb550bd09d9518603cd6f1ee39b8060a3d872e2d3fe2a94bcc05eceee3c97cfc529573c09372889d556ca5289a WHIRLPOOL 18152d17e8349bf0f9e769da09fd3de279d77090c1cca29a9d5ea22bad5969d802040ef0fe228194d00a961cb3fe398ec1a45eddeea90a08604a11a47ac7ae24
+EBUILD sqlite-3.8.3.ebuild 5202 SHA256 3cf73e20764639f1fdfe3f82982d78b764b07849721a51361789e0419b0dd1f7 SHA512 52973824befcb28ee40312a4945c2937a7e1a39f49d9bf59f8c3287fed0709a5a21b3a36e6d91eb423bdc21f289aee1ccce58b861410935b6029f3876fb700a3 WHIRLPOOL e1a0c9e6fab68636d706fe15f23734fef377f25775326115a1c19b3af7e2e9b19dcc1843805d5c51c4a1590d8b09fa7dbb9878ae0974aa36217db47881f57dce
+MISC ChangeLog 68554 SHA256 b18fe6485759dea3356f2ba60618476303bc31249553b3ea56a67fb628008236 SHA512 619c72939f8a6c81daf3fa30929dabbf190f83dda0134eac632a27d55860b520ad6d2e429c5aedab73fca9eceacb0710a893063d24a2792fc18b234e1ff28cec WHIRLPOOL 0d367451fa9e59d7926546beaca31ce823b147459f5689ba33fa5c91b60711bb08ec3e90daf41989ef61c2688748d4dbd72d227d4954655a9d13d7ebcaf51363
 MISC metadata.xml 543 SHA256 571057e6088209739a504dfe989b27dc875b6b3f7129c31d9789a6bf765ea97b SHA512 7c1b05707f92a0540bed3cf04d3e468a330a626a7bbbbbece43ba231cc3f8f14af9d220b345c72db9acf33e8eb3d983980113a780ba5a778ebab774d19c659a1 WHIRLPOOL 6c22bbeb965522912ebb10d1f84cd0900ee934d9d41052ecc22902b5aada7d057defa0e4c89850e3f92a6c96d38d701e4dd76e52e27d3807d67d08aa0cd23aed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS7GnqAAoJEPGu1DbS6WIAlgoP/2W7tDV9xNaq0ww2ymh1N8f7
-VrC6u6x7qh4TpT5szHNwAl764ZoQa4ajpQEEIdpx50DfSuMalWBU4mftGfhJBtHh
-veEIfy79vjE/uHetj+49VFapyVh8L2yQkjoSu0GOZaMeEdSXiopTHeDcGg9nzAFC
-wP5eAjtktXPzbw3p4+dMfMSYfoExpnXJRW0p4Qpm2CV2qyUpDfVdBH/af816I6Nk
-L7zHPLVmhSpwiDfVzUkQQ3/UzB6i9HKoV0xV6Ll257O2mlWDgG5P7GOvbS5U4Dpf
-EMSwqhGL6bYCb7XyeB/9/pCXjSZ/CMglBQI6im/a3rhLRCWkiwi9XmlFvvl9XvU2
-AQaz2a6lpnbDcgUOJ54w3YnFE1q0KHVS5GIY7OnZgR8KnK1UZ3UbxhfSCfYyqPG5
-mz7bHlGUwaJPmlZOvAyFIs8St344MRfRGqTgCgpnpujNfqgYLDhGpuG2R43P1yFo
-T+ILxPIcfzr7EoLhPVQhVhPh5yyq7PMgdU3FVQoFxbrSf3tSpB0C1ENYLNdpWmcz
-VixoD5DglY6kU9lLoIXg1gTKQBe9NZXXTyqdEyBtrWWQNLTURWJuCTviL/m3P9p7
-AF6jBHwRYL21YFYit5biYXK/XKGGGnUr/0fqIjKqkKvuoPow09OIBTGb4tySzfEO
-xfpOwcWey9Ib2mwWj/Wc
-=LH3a
+iF4EAREIAAYFAlL3vvMACgkQC77qH+pIQ6TjPAEAhvf4cYpbs1q3Cw2uJaTgUWam
+IVCk27mptwmD7YNtBIEBAKfwmC8yX3CbwdQlYUOfs3onl9ZAe8eKOU/V/jn8cWDZ
+=AF83
 -----END PGP SIGNATURE-----
diff --git a/dev-db/sqlite/sqlite-3.8.3.ebuild b/dev-db/sqlite/sqlite-3.8.3.ebuild
new file mode 100644
index 000000000000..0cbadadc6357
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.8.3.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.3.ebuild,v 1.1 2014/02/09 17:46:26 floppym Exp $
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="http://sqlite.org/"
+SRC_URI="doc? ( http://sqlite.org/2014/${PN}-doc-${DOC_PV}.zip )
+	tcl? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
+	!tcl? (
+		test? ( http://sqlite.org/2014/${PN}-src-${SRC_PV}.zip )
+		!test? ( http://sqlite.org/2014/${PN}-autoconf-${SRC_PV}.tar.gz )
+	)"
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test"
+
+RDEPEND="icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r15
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )
+	tcl? ( app-arch/unzip )
+	test? (
+		app-arch/unzip
+		dev-lang/tcl[${MULTILIB_USEDEP}]
+	)"
+
+amalgamation() {
+	use !tcl && use !test
+}
+
+pkg_setup() {
+	if amalgamation; then
+		S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+	else
+		S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	fi
+}
+
+src_prepare() {
+	if amalgamation; then
+		epatch "${FILESDIR}/${PN}-3.8.1-autoconf-dlopen_check.patch"
+	else
+		epatch "${FILESDIR}/${PN}-3.8.1-src-dlopen_check.patch"
+		epatch "${FILESDIR}/${PN}-3.8.1-tests-icu-52.patch"
+	fi
+
+	eautoreconf
+
+	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
+	# use prefix && eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# `configure` from amalgamation tarball does not 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 functions.
+	# http://sqlite.org/c3ref/column_database_name.html
+	# http://sqlite.org/c3ref/table_column_metadata.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support Full-Text Search versions 3 and 4.
+	# http://sqlite.org/fts3.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS4_UNICODE61
+
+	# Support R*Trees.
+	# http://sqlite.org/rtree.html
+	append-cppflags -DSQLITE_ENABLE_RTREE
+
+	# Support soundex() function.
+	# http://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# Support unlock notification.
+	# http://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	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
+
+	# Enable secure_delete pragma.
+	# http://sqlite.org/pragma.html#pragma_secure_delete
+	if use secure-delete; then
+		append-cppflags -DSQLITE_SECURE_DELETE -DSQLITE_CHECK_PAGES -DSQLITE_CORE
+	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 does not support
+	# --with-readline-inc and --(enable|disable)-tcl options.
+	econf \
+		--enable-$(amalgamation && echo dynamic-extensions || echo load-extension) \
+		--enable-threadsafe \
+		$(use_enable readline) \
+		$(use_enable static-libs static) \
+		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
+		$(amalgamation || use_enable debug) \
+		$(amalgamation || echo --enable-tcl)
+}
+
+multilib_src_compile() {
+	emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	emake $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+
+	doman sqlite3.1
+
+	if use doc; then
+		dohtml -A ico,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
+	fi
+}