gentoo auto-resync : 05:03:2023 - 23:52:45

5 files changed, 52 insertions, 76 deletions

diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 4632c4d1a2eb..59f5ce5ca43b 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,7 +1,5 @@
-DIST ibus-libpinyin-1.12.1.tar.gz 1766803 BLAKE2B 1de8a51b52688dede32c572b39bd379296480ab2b0f909357465370e346bdf50f4cade5ab3f105f62a74e59cf2dc5e8d5235aedde7571b70d3c5dcee86d2e36b SHA512 ad6e7507bdb468d506071135449383e5bd4fc878bcffda4be6e4e7915b79dbaf919d2fa941b92b177dc7790bd895eaa9a6d04a2610f85e1e80e8eb50f188211d
-DIST ibus-libpinyin-1.13.0.tar.gz 1726869 BLAKE2B f18ae81edb4ebf18f569fc13f3088f32e57c6a4512f7cafb33a18fdb08d5fdcdb17ff1861c3419db3063808f655510f6f4de63c274d798c48731ac4632203ba6 SHA512 8eca89c3c71ada37ec93307556fc476ad8719e58ca828f684dff6e74e1cb91df3e8c8ce03c87dbb72d5b7213e7c7ca367da8cf6b1dddb47d63afdf23d53bc54c
+AUX ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch 1244 BLAKE2B 79dbfb0b5803277a47c444955277fd55ccaf575cdbd5f648a0d8e389cfe5841494b5b1842132c1921578c4f70df831ab8d01dc8265d57fe595247087d6ed6d3a SHA512 be17fe4e1b92a45cd101e633079feba729330bc8324acc2aa01c5272d2d1ef730d1110a0b839411549f813970ed9fb8b41b3f74a9c0374358ab3f0fafa4e044c
 DIST ibus-libpinyin-1.13.1.tar.gz 1726900 BLAKE2B 2540b5ca6657fe421f6f2986f32fba1b8840cafcc37b3ec5402705cb0edc0aac6b12d972b5da0326339a04c875dbd8f8cce902f613558f3f9d21b4a0cace31a3 SHA512 ee3a8c95e091992acb0558ff297743eb49bd8c73fbb9cd1f2b56db75137573dda2c677b1b25eb213fbd8779be004b06f95cded04273d7a469cf49f45cc27813a
-EBUILD ibus-libpinyin-1.12.1.ebuild 1454 BLAKE2B 426062753878441dc93d537bbf19d416808a7bb31d40391dafdd7b713b44aac3340e524e353290ffda720929d9fdc95d795512676b76960fa3e8b72152021227 SHA512 220874c802cafab084ce2456542d3a5bda85f3183c851207c89a49f0a9191ba5184f2277c321cc99095b222a3ef8a893e215cc795bd94970aec7aa5b835f7057
-EBUILD ibus-libpinyin-1.13.0.ebuild 1456 BLAKE2B 2f2b71d7133fa8c511fb50460fced76c721b50e5236ae99039e21581c40bef0f378ca8a7c6bf10950447db3d4e8160dbc223f210f211431bea3c675b81961699 SHA512 9d8bdab3529ef257390f29c04806cc896705e0514ff898e3bbe26768001aa60e2565c7fdb07cf64b658f6e0722cc9b1dc2ed7c3a1c1fe3310538727943928972
-EBUILD ibus-libpinyin-1.13.1.ebuild 1454 BLAKE2B 426062753878441dc93d537bbf19d416808a7bb31d40391dafdd7b713b44aac3340e524e353290ffda720929d9fdc95d795512676b76960fa3e8b72152021227 SHA512 220874c802cafab084ce2456542d3a5bda85f3183c851207c89a49f0a9191ba5184f2277c321cc99095b222a3ef8a893e215cc795bd94970aec7aa5b835f7057
+EBUILD ibus-libpinyin-1.13.1-r1.ebuild 1517 BLAKE2B c68bd6ed8192519e20d0c9ff3d05799f0ae0fab1803661d2e5f8d8a963beb7564cfae3e92ff1a0a56a001bf681f4fa43076103500eb07adcbc0bea5b2c6842b9 SHA512 eb25c499e570a37b997c6fe3084f456dd86f3cb4f716a08b937a0a8b10bf1202b1d3bfbe7079318bb62e02106c7bc0ece19064f7d14fd7905217dd087c72579f
+EBUILD ibus-libpinyin-1.13.1.ebuild 1454 BLAKE2B 0c639322d06f32c51b3c8432016ec9c7fd4191eb5ac4b45253e47b94cec659cf1fc6fe1c548b4f065e2f12d864a8d26b0c392540f76d61d02af5424fac3136ae SHA512 81a2d5dc8f41331339a59d0780f91b1a0f2a21181d342ff5db6be7816ccd5c6543b720ad7cd8f80ab077d1dd13a2b4462d37a71ac61394b1ddbf679a88abdbbc
 MISC metadata.xml 834 BLAKE2B ac644e5ceced4364c282f0766cfc5d85dfc14fc19fff46e96dee2aa8ff48c1c5d84dd496e3f83951983f311cbab0ea84652fab3e3a87e870dab999cf46821452 SHA512 dd1629baeddeb1ee4ab1670a4e29af865a75e40b7c6b58e9029af5900d5de9bfb98f71ccaf7eae508f0849ac85f4530d8770cc392d9bb8c31a881f8154ac5761
