Fix tests with USE="icu" (bug #342469).

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

4 files changed, 294 insertions, 18 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 9510e51906f6..d67871dec757 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.354 2010/10/31 09:27:03 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.355 2010/11/01 19:38:59 arfrever Exp $
+
+  01 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  sqlite-3.7.3.ebuild, +files/sqlite-3.7.3-icu_tests.patch:
+  Fix tests with USE="icu" (bug #342469).
 
 *sqlite-3.7.3 (31 Oct 2010)
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index fb477b2e3653..7048d8e4bf16 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX maketcllib.sh 879 RMD160 6d9a0e79a79d5a2efd6074e6b439d4634600980e SHA1 d5bb6054d3c9a4132c92bd8c172a547bf2cc9d85 SHA256 e101ed11d908bfb7f57519a99674160b0273d6500d191f758f8a0d1e6ed78120
 AUX sandbox-fix2.patch 432 RMD160 778fe532561642dbae6d1a3f572f6703828af42b SHA1 1b0eee83c7d6d2e36ffdf0265c8bdd14d1574a61 SHA256 21552219c14daad788380ae7e1ba6c665bb1ef9eadb611f676bd6249e3bde02d
 AUX sqlite-2.8.15-alignement-fix.patch 538 RMD160 12407bbe5f1bcae243d4247b43bf63ce0e8becea SHA1 d67a8bb2de26b1d6b7222175bd7f69d28afffb1e SHA256 f61f2f36fed61438d13dbb09902078ef11f0c3e8c8a119f84030689a2f2add8f
@@ -8,6 +5,7 @@ AUX sqlite-2.8.16-multilib.patch 4038 RMD160 0e074a3ebac7c188dbbf9b86be87a79e0c2
 AUX sqlite-3.6.22-dlopen.patch 452 RMD160 e9c7e77f3a7410e5b05f17bb6dfacf0270c1e036 SHA1 30adecb66b67ad401aafb56b6277f83bbfd1ea6f SHA256 840d684be229a898838560418d9f152a5c48095f7adce665f7ec75e4ef5c45f9
 AUX sqlite-3.6.22-interix-fixes-amalgamation.patch 717 RMD160 dfae5e2d22cddad5a2d375d4bbce639bc1da805e SHA1 c62fd67d3f32120c86d60299c426199169183107 SHA256 86995c345c3a51e396a4d520031231d7f76384e953829b58f9e9195ccb7a825b
 AUX sqlite-3.6.22-interix-fixes.patch 614 RMD160 0492235d52c003620a84888c36541bd8f40b44d2 SHA1 48cacb6fcd220cf1875d1fc5c640ee9cd5b3dd2f SHA256 1990fca1660bf0781875dbc699078c9eac54a643e4fece82faf765f7ccf8aaad
+AUX sqlite-3.7.3-icu_tests.patch 7858 RMD160 eb2a653de13a2e276fc67b7784a91b85897c1a27 SHA1 578e82fd6765b0f953dbbf5f5cefe115a027a063 SHA256 4b4a92cd1e09c0945282862acde883ddc20ff01ce811b682dbd25c11fcc2320b
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
 DIST sqlite-3.6.22.tar.gz 2999137 RMD160 3de220362e58589649b068519b9d2aa021371ca4 SHA1 7a29a469d5e28040224a934ed0c28041412876d8 SHA256 c8cc19895caeb4398e74c815531f5c9710b983523f7308bc80639999a1cf57f6
 DIST sqlite-3.6.23.1.tar.gz 3086807 RMD160 03847176d21391cc44d2275fc685d556c56ab9d8 SHA1 718615fc37a5ef57fb4e7d06fc56ee7bda391d6f SHA256 1a0517438a573a68ab73e8ed75d194086d55d75883542ab1d5ae1080bbddd492
@@ -30,13 +28,6 @@ EBUILD sqlite-3.6.23.1-r1.ebuild 4628 RMD160 4dbd0d3e0722f330319d45cc98102cf64b7
 EBUILD sqlite-3.6.23.1.ebuild 4487 RMD160 931e98508b18497e9544f380d7e4546796d6fa50 SHA1 0e2983f87a66a67594b992576cd9470a2fc71b61 SHA256 7d2f76798f61658e357ce069ce6928e190a40cfea27d49f9848b80c2a6d8786a
 EBUILD sqlite-3.7.0.ebuild 4622 RMD160 591d6721b8843297a364583d4ca90fe83b743300 SHA1 63eb5d3268527761025303140c7e62d65b2f90ed SHA256 1c3e4504ce5ab13d50ac9dc65b01a7c3ad592304d3b46ce4b410b55ceb9ded74
 EBUILD sqlite-3.7.2.ebuild 4709 RMD160 14ec3fb4dbfd759c6641145df0e540ba012e6396 SHA1 c3192fd551374a5c4cce12cd18c18ee3a3f2da04 SHA256 2a7417cc78a69d4b4950500724c368d4b69a3e392981efb24bdbace67f41d404
-EBUILD sqlite-3.7.3.ebuild 4720 RMD160 a4f342009a900228e28266c83526482d0695ae91 SHA1 f060f541105a29db173de842a7622cef0bb09132 SHA256 83b52935c1bd0944cc0171e9a3339cc8469746a58593ce45944df13b8d989e8f
-MISC ChangeLog 48772 RMD160 933b61019ec4320c1ec4d12a618cb13da8084aa7 SHA1 d0f437ae46e37ed91f8cb66bc81ce258715ec0e4 SHA256 517da159cd08f6f1bd2d206dda103460d4abd13bf053d9174f8a5b094d01c7d2
+EBUILD sqlite-3.7.3.ebuild 4716 RMD160 33ec6bdcc6576a8a1875c7617946b06f39d79c3a SHA1 931b352c19783f7c23412250a1b14629bf4badf3 SHA256 e4ed88fecb5a6c84b439c5f385148e4dcebfb357a82e2ebf6a91fe96eb4fbafa
+MISC ChangeLog 48946 RMD160 46b09a5d28a9373e4a60b59a6899c5f0975ba292 SHA1 24d8069db55c9b9d19bd12528a2fce0a8456ddc0 SHA256 c0396aa9e4f0201147eb0aec67707fda2978cb11fa3e2816fdde15f5a09c366d
 MISC metadata.xml 1011 RMD160 02768455c7a2f2e980fcd51e16105d1a030a69cf SHA1 98ba789e4120f8d0a1e2f49285f6dbf49e0a35d0 SHA256 4b2dc7fa04d3909cac1f4b764daaddb237e5c4f9a05998d7fd04dc42a5775aae
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzNNvoACgkQcxLzpIGCsLTyNQCdGmpuBa9QEyUvkz89CJsSjd0v
-/dgAn1Vw0DMg4AzWZThvPW61yYBgIps5
-=8NJj
------END PGP SIGNATURE-----
diff --git a/dev-db/sqlite/files/sqlite-3.7.3-icu_tests.patch b/dev-db/sqlite/files/sqlite-3.7.3-icu_tests.patch
new file mode 100644
index 000000000000..9e8b77a21efa
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.7.3-icu_tests.patch
@@ -0,0 +1,284 @@
+--- test/e_expr.test
++++ test/e_expr.test
+@@ -937,8 +937,14 @@
+ # 'a'&nbsp;LIKE&nbsp;'A' is TRUE but
+ # '&aelig;'&nbsp;LIKE&nbsp;'&AElig;' is FALSE.
+ #
++#   The restriction to ASCII characters does not apply if the ICU
++#   library is compiled in. When ICU is enabled SQLite does not act
++#   as it does "by default".
++#
+ do_execsql_test e_expr-14.5.1 { SELECT 'A' LIKE 'a'         } 1
+-do_execsql_test e_expr-14.5.2 "SELECT '\u00c6' LIKE '\u00e6'" 0
++ifcapable !icu {
++  do_execsql_test e_expr-14.5.2 "SELECT '\u00c6' LIKE '\u00e6'" 0
++}
+ 
+ # EVIDENCE-OF: R-56683-13731 If the optional ESCAPE clause is present,
+ # then the expression following the ESCAPE keyword must evaluate to a
+@@ -985,7 +991,8 @@
+   eval lappend ::likeargs $args
+   return 1
+ }
+-db func like likefunc
++db func like -argcount 2 likefunc
++db func like -argcount 3 likefunc
+ set ::likeargs [list]
+ do_execsql_test e_expr-15.1.1 { SELECT 'abc' LIKE 'def' } 1
+ do_test         e_expr-15.1.2 { set likeargs } {def abc}
+@@ -1056,12 +1063,16 @@
+ # default and so use of the REGEXP operator will normally result in an
+ # error message.
+ #
+-do_catchsql_test e_expr-18.1.1 { 
+-  SELECT regexp('abc', 'def') 
+-} {1 {no such function: regexp}}
+-do_catchsql_test e_expr-18.1.2 { 
+-  SELECT 'abc' REGEXP 'def'
+-} {1 {no such function: REGEXP}}
++#   There is a regexp function if ICU is enabled though.
++#
++ifcapable !icu {
++  do_catchsql_test e_expr-18.1.1 { 
++    SELECT regexp('abc', 'def') 
++  } {1 {no such function: regexp}}
++  do_catchsql_test e_expr-18.1.2 { 
++    SELECT 'abc' REGEXP 'def'
++  } {1 {no such function: REGEXP}}
++}
+ 
+ # EVIDENCE-OF: R-33693-50180 The REGEXP operator is a special syntax for
+ # the regexp() user function.
+--- test/like.test
++++ test/like.test
+@@ -115,7 +115,7 @@
+   proc test_regexp {a b} {
+     return [regexp $a $b]
+   }
+-  db function regexp test_regexp
++  db function regexp -argcount 2 test_regexp
+   execsql {
+     SELECT x FROM t1 WHERE x REGEXP 'abc' ORDER BY 1;
+   }
+@@ -608,7 +608,7 @@
+ } {1 abcdef 1 ghijkl 1 mnopqr 2 abcdef 2 ghijkl 2 mnopqr}
+ 
+ 
+-ifcapable like_opt {
++ifcapable like_opt&&!icu {
+   # Evaluate SQL.  Return the result set followed by the
+   # and the number of full-scan steps.
+   #
+@@ -673,110 +673,110 @@
+       regexp {INDEX i2} $res
+     } {1}
+   }
+-}
+-
+-# Do an SQL statement.  Append the search count to the end of the result.
+-#
+-proc count sql {
+-  set ::sqlite_search_count 0
+-  set ::sqlite_like_count 0
+-  return [concat [execsql $sql] scan $::sqlite_search_count \
+-           like $::sqlite_like_count]
+-}
+ 
+-# The LIKE and GLOB optimizations do not work on columns with
+-# affinity other than TEXT.
+-# Ticket #3901
+-#
+-do_test like-10.1 {
+-  db close
+-  sqlite3 db test.db
+-  execsql {
+-    CREATE TABLE t10(
+-      a INTEGER PRIMARY KEY,
+-      b INTEGER COLLATE nocase UNIQUE,
+-      c NUMBER COLLATE nocase UNIQUE,
+-      d BLOB COLLATE nocase UNIQUE,
+-      e COLLATE nocase UNIQUE,
+-      f TEXT COLLATE nocase UNIQUE
+-    );
+-    INSERT INTO t10 VALUES(1,1,1,1,1,1);
+-    INSERT INTO t10 VALUES(12,12,12,12,12,12);
+-    INSERT INTO t10 VALUES(123,123,123,123,123,123);
+-    INSERT INTO t10 VALUES(234,234,234,234,234,234);
+-    INSERT INTO t10 VALUES(345,345,345,345,345,345);
+-    INSERT INTO t10 VALUES(45,45,45,45,45,45);
+-  }
+-  count {
+-    SELECT a FROM t10 WHERE b LIKE '12%' ORDER BY a;
+-  }
+-} {12 123 scan 5 like 6}
+-do_test like-10.2 {
+-  count {
+-    SELECT a FROM t10 WHERE c LIKE '12%' ORDER BY a;
+-  }
+-} {12 123 scan 5 like 6}
+-do_test like-10.3 {
+-  count {
+-    SELECT a FROM t10 WHERE d LIKE '12%' ORDER BY a;
+-  }
+-} {12 123 scan 5 like 6}
+-do_test like-10.4 {
+-  count {
+-    SELECT a FROM t10 WHERE e LIKE '12%' ORDER BY a;
+-  }
+-} {12 123 scan 5 like 6}
+-do_test like-10.5 {
+-  count {
+-    SELECT a FROM t10 WHERE f LIKE '12%' ORDER BY a;
+-  }
+-} {12 123 scan 3 like 0}
+-do_test like-10.6 {
+-  count {
+-    SELECT a FROM t10 WHERE a LIKE '12%' ORDER BY a;
+-  }
+-} {12 123 scan 5 like 6}
+-do_test like-10.10 {
+-  execsql {
+-    CREATE TABLE t10b(
+-      a INTEGER PRIMARY KEY,
+-      b INTEGER UNIQUE,
+-      c NUMBER UNIQUE,
+-      d BLOB UNIQUE,
+-      e UNIQUE,
+-      f TEXT UNIQUE
+-    );
+-    INSERT INTO t10b SELECT * FROM t10;
+-  }
+-  count {
+-    SELECT a FROM t10b WHERE b GLOB '12*' ORDER BY a;
+-  }
+-} {12 123 scan 5 like 6}
+-do_test like-10.11 {
+-  count {
+-    SELECT a FROM t10b WHERE c GLOB '12*' ORDER BY a;
+-  }
+-} {12 123 scan 5 like 6}
+-do_test like-10.12 {
+-  count {
+-    SELECT a FROM t10b WHERE d GLOB '12*' ORDER BY a;
+-  }
+-} {12 123 scan 5 like 6}
+-do_test like-10.13 {
+-  count {
+-    SELECT a FROM t10b WHERE e GLOB '12*' ORDER BY a;
+-  }
+-} {12 123 scan 5 like 6}
+-do_test like-10.14 {
+-  count {
+-    SELECT a FROM t10b WHERE f GLOB '12*' ORDER BY a;
+-  }
+-} {12 123 scan 3 like 0}
+-do_test like-10.15 {
+-  count {
+-    SELECT a FROM t10b WHERE a GLOB '12*' ORDER BY a;
++  # Do an SQL statement.  Append the search count to the end of the result.
++  #
++  proc count sql {
++    set ::sqlite_search_count 0
++    set ::sqlite_like_count 0
++    return [concat [execsql $sql] scan $::sqlite_search_count \
++             like $::sqlite_like_count]
+   }
+-} {12 123 scan 5 like 6}
++
++  # The LIKE and GLOB optimizations do not work on columns with
++  # affinity other than TEXT.
++  # Ticket #3901
++  #
++  do_test like-10.1 {
++    db close
++    sqlite3 db test.db
++    execsql {
++      CREATE TABLE t10(
++        a INTEGER PRIMARY KEY,
++        b INTEGER COLLATE nocase UNIQUE,
++        c NUMBER COLLATE nocase UNIQUE,
++        d BLOB COLLATE nocase UNIQUE,
++        e COLLATE nocase UNIQUE,
++        f TEXT COLLATE nocase UNIQUE
++      );
++      INSERT INTO t10 VALUES(1,1,1,1,1,1);
++      INSERT INTO t10 VALUES(12,12,12,12,12,12);
++      INSERT INTO t10 VALUES(123,123,123,123,123,123);
++      INSERT INTO t10 VALUES(234,234,234,234,234,234);
++      INSERT INTO t10 VALUES(345,345,345,345,345,345);
++      INSERT INTO t10 VALUES(45,45,45,45,45,45);
++    }
++    count {
++      SELECT a FROM t10 WHERE b LIKE '12%' ORDER BY a;
++    }
++  } {12 123 scan 5 like 6}
++  do_test like-10.2 {
++    count {
++      SELECT a FROM t10 WHERE c LIKE '12%' ORDER BY a;
++    }
++  } {12 123 scan 5 like 6}
++  do_test like-10.3 {
++    count {
++      SELECT a FROM t10 WHERE d LIKE '12%' ORDER BY a;
++    }
++  } {12 123 scan 5 like 6}
++  do_test like-10.4 {
++    count {
++      SELECT a FROM t10 WHERE e LIKE '12%' ORDER BY a;
++    }
++  } {12 123 scan 5 like 6}
++  do_test like-10.5 {
++    count {
++      SELECT a FROM t10 WHERE f LIKE '12%' ORDER BY a;
++    }
++  } {12 123 scan 3 like 0}
++  do_test like-10.6 {
++    count {
++      SELECT a FROM t10 WHERE a LIKE '12%' ORDER BY a;
++    }
++  } {12 123 scan 5 like 6}
++  do_test like-10.10 {
++    execsql {
++      CREATE TABLE t10b(
++        a INTEGER PRIMARY KEY,
++        b INTEGER UNIQUE,
++        c NUMBER UNIQUE,
++        d BLOB UNIQUE,
++        e UNIQUE,
++        f TEXT UNIQUE
++      );
++      INSERT INTO t10b SELECT * FROM t10;
++    }
++    count {
++      SELECT a FROM t10b WHERE b GLOB '12*' ORDER BY a;
++    }
++  } {12 123 scan 5 like 6}
++  do_test like-10.11 {
++    count {
++      SELECT a FROM t10b WHERE c GLOB '12*' ORDER BY a;
++    }
++  } {12 123 scan 5 like 6}
++  do_test like-10.12 {
++    count {
++      SELECT a FROM t10b WHERE d GLOB '12*' ORDER BY a;
++    }
++  } {12 123 scan 5 like 6}
++  do_test like-10.13 {
++    count {
++      SELECT a FROM t10b WHERE e GLOB '12*' ORDER BY a;
++    }
++  } {12 123 scan 5 like 6}
++  do_test like-10.14 {
++    count {
++      SELECT a FROM t10b WHERE f GLOB '12*' ORDER BY a;
++    }
++  } {12 123 scan 3 like 0}
++  do_test like-10.15 {
++    count {
++      SELECT a FROM t10b WHERE a GLOB '12*' ORDER BY a;
++    }
++  } {12 123 scan 5 like 6}
++}
+ 
+ # LIKE and GLOB where the default collating sequence is not appropriate
+ # but an index with the appropriate collating sequence exists.
diff --git a/dev-db/sqlite/sqlite-3.7.3.ebuild b/dev-db/sqlite/sqlite-3.7.3.ebuild
index 0728ffb0dadb..c2cc45722ec9 100644
--- a/dev-db/sqlite/sqlite-3.7.3.ebuild
+++ b/dev-db/sqlite/sqlite-3.7.3.ebuild
@@ -1,6 +1,6 @@
 # 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.7.3.ebuild,v 1.1 2010/10/31 09:27:03 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.3.ebuild,v 1.2 2010/11/01 19:38:59 arfrever Exp $
 
 EAPI="3"
 
@@ -32,13 +32,10 @@ DEPEND="${RDEPEND}
 	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
+		epatch "${FILESDIR}/${P}-icu_tests.patch"
 		eautoreconf  # dlopen.patch patches configure.ac
 	else
 		epatch "${FILESDIR}/${PN}-3.6.22-interix-fixes-amalgamation.patch"