gentoo auto-resync : 25:11:2022 - 07:12:04

4 files changed, 42 insertions, 5 deletions

diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index a64b7a11fedc..f545b913d66b 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,8 +1,9 @@
+AUX sqlite-3.39.4-icu-72-test.patch 800 BLAKE2B 799fd4df209886e5df6fc050247719a0eafae494bd23c3ee44e4e1c0b86da036d438ac86f763101b846fef7b7f3c1196c0ebdbd3e7aa70394c76307673a44cc6 SHA512 dca2f9552e144dfb5636c4796c634d892d1de0beb980ce6683906266fb4c9a9a98e03eb92c8c3fe7a8de427ae41d0f784ac32c0f93630563cb6a3d6db6fb5493
 DIST sqlite-doc-3390400.zip 10853153 BLAKE2B 617927351809e5ec7489011f963337e92b539a83b135daa7ccd48f840d35716d08e8adc08a67e17d674a6bc64ca24fa92b56573c0065105386fc9c75f1f7f9ef SHA512 75d97b0f2f0d530b2e0ad505574af3bf657d82f0859bb5de7ee45c40a80351e933944845cedca56b579925a3d07505c6f4721f756f27862ffafdfc2caff539fb
 DIST sqlite-doc-3400000.zip 10921883 BLAKE2B 786bba5f4eec32114b0e12d0a42eb763c3be999506edb65e72a1ea32499c9972be9e546b4773a96165273e3eac4da9c2e3c2c696e07494d8af8f273da72e44fd SHA512 3557fe49e08fd24890da584f3fa7fb93d1e3317787f98a8ce1062dcac07733782026e50dfef7db72582739ddf0a77095cc4d3a81f3df097a69e85c672591bf7e
 DIST sqlite-src-3390400.zip 13405169 BLAKE2B aa0e0abbdcafced086a604ec910dbfd1e4df28e83e0edb6056019391e96367050e59478ee8847d930191a65b21cf0bf9957c35ef056abd9be4947a3838d78eb2 SHA512 0acb8afc87f911c91ec555cc97af5b77b6b0e80cc8672711ddd87c651d9e11b697c9669ff9ba2b58da12b972bb46acdf8b8fe35993950f10735b4036501b73bb
 DIST sqlite-src-3400000.zip 13723231 BLAKE2B 4b4d3119f3210497e4e41f1305558e7ed49505b635fed18f466b5fb8dcc60712d0c053a0e569f9af4b2b37803d2670528244bdcf6ef580fd3f85510e8d4dba78 SHA512 c3bb3829f99c663f3381f4c610e401173f133fe944558b70da7521cc44116d048e4e1651993feb128b0f3814381aa4fa93f48ba3e277abca3442af805159287d
-EBUILD sqlite-3.39.4.ebuild 13252 BLAKE2B a11cf6540941038ac710c9bf6bce657da353b520f44119c6a68ace2d73ef9f8ea26062d8fa8bc6008bec0917a45597ae1dd1a35c9c4b7a162993e59b51df89b3 SHA512 df3d005656e2e4447cbf0beb950859870e33867d86716af2b92174ad0e40afa43c7efdba40bde85f3aa72cac8405dcf64688a3eb6e16a93a0441c661b1561e18
-EBUILD sqlite-3.40.0.ebuild 13054 BLAKE2B 42e4c73ade60921de796e635dc01bfa45e1b6b28002ef56577c0d055bd5db01133e6023c4f37a4432e4b6c294cb72f16fe921f2e690755d2e2e2091a496df59a SHA512 b04cc5d4a7c7d2ca92449bd37d34094aa7a561ab7dae1c9cb1ba30b038a0bb098a14ad05546c48861975950174e7030d25fcd613f9db0a31964ad2d0e6a4ef9d
+EBUILD sqlite-3.39.4.ebuild 13307 BLAKE2B e47c50098d916a84cd7586e4a0d9246618783634c208c3e3f84b32db8315a0804c7d03f6d68990a33b5b8014fa4b01f8e013d26075f39ae07b7eef102ef3307d SHA512 59f4886e978daf7af41a4665a4e7ddb8ddc5ab7fea6cfe8f5b40303ca112ddd44007e6e8342e4235ca6e67b68a13d0259cbc65e2b88a88fe3e24930935ea7c58
+EBUILD sqlite-3.40.0.ebuild 13026 BLAKE2B 7362352c63c8ba197ba953e2aefd9248ce50f7b51efb0e6919a1299a3e20962b58b23fa54262abb52912a0b337549f3b88da65aecf3bd284992120909358ff5e SHA512 bb7a06ebbc86c75b584c59c859c2e47bdf68cfdf96c127852b4fd77dc6c05f26e6135cbf495d7d2fabd3a9a9477f3678d9fe60d008d2d254a5aaf067ad68c22c
 EBUILD sqlite-9999.ebuild 12967 BLAKE2B f6724f1c26d68d81390a6acecbefacae560d4c396f870749131202fcd9c59262fa07bba6b3629ef9c988ca8758ba29927df178dc0d35c717f9799682ddf6e344 SHA512 02598d374b55edf52ea3641b06812b554f80beb48137166b81b285499b92872574131e1afef3ab5d3ea6b7791cf1c2e47e86e144c2e2ad472be7adc07229353a
 MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38