diff --git a/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch b/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch
new file mode 100644
index 000000000000..e3f001d42002
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch
@@ -0,0 +1,43 @@
+Fix quotes for compatibilty with sqlite3.41+
+https://bugs.gentoo.org/898478
+
+From b7f58280a3f1e20e01471fa53509007c0e96ad02 Mon Sep 17 00:00:00 2001
+From: graham <graham@ulsterit.com>
+Date: Sat, 4 Mar 2023 15:55:03 +0000
+Subject: [PATCH] change double quotes to single quotes to meet SQL standard
+ for strings, compatible with sqlite 3.41
+
+---
+ data/english.awk | 2 +-
+ data/table.awk   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/english.awk b/data/english.awk
+index c5dc0aa..bed156d 100644
+--- a/data/english.awk
++++ b/data/english.awk
+@@ -16,7 +16,7 @@ BEGIN {
+ }
+ 
+     # Insert data into english table
+-    {   printf "INSERT INTO english (word, freq) VALUES (\"%s\", %f);\n", $1, $2}
++    {   printf "INSERT INTO english (word, freq) VALUES ('%s', %f);\n", $1, $2}
+ 
+     #quit sqlite3
+ END {
+diff --git a/data/table.awk b/data/table.awk
+index 700529c..c097ec2 100644
+--- a/data/table.awk
++++ b/data/table.awk
+@@ -21,7 +21,7 @@ BEGIN {
+ 
+ # Insert data into phrases table
+ NF == 4 {
+-    printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, \"%s\", \"%s\");\n", id, $3, $1;
++    printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, '%s', '%s');\n", id, $3, $1;
+     id++;
+ }
+ 
+-- 
+2.39.2
+
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild
deleted file mode 100644
index b7af5906e50e..000000000000
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2015-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit autotools gnome2-utils lua-single python-single-r1
-
-DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
-HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost lua opencc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-BDEPEND="dev-db/sqlite:3
-	virtual/pkgconfig"
-
-DEPEND="${PYTHON_DEPS}
-	>=app-i18n/libpinyin-2.2.1:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	virtual/libintl
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	boost? ( dev-libs/boost:= )
-	lua? ( ${LUA_DEPS} )
-	opencc? ( app-i18n/opencc:= )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "/^appdatadir/s:/appdata:/metainfo:" \
-		data/Makefile.am || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-english-input-mode \
-		$(use_enable boost) \
-		$(use_enable lua lua-extension) \
-		$(use_enable opencc)
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.0.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild
index f2661fb08430..c61330975867 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.0.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools gnome2-utils lua-single python-single-r1
 
@@ -36,6 +36,10 @@ DEPEND="${PYTHON_DEPS}
 
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}_sqlite3.41_fix_quotes.patch
+)
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
index b7af5906e50e..25bcb2100bd1 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools gnome2-utils lua-single python-single-r1