gentoo resync : 30.04.2018

3 files changed, 200 insertions, 3 deletions

diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index caf1ebed7a91..9ac937a6d32f 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -9,7 +9,7 @@ AUX sqlite-3.22.0-full_archive-headers.patch 693 BLAKE2B c94193298bf3d3ba22c78ed
 AUX sqlite-3.22.0-full_archive-tests.patch 7566 BLAKE2B c59f71e46eaa7af45cc2046db2eaa73d8da3e7fc14341fca8418cf77eecb14b6278f54fd9932ff5f5a6f2d53e4dd9f07b88ac7e343533020e4650f1b2a4642f8 SHA512 a9dcd1e3caba1454c22b051c31237ce82b4e5e79783581111e3ef3cbf937b7bb139a569db5df7eeccc221113421cf4765af45a499bc5dc335f8ff5c5b2cf9d43
 AUX sqlite-3.23.0-full_archive-build.patch 13851 BLAKE2B 2de321270247cc436ba5261b75c03534ce43ee415566c896d59ea5e96633887a738e32e15ddaf5fe33c1d594bb60669df8480f210c4bd8c1c4bd0f22e086a18a SHA512 20a1ef769fa9420ebc66941ba6889cdb8e6eca6567662af7462fb5f8618b656e0e57ba86be3abc34e4437fcc979c9b811a117a841ea60a89abf2f2629f7c83b0
 AUX sqlite-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch 796 BLAKE2B ef4f5a9824f2a5492912f9076b9b9db96552e675264e04b093ed907f8b47175b680cab4a4934763910b5320b3f7c5fc2f230b026ad76af6172325abae7cce2c7 SHA512 81ea6bba9f1b06e77f7a5019eeb3e4abfb542c929b00f8d327f8b47101ad046bee40e49c12df00ce50c35ca2ec1906fd82b3fd75d4e5c97db61fa1cc9997d31c
-AUX sqlite-3.23.1-full_archive-tests.patch 621 BLAKE2B e1a479521fa032f7d622cffeb9e1b549b6e8471855695f583cdef1bf5f41d5e2cdef62f3f5c8c22cc2c8d6d0eae50f2c5396a2b141390295b3373313c19070bd SHA512 ddcccbc208068b7b58d3510d621c4a2cc76b8f00066f9e85b22fa26d0a9a73cba64b955bb2dd7795ceb0af8cdf7525332f773ebe3c9d566f6af222bcebf439e2
+AUX sqlite-3.23.1-full_archive-tests.patch 6164 BLAKE2B 5aa905e440e49f9863c737e6be3dee070388979f2e2b2e9358725d8ca1de0f52aca51c21f74127b37ae125e96abc8092b4ef9e23eea70b2c7a725aa41fee74b1 SHA512 85dc56b9bc2b3ad904edf4c926d8705a6f5f07d3c21f7c48e22b8702dace3090bf5bbef415486299befd5fac3b49a5776ed2be2d31e7582889e84a79e264a8a9
 AUX sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch 349 BLAKE2B 89bafb8ecc94927eaecd5619a159519a885fad36989ea53ca0a28857182c954d6763088cb1a5b9d0bba026c1fb90f39f7fc64125fd7f71a5c29e897c7ad6e3ce SHA512 d8e6bdea949e0940ad47fbb59c15d90b15125ff456da640b02d5f8ec26432595aacdb0f4b6aca3e427fa407c4c0297bdf27fecf70d8a8883d15e72fa4b71dc92
 DIST sqlite-autoconf-3200100.tar.gz 2565638 BLAKE2B bd1d32c211ea906cb2dbf78ea54d364db1a642d8a3b2751a427521a9da3391a2cd23c1ecdc5ff70b68f4166c583e69373f566cb04847295542185ab598e79c1b SHA512 56e3d326ea2225cadc628c3518d46d9f7c4bafa0e3612f2b7ab0dc0d79fcbb7e095f6d84a9a48e1c6d83adcdc8706ad5ac4404f0f622c7fe38cfde3a7e7e69f0
 DIST sqlite-autoconf-3210000.tar.gz 2568942 BLAKE2B 83a7095fd5fd5447a3c16816ceb9f51f393de9689942bd4eb4c6eafe357a1dd1783500f8faf2765fa6628da6a39f550237b661af1337ac063ca285f5f0a5218e SHA512 8f00708965eacef171620c49538f75768d350ec3f2bfef412a5c70af865ab03b6a64ce1e65d9fdb3d66f4d00262a30fc162b01fd69f63c05c14d5243374b6298