diff --git a/dev-db/sqlite/files/sqlite-3.39.4-icu-72-test.patch b/dev-db/sqlite/files/sqlite-3.39.4-icu-72-test.patch
new file mode 100644
index 000000000000..54de04d11f06
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.39.4-icu-72-test.patch
@@ -0,0 +1,29 @@
+https://sqlite.org/src/vpatch?from=18e89a436daa18a8&to=a2b6883ac2ef878f
+https://sqlite.org/forum/forumpost/072d2fddc4
+https://bugs.gentoo.org/882605
+--- a/test/fts3expr4.test
++++ b/test/fts3expr4.test
+@@ -48,11 +48,20 @@
+ 
+ # In "col:word", if "col" is not the name of a column, the entire thing
+ # is passed to the tokenizer.
+ #
+ do_icu_expr_test 1.7 {a:word} {PHRASE 0 0 word}
+-do_icu_expr_test 1.8 {d:word} {PHRASE 3 0 d:word}
++# do_icu_expr_test 1.8 {d:word} {PHRASE 3 0 d:word}
++do_test 1.8 {
++  set res [
++    db one {SELECT fts3_exprtest('icu en_US', 'd:word', 'a', 'b', 'c')}
++  ]
++  expr {
++    $res=="PHRASE 3 0 d:word" ||
++    $res=="AND {AND {PHRASE 3 0 d} {PHRASE 3 0 :}} {PHRASE 3 0 word}"
++  }
++} 1
+ 
+ set sqlite_fts3_enable_parentheses 0
+ 
+ do_icu_expr_test 2.1 {
+   f (e NEAR/2 a)
+
+
diff --git a/dev-db/sqlite/sqlite-3.39.4.ebuild b/dev-db/sqlite/sqlite-3.39.4.ebuild
index a2eb7c1e987f..ffcf6d08808b 100644
--- a/dev-db/sqlite/sqlite-3.39.4.ebuild
+++ b/dev-db/sqlite/sqlite-3.39.4.ebuild
@@ -53,6 +53,10 @@ else
 	S="${WORKDIR}/${PN}-src-${SRC_PV}"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.39.4-icu-72-test.patch
+)
+
 _fossil_fetch() {
 	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
 	local repo_id="${1}"
@@ -139,7 +143,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply_user
+	default
 
 	eautoreconf
 
diff --git a/dev-db/sqlite/sqlite-3.40.0.ebuild b/dev-db/sqlite/sqlite-3.40.0.ebuild
index 03222cb85ae3..c10b8c754db0 100644
--- a/dev-db/sqlite/sqlite-3.40.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.40.0.ebuild
@@ -24,8 +24,7 @@ else
 	"
 	S="${WORKDIR}/${PN}-src-${SRC_PV}"
 
-	# Unkeyworded because of test failure: https://sqlite.org/forum/forumpost/cdb51a75ba
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="public-domain"
@@ -51,6 +50,10 @@ else
 	BDEPEND+=" app-arch/unzip"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.39.4-icu-72-test.patch
+)
+
 _fossil_fetch() {
 	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
 	local repo_id="${1}"