Use pread(), pread64(), pwrite() and pwrite64() (bug #549080). Update dependencies, CPPFLAGS, configure options. Patch by Arfrever.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

3 files changed, 45 insertions, 44 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index bfaa936f185f..af54780bed20 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.564 2015/05/15 10:31:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.565 2015/05/15 10:50:00 idella4 Exp $
+
+  15 May 2015; Ian Delaney <idella4@gentoo.org> sqlite-3.8.10.1.ebuild:
+  Use pread(), pread64(), pwrite() and pwrite64() (bug #549080). Update
+  dependencies, CPPFLAGS, configure options. Patch by Arfrever.
 
   15 May 2015; Justin Lecher <jlec@gentoo.org> metadata.xml,
   sqlite-3.8.10.1.ebuild:
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 520fd3b0fed3..5a40a6755358 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX maketcllib.sh 879 SHA256 e101ed11d908bfb7f57519a99674160b0273d6500d191f758f8a0d1e6ed78120 SHA512 d6ff354cd0e6e0a4240de1ccc0c93a111dd6cc7795d690bdb9fbc556bbae6aa4190b0c44a1be399b1420e33435f53c232400c46392446edf9a9d983ed28f1d98 WHIRLPOOL cf0f28e2086059b3f549d77f5853c4abd1ee1e9756972b6d8063f3c29ba5f46de2bf68f9392db65531c5f1dbada481cabde726cf92d06701c2aa134240ca9e2d
 AUX sqlite-2.8.15-alignement-fix.patch 538 SHA256 f61f2f36fed61438d13dbb09902078ef11f0c3e8c8a119f84030689a2f2add8f SHA512 be3bb6a620d14e07153476f9fb0658d347a0fdaf44363904be32004836e2727210307ed87fe2b8b01cf4df79cf05947be7b500a9608215a6e950173237e64386 WHIRLPOOL f1e8b388b3256e4f8f7476fa7b369b014902473477f17ff28f45e221aa973b14e9dc54bf6cedda04d2f8772fc87c34f19f14b11a9e67a082cde70f5cfbf32e4b
@@ -43,7 +43,7 @@ DIST sqlite-src-3080803.zip 5850400 SHA256 790ff6be164488d176b3bed7e0e0850bac156
 DIST sqlite-src-3080900.zip 5894168 SHA256 fd33ee8e079a8ed15adde5a39f567150e0ad26709c737124b3decc4ce4e94f89 SHA512 32621c52184a8009392eab53d1e10aef396ef89e0ff229634bcb572d09ebaa640fc63f652d4f47fc6a0f7ad561557d003fdc3df46fc73a1e6b78088be5833c1c WHIRLPOOL f9041a2941c7b1b219ea41f929f5d41010c7068c04e008162285be862115ad7d43b315f3108b6716c06a16524872a2e5aa671a488837f394318482eccad5a692
 DIST sqlite-src-3081001.zip 7648823 SHA256 def6e2401c8da91b489de19d1a1734f722b4e629148ab804776d27b49ba49e7b SHA512 7604ac35eddd4aca53c02b0ab7ae7682856aec2eb4e6a9627da041ea19d464bb6080a70d84070a94abf77eb14ae616a0a8c5fe2f2a6c19fc899d1b21535d3e1a WHIRLPOOL c44e4f446d12af1f4df49e171276d853381784e979d3521cafbfdd5b5359c792586d298f3573bbda8a260b9008a4b7fcdc4ce0382fdda18574287018a2cb4f4c
 EBUILD sqlite-2.8.16-r5.ebuild 2910 SHA256 690cfc49ed3711765baeb548b0ff5c064d985c5fcb5c2cb7232da14586b51faf SHA512 881d2aee7554af2c9b6caa2279e448531c733e6db1e8f3cdc9dbfd79f634f3f30bb9c2991ff8adee6a663a26a6a64658bd7efa1fb8f1e6877f61ff40b1556769 WHIRLPOOL 5e7c2abe2274bd4956e13eb326e95cf00466036583944feb4bc06f3648178d6ccbcbbc7386da099ceb1a5af94ab931e8208cb7833e0333b444962da80401fd8d
-EBUILD sqlite-3.8.10.1.ebuild 6187 SHA256 b0f1858c4f4dc401d37b9ee8c7130d83afcc099300df6dd3c66acc872a69de99 SHA512 273cee4d03ca596801bb87edae9edb74b7ef4e483ebe0e851e7147fe528f753ce25b8fd4d9f22dd36bdbec6307c9a63c5e6781f36e0940392edf9fb9358a062b WHIRLPOOL 6f5b317cb28fc103db7f0007b684401e212b51165ccf0f3ac2f6ca65e3abc906580e6cbd284b3e83c2af30965355a899faa17a4fce84e9b0a38a8298cd2d087b
+EBUILD sqlite-3.8.10.1.ebuild 6836 SHA256 ff43dee9e31a79b82e70e0440bfb8709ed28592ee95f2fedf4d1cdcc593388a0 SHA512 cae523899a01b2b8052009440004610a3f9d90b23cc8e37a35904003d17df78764a410c5402165c691692ed6e27ca48fd1811da012038f352b3408d9a3910ca9 WHIRLPOOL eef594ac5338ed2483a8ad30f5050444f4644b53b050e35306191b34af67d1c62ba083698800626c551891bb9a09190461859c82701fab01f308a06406ec15fb
 EBUILD sqlite-3.8.6.ebuild 5132 SHA256 49010e04b5b8eeba2851dfde80983aa9df1de9aef348799be3160acb04da1b7c SHA512 9752c7d09dab44bd4ef0a73980d648c0962f1e216f97ad3f79610a37507e642636abaca00251891898a211f71f3b3816d9c4b4daddb1c38739ab1dc5580c869c WHIRLPOOL d8f5ac7e3f334f9d2304fe7ac2854b30685d727e34caa87918ece2d7092af1457a9553eb7fae1bf095bf4d2845fd2b7beafe2991669a5865c6ec4904fdd9faa6
 EBUILD sqlite-3.8.7.1.ebuild 5143 SHA256 80f281cd7a60393a5ac722597347e6d57493c5c7771b96f61949a8e9eb95bd27 SHA512 0b72710a43b6d3bb9d41201f7318343f1cba200d123d9d96daf1b8a98ba0329f3316a224bae1b0f878bd7311eb494d4391e84c3db581319b5303f31f99c7bbff WHIRLPOOL 3b91d26a003772deef44899022d4d9709a3de80baed99ff62b437b3677004528e15f2a290f97cdfe6f97394eaa185af670dec9962a0ee5dcd2056961cfd147fc
 EBUILD sqlite-3.8.7.2.ebuild 5143 SHA256 01803257d337041f06b6823b5638dc079e17d5dbedd5d1ea9d5b9c4e92f855ad SHA512 e2fccc6ffb8e17018343e154d1bb332a62406193dc696285f5ee3df79518c23bba58607446408341de04a248bb9a248bbc86aba2c7a27093248b3cc68dd34393 WHIRLPOOL 012dd86d09948fc8a50c016667203ee620788bb7f8bfac0115b224b5a28dc90a5bf2facaa379151fbaf1d12ab3347247895e95bb0eed2866a1bd98239fed4349
@@ -54,24 +54,14 @@ EBUILD sqlite-3.8.8.1.ebuild 5416 SHA256 8261e32b27cae6ebae16c5e09c1f14ab6a18468
 EBUILD sqlite-3.8.8.2.ebuild 5651 SHA256 0e007dd4c239ac7e4805a26eb517a0c6022d68e854d87872cbde8b30ead33391 SHA512 0b9d8eada9c85ebcadb05eb146ebf45f921bba4d096504327fe9e2f8d994a142074031c165924d6e8ef929beae86e42430ababf6189d3cac0b6a5cc58c74e518 WHIRLPOOL 41f7a1154446f59721794963b5a313521ff857ba0f75fc95d9890d85e523557a5faf326539603cf09c7ced91aef3b5ef200c834b2fe335f933c40aee68c3436e
 EBUILD sqlite-3.8.8.3.ebuild 5651 SHA256 d12f994004b96cd58cac1236e0c68e2728d9c89682201948938553ca29383494 SHA512 a5baca9cd486cb3f9da76193ba72fc6fae06b379f1cf19d0eff599509e96369c33a2dc8c32b7cc581ba8555a68f6de705f709a8b410c8735b07d165fc0d83776 WHIRLPOOL 9edfa14f9176d02192bb8e26f33166882833c29bc0330cd17c9cca954b5a39045c84bd1642c9b17bb131e87df66a13f65ae09f9d46553318f5eacfaa83adbaaf
 EBUILD sqlite-3.8.9.ebuild 5404 SHA256 66ebd7358ce5c7fa9a73fdfab4bdbcf6c7b64b89c9959d0f10aa86f95770a916 SHA512 9ea0deeffa1494ff2788d8f7196dfbd645ec62492b89d6d7e7d70a5398b391b568969af66526d5170a395daa3ebd5870a08d36c8dd5b97224f5c197141aece00 WHIRLPOOL 3fe202a6726dce7fc78f7aed727ad0fe2b23084829f9ddfb93f17aa95d8f5e713aafb2a7ecc30b441daf8480f9bb21d0a7efd8e9605b5d9ab3a54a2cceb444a9
-MISC ChangeLog 75241 SHA256 59324be18631e56f0f45b119e093d2f3285921f10cdedbe310449b08dfe0ccd7 SHA512 2a0b8c7ca83c63ed48159bb7db686ed0971d472adefe5f987f5624fa1656028aabf4b30c482d7811daec8c19987b657eb337ad74139715973150c816d4d78be8 WHIRLPOOL 17e9e53fc6d8926acecadd3c0bd70c84f30fd6fe46cc0d1df746134179e2f0912278922f89edd84e3252d6eeab36a83aab1bdc285436adaeee0d4678de296d7d
+MISC ChangeLog 75453 SHA256 b495f2205602d07847f447a5e5d844f72b9e947643adf3ef7737b7f9b9bc7059 SHA512 0d22177db726619a360cd7459199fa2e882ca0425d54fd901049eb6f3bafc6258d37a71c437211d692f76a16993d8c0821e696bc671c851179253b7d9e5ec9e3 WHIRLPOOL 2ae0670c92f7be0b3ecfab2b40b69ba6efd7e22ebb8e8b0333722a82003365a506ad270cd5069e873d34b0301af153763b0cd661c7cc26f5a826ba1480f010ad
 MISC metadata.xml 641 SHA256 192c0ada0175fbad5202267520fc563ea1559ede7e64b375dd6dbfe96cf4aa0b SHA512 fcc41ad18e6f25d25b32373ac9de9e46d78784778ca3f56d73c95c67e1318808374f408f110db216d314cd2695b87bbb5225ff7e9621e8726db1b3a0559fb94a WHIRLPOOL 3608b2739d8f35ae22dba98cc98a3c9e30584dd34781cf2f6542cf90ec94ceb05bd6abb5f7203d9858556b20c1e322810ee397c14c36d5e5a186ed8c96a46784
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVVcr5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizlwP/R7YiGm42hZOMK7OHwCaLfwk
-v1YX/wThdI8PR3S9rGyRbExtbHvaI9N2p/kn5yYM49Y/kM8IV/YuwO0TssivDI8G
-w+rZCfx0d8TxopDaNYxxYJjjfC79gRhuKQ77sQC9uqmZbu6UrdVso6x/uLsr9ZUm
-1XNXKcwHMT3XZCZgb/hTW/ySYGzmBiTigMb9AJcNMdkAQQLXAhFfN1Q2yhljS1GG
-PEzKxPCnt1hn5iqMqrPmDCE5+qEfQoswTcwZJwWXMhtq/oe9+QjGDZ7x/wIroyZZ
-3k0DXpCwmXNpRRPzTlBYGJv2PeJFaTPOJviWvtnv3wa2+37ZXJ5pblFf7NbW/faY
-SwkhxC4hxqilDIPVgKGK10F9dOgCZ+L9BuupF8dz4pJHpxrVevyQKvvkVNFx5prG
-lAB/dwcc0kE2khZbNBa45YR4zw8h82g7IA7wZAiHnhf8vPouT+/vj50RQLp8GzR5
-/ibvAXxus1EnH4sKx6ew3rdDXc/qclbBjYGqLxr3sQGV+9BJJcBELRfqG6PPo3RE
-9HiCoXGDS28WBWEVnigbs9vmq/9NjqViV9UDrfSadMzNiKKCETZXkhJhpH05U4J2
-daI9Dgj1yqHsR3RBnx6KjuV5dyLBNUBGGqoY6Xp2DWpJHkBA/kQErhPpwSHnuRHT
-kW56rvczHLCjYQmmDyyc
-=E6Gc
+iKYEAREIAGYFAlVVz2hfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw1JCwCeIxaa3vQ08hHHeDBSd2FEpzNp
+AVEAn34n/HWdiKuh3fJaMeUqZD9BQ9ue
+=infZ
 -----END PGP SIGNATURE-----
diff --git a/dev-db/sqlite/sqlite-3.8.10.1.ebuild b/dev-db/sqlite/sqlite-3.8.10.1.ebuild
index bef5061d3daf..ede3c4247876 100644
--- a/dev-db/sqlite/sqlite-3.8.10.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.10.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.10.1.ebuild,v 1.4 2015/05/15 10:31:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.10.1.ebuild,v 1.5 2015/05/15 10:50:00 idella4 Exp $
 
 EAPI="5"
 
-inherit autotools eutils flag-o-matic multilib multilib-minimal versionator
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
 
 SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
 DOC_PV="${SRC_PV}"
@@ -23,8 +23,6 @@ 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 tools"
 
-REQUIRED_USE="tools? ( tcl )"
-
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
 	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
 	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
@@ -38,7 +36,8 @@ DEPEND="${RDEPEND}
 	test? (
 		app-arch/unzip
 		dev-lang/tcl:0[${MULTILIB_USEDEP}]
-	)"
+	)
+	tools? ( dev-lang/tcl:0 )"
 
 amalgamation() {
 	! use tcl && ! use test && ! use tools
@@ -69,10 +68,18 @@ src_prepare() {
 	# At least ppc-aix, x86-interix and *-solaris need newer libtool.
 	# use prefix && eautoreconf
 
+	if use icu; then
+		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
+
 	multilib_copy_sources
 }
 
-multilib_src_configure() {
+src_configure() {
 	# `configure` from amalgamation tarball does not add -DSQLITE_DEBUG or -DNDEBUG flag.
 	if amalgamation; then
 		if use debug; then
@@ -116,34 +123,34 @@ multilib_src_configure() {
 	append-cppflags -DSQLITE_SOUNDEX
 
 	if use icu; then
+		# Support ICU extension.
+		# http://sqlite.org/compile.html#enable_icu
 		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
+		# Enable secure_delete pragma by default.
+		# http://sqlite.org/pragma.html#pragma_secure_delete
 		append-cppflags -DSQLITE_SECURE_DELETE
 	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
 
+	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread_pwrite_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread(0, NULL, 0, 0);\n  pwrite(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
+		append-cppflags -DUSE_PREAD
+	fi
+	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
+		append-cppflags -DUSE_PREAD64
+	elif $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_LARGEFILE64_SOURCE -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n  pread64(0, NULL, 0, 0);\n  pwrite64(0, NULL, 0, 0);\n  return 0;\n}' &> /dev/null; then
+		append-cppflags -DUSE_PREAD64 -D_LARGEFILE64_SOURCE
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
 	# `configure` from amalgamation tarball does not support
 	# --with-readline-inc and --(enable|disable)-tcl options.
 	econf \
@@ -153,7 +160,7 @@ multilib_src_configure() {
 		$(use_enable static-libs static) \
 		$(amalgamation || echo --with-readline-inc="-I${EPREFIX}/usr/include/readline") \
 		$(amalgamation || use_enable debug) \
-		$(amalgamation || echo --enable-tcl)
+		$(amalgamation || if use tcl || use test; then echo --enable-tcl; else echo --disable-tcl; fi)
 }
 
 multilib_src_compile() {