@@ -26,5 +26,5 @@ DIST sqlite-src-3230100.zip 10849436 BLAKE2B 6bed0a45c83ddb51d665835d174f623b30b
 EBUILD sqlite-3.20.1-r1.ebuild 8072 BLAKE2B 0b1c72b1efd206d11ddddea689032b7680b1909ffc1f0b46a1819dba8d62a7ee44674a124c4c529d47cc11cd378510436b1333a4d0ecb88a718a896cc047a1e8 SHA512 e819cbf0aff755be74c04b096495b909cd43d50162e7c243a67936169e42db5113880fc47e5d2da26aa0ff84a87d71bb9007eb87a026dd302d58deb5db0409ac
 EBUILD sqlite-3.21.0.ebuild 8454 BLAKE2B 87a6fcf651090d1440710bf253252ecd81164f91da4a6c2dd2a5dbc9b8e8db22f4569ddb48c7ad10efb1f930f91b37f1ac8b49621ec671c4ba64f394a3e53326 SHA512 a9d711fd29747bfa9829d6ad0c78d50fc08044e31011b2be746e2857bf8dc2969ba64c4fe80de8c9f928ca677ae105eda46b48d89ee2e9e13622fc26dabfa72f
 EBUILD sqlite-3.22.0.ebuild 9312 BLAKE2B cdeedf176f05d9e42f4b608f090a5c6c2d4f8dc6e5b36fb67114ee3a0d3f795e1303ffa4968622a5313d126911fc92daaed43084587078534afe0f51c96e734c SHA512 74115a4e493e8ba91b59ba8b866412a23779bc9246c9394e1ce3971304ae51583161211efdeb92a05787bd4985f8f6e1fd6b3d4e0a1d60194b06e7ac45348a00
-EBUILD sqlite-3.23.1.ebuild 9715 BLAKE2B f710775e72e39796964180aa8d14603cdaee69e7264ca908627f8145c821a6b3de465368c308e3242453ed0e2e9f766cc99bda1abca2c2aafc9c032f9c00ad4a SHA512 0f0778e3391e13e1dde292d8f78ebad1ff6ef6dd299a90016ca4070a4b096db6c733829a63b9624b88b8ea0918f881e1a9468cd2d1f21325c323b9a189b80def
+EBUILD sqlite-3.23.1.ebuild 9714 BLAKE2B ba6774368b08e8653156f7f2fca9afe180c0625e35347a624065aff8c7c26d36ce85276a23765a8e608994767a5df931d62668e953a5f6724591db8e2cb1f3c4 SHA512 dd04c93973800ce02ba952fafc0fe15553875fb1a5dc2984be4373a8420977e6ad63de138567a9f862b7d6896d711bfb1a4109f21b58d76facfe902a8e381cbf
 MISC metadata.xml 723 BLAKE2B 8866fbde770e7b8582de27303c72df047db80e0d70b1a1ceca0951a05b51bb704452071ceb6c29ecf3704d523888351615d1798aaab092e6b7505d4c6e3698ad SHA512 40616710b1d4edd3e24b5ac0797c1c9b606aeacac9f9543722bc9529e7c2c704a0c10b0ca68a5ba6e0a0ee8bc605212e8a49a050c8687afbdd7dbf28d6d4506a
diff --git a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch
index 7237fbfc0f30..ef813f67e743 100644
--- a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch
+++ b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch
@@ -1,5 +1,202 @@
 https://sqlite.org/src/info/893e6089c875e947
+https://sqlite.org/src/info/576a8f69ae25883f
+https://sqlite.org/src/info/de508e831a43f02c
 
+--- /ext/fts3/fts3.c
++++ /ext/fts3/fts3.c
+@@ -3963,7 +3963,7 @@
+ 
+ #ifdef SQLITE_TEST
+   if( rc==SQLITE_OK ){
+-    rc = sqlite3Fts3ExprInitTestInterface(db);
++    rc = sqlite3Fts3ExprInitTestInterface(db, pHash);
+   }
+ #endif
+ 
+--- /ext/fts3/fts3Int.h
++++ /ext/fts3/fts3Int.h
+@@ -584,7 +584,7 @@
+ );
+ void sqlite3Fts3ExprFree(Fts3Expr *);
+ #ifdef SQLITE_TEST
+-int sqlite3Fts3ExprInitTestInterface(sqlite3 *db);
++int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash*);
+ int sqlite3Fts3InitTerm(sqlite3 *db);
+ #endif
+ 
+--- /ext/fts3/fts3_expr.c
++++ /ext/fts3/fts3_expr.c
+@@ -1109,34 +1109,6 @@
+ #include <stdio.h>
+ 
+ /*
+-** Function to query the hash-table of tokenizers (see README.tokenizers).
+-*/
+-static int queryTestTokenizer(
+-  sqlite3 *db, 
+-  const char *zName,  
+-  const sqlite3_tokenizer_module **pp
+-){
+-  int rc;
+-  sqlite3_stmt *pStmt;
+-  const char zSql[] = "SELECT fts3_tokenizer(?)";
+-
+-  *pp = 0;
+-  rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
+-  if( rc!=SQLITE_OK ){
+-    return rc;
+-  }
+-
+-  sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
+-  if( SQLITE_ROW==sqlite3_step(pStmt) ){
+-    if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){
+-      memcpy((void *)pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp));
+-    }
+-  }
+-
+-  return sqlite3_finalize(pStmt);
+-}
+-
+-/*
+ ** Return a pointer to a buffer containing a text representation of the
+ ** expression passed as the first argument. The buffer is obtained from
+ ** sqlite3_malloc(). It is the responsibility of the caller to use 
+@@ -1203,12 +1175,12 @@
+ **
+ **   SELECT fts3_exprtest('simple', 'Bill col2:Bloggs', 'col1', 'col2');
+ */
+-static void fts3ExprTest(
++static void fts3ExprTestCommon(
++  int bRebalance,
+   sqlite3_context *context,
+   int argc,
+   sqlite3_value **argv
+ ){
+-  sqlite3_tokenizer_module const *pModule = 0;
+   sqlite3_tokenizer *pTokenizer = 0;
+   int rc;
+   char **azCol = 0;
+@@ -1218,7 +1190,9 @@
+   int ii;
+   Fts3Expr *pExpr;
+   char *zBuf = 0;
+-  sqlite3 *db = sqlite3_context_db_handle(context);
++  Fts3Hash *pHash = (Fts3Hash*)sqlite3_user_data(context);
++  const char *zTokenizer = 0;
++  char *zErr = 0;
+ 
+   if( argc<3 ){
+     sqlite3_result_error(context, 
+@@ -1227,23 +1201,17 @@
+     return;
+   }
+ 
+-  rc = queryTestTokenizer(db,
+-                          (const char *)sqlite3_value_text(argv[0]), &pModule);
+-  if( rc==SQLITE_NOMEM ){
+-    sqlite3_result_error_nomem(context);
+-    goto exprtest_out;
+-  }else if( !pModule ){
+-    sqlite3_result_error(context, "No such tokenizer module", -1);
+-    goto exprtest_out;
+-  }
+-
+-  rc = pModule->xCreate(0, 0, &pTokenizer);
+-  assert( rc==SQLITE_NOMEM || rc==SQLITE_OK );
+-  if( rc==SQLITE_NOMEM ){
+-    sqlite3_result_error_nomem(context);
+-    goto exprtest_out;
++  zTokenizer = (const char*)sqlite3_value_text(argv[0]);
++  rc = sqlite3Fts3InitTokenizer(pHash, zTokenizer, &pTokenizer, &zErr);
++  if( rc!=SQLITE_OK ){
++    if( rc==SQLITE_NOMEM ){
++      sqlite3_result_error_nomem(context);
++    }else{
++      sqlite3_result_error(context, zErr, -1);
++    }
++    sqlite3_free(zErr);
++    return;
+   }
+-  pTokenizer->pModule = pModule;
+ 
+   zExpr = (const char *)sqlite3_value_text(argv[1]);
+   nExpr = sqlite3_value_bytes(argv[1]);
+@@ -1257,7 +1225,7 @@
+     azCol[ii] = (char *)sqlite3_value_text(argv[ii+2]);
+   }
+ 
+-  if( sqlite3_user_data(context) ){
++  if( bRebalance ){
+     char *zDummy = 0;
+     rc = sqlite3Fts3ExprParse(
+         pTokenizer, 0, azCol, 0, nCol, nCol, zExpr, nExpr, &pExpr, &zDummy
+@@ -1283,23 +1251,38 @@
+   sqlite3Fts3ExprFree(pExpr);
+ 
+ exprtest_out:
+-  if( pModule && pTokenizer ){
+-    rc = pModule->xDestroy(pTokenizer);
++  if( pTokenizer ){
++    rc = pTokenizer->pModule->xDestroy(pTokenizer);
+   }
+   sqlite3_free(azCol);
+ }
+ 
++static void fts3ExprTest(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  fts3ExprTestCommon(0, context, argc, argv);
++}
++static void fts3ExprTestRebalance(
++  sqlite3_context *context,
++  int argc,
++  sqlite3_value **argv
++){
++  fts3ExprTestCommon(1, context, argc, argv);
++}
++
+ /*
+ ** Register the query expression parser test function fts3_exprtest() 
+ ** with database connection db. 
+ */
+-int sqlite3Fts3ExprInitTestInterface(sqlite3* db){
++int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash *pHash){
+   int rc = sqlite3_create_function(
+-      db, "fts3_exprtest", -1, SQLITE_UTF8, 0, fts3ExprTest, 0, 0
++      db, "fts3_exprtest", -1, SQLITE_UTF8, (void*)pHash, fts3ExprTest, 0, 0
+   );
+   if( rc==SQLITE_OK ){
+     rc = sqlite3_create_function(db, "fts3_exprtest_rebalance", 
+-        -1, SQLITE_UTF8, (void *)1, fts3ExprTest, 0, 0
++        -1, SQLITE_UTF8, (void*)pHash, fts3ExprTestRebalance, 0, 0
+     );
+   }
+   return rc;
+--- /test/fts3expr.test
++++ /test/fts3expr.test
+@@ -409,7 +409,7 @@
+ } {1 {Usage: fts3_exprtest(tokenizer, expr, col1, ...}}
+ do_test fts3expr-5.2 {
+   catchsql { SELECT fts3_exprtest('doesnotexist', 'a b', 'c') }
+-} {1 {No such tokenizer module}}
++} {1 {unknown tokenizer: doesnotexist}}
+ do_test fts3expr-5.3 {
+   catchsql { SELECT fts3_exprtest('simple', 'a b OR', 'c') }
+ } {1 {Error parsing expression}}
+--- /test/fts3expr4.test
++++ /test/fts3expr4.test
+@@ -29,7 +29,8 @@
+ }
+ 
+ proc do_icu_expr_test {tn expr res} {
+-  uplevel [list do_test $tn [list test_fts3expr icu $expr] [list {*}$res]]
++  set res2 [list {*}$res]
++  uplevel [list do_test $tn [list test_fts3expr "icu en_US" $expr] $res2]
+ }
+ 
+ proc do_simple_expr_test {tn expr res} {
 --- /test/zipfile2.test
 +++ /test/zipfile2.test
 @@ -52,17 +52,15 @@
diff --git a/dev-db/sqlite/sqlite-3.23.1.ebuild b/dev-db/sqlite/sqlite-3.23.1.ebuild
index 48ce15aead88..78a964027b3e 100644
--- a/dev-db/sqlite/sqlite-3.23.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.23.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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"
 
 RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]