gentoo auto-resync : 29:08:2024 - 12:00:47

8 files changed, 2 insertions, 403 deletions

diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
index 6039bdceebda..29c78f78245c 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -1,10 +1,3 @@
-AUX ibus-pinyin-1.5.0-content-type-method.patch 5534 BLAKE2B 658a4d099b02b344f38a9ef2fc2df0d2274dcd3b8071fac0aef0accbf7c21f0d4e98b9587d665b13195d7efc04bbf58218de84069a2c63eaa79156363061dd86 SHA512 3399052f0d12eb55554d5cc98637125e6648a56f3dc87eb2fadc63af3fb82bba915e820c51596d9106637f6a063100f217ad001422a61f8925db5c5b2024c976
-AUX ibus-pinyin-1.5.0-gettext.patch 632 BLAKE2B 8b5c09fce053b9f057ab32100c0091eed80ab8a4ab0ec6bb76814018417c2fafff26c27f779054ae2c8579e22c2f4f0995c9920c4533cc2734ac352933e9fe61 SHA512 a5b85ea7f26f5970dabd173c9ae467ada7f3c723a3b306988464465153139606979035dc8d451c4740cdb50356270c73a24581e32fa7c947841c12a152277d67
-AUX ibus-pinyin-1.5.0-python3.patch 2983 BLAKE2B 35f8b1d0649a3614fcecec78b3246dcecd8b40f68d71165b2c40d802bb42bff1d8f3f4c2c1baf25fc6ca97e190f7eb2004054f4d9857b605129b45c41b273f52 SHA512 c9eda6fb227358c8214ba717f6d800f3c47f9110e99e16601966651bd698cd703daedcec82a2933b76701bc05870ff88715a6d639333b5e5959c1f5e86e2dcff
-AUX ibus-pinyin-1.5.0-sqlite-3.41.0.patch 764 BLAKE2B fe9989fb0b5935a7baa429ef389f8e874d0c59fb849e771e810f8581fe9ed928ae41bf868954a440adb484bb9ea502f005bcc084f7cb15d1070e386ee439d783 SHA512 b9165594d6c97dd511eca6b5c61486b4f1a9be2acda0a35d6013371fb08e13d244ee046f7cf30f568d32367a96f9d19402361ffd8e2b69877e0909d110ec7d09
-AUX ibus-pinyin-boost.patch 409 BLAKE2B 5fececc7f4ed6941d374799ccdb1d9d7deeeb7078bedc8d0085e12f8310c42d752c14168a7d07a88e9412fa9cbff5c5bdf4274202d2ed6b6e7f337a96c65c3f0 SHA512 8e4efe9b5d12d35672dd8891a49599bef6611aeb723e8fbc08197896e417cca1d55cf31a0bb1f3ec572db489b01aa36349eaf9238d1a693483d6e21bc10eab2e
-DIST ibus-pinyin-1.5.0.tar.gz 692516 BLAKE2B ae53eb79ea4e5336347d689814d8ef033551a9b432268e643927b28911da3d03701acb3f337d7781168461c1c53537f2271fc8f253d1e99a269f61ae5eb83b05 SHA512 b0cd849ee3154543747dde8994eec9aed01d67e0d9be308a2f0230cf22f0281cd8fcabd9763b24238547a37e54400bcd8e541937767b93f005d04302f0c00241
 DIST ibus-pinyin-1.5.1.gh.tar.gz 241963 BLAKE2B 4f7a08c20a311e0dc76bbea87439976a4a26c01fb80be880f3f8ba7fdd9c309011b0cc9bbb63030e6f4e1f0866d4fad8d3324464160ca73ce663e272a042e0eb SHA512 2ad3e7705d3f537135576ceb165a305728739ba2965d8d50f6db8c5043f17f722ca8b42de053cdcb8ff05ef10a7f7c4a0c7f0924beefdfa197225e360c98abd9
-EBUILD ibus-pinyin-1.5.0-r6.ebuild 1390 BLAKE2B b58726edfdc36e9b556ab5a2fe6d1d174226364ad70b8861610b225a1219f55ec8592e7a6a2f24932d0595fab171cc2652efd8b33e64e310b43e0862f364ad15 SHA512 134dbb46efa19884cc9f10d2e847d7c110684fcc9df8293f0714d43f2dda20d10c2bc8f5f1df7d33757aed48b55f4dfced00542c324eb086779c2bf870ba0bf6
-EBUILD ibus-pinyin-1.5.1.ebuild 1166 BLAKE2B 0efde79093846c62a9c6bd02bcefb7cba0cb2d37c107a885d515110533f61b62e1710340d49d7baa50b03282bd6b93075cfe6b4facfd0ccc08da11b24cfffa00 SHA512 39d5c7fb861d62c9151086f44ed31cdb792398988cabc1129eb92635421080e5d8ebbdc2667a95eb5c6066ff2351c4863165cc781cfdc174886b39e58514f647
+EBUILD ibus-pinyin-1.5.1.ebuild 1164 BLAKE2B 0b0d1b4bfc79061fac08c9f6ab8965e65f1793f84a2dfc83201da8fb6f8459c217bb611b4eec661c207e443442cc5bf31b5d7288f93919ab6f73bc0dcf98825c SHA512 b6c4ea940c587b94f23849e2de07d652f20d15d53d13afc0bfd18a8e2fbfe9ca5f90ed1dbfda3464355325b3a59bbba45fde3b0a558ecf9d592bc51a5f767c81
 MISC metadata.xml 525 BLAKE2B 54c6aef9209148f57e663ae762242e0d3d0ef4ecb1eed537c8509083c8094842074f072668d595bc55d28698a1433997632ce0daede144cbaff1b35a32ff0447 SHA512 7dd6aa126f71457e8e86a2b02998944144399b73815f5afa789a320f531d74e41b5d7a21b2639ec673216bae09fc0b1e09659d8e975926a7c03934e5beddc2f2
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-content-type-method.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-content-type-method.patch
deleted file mode 100644
index 737046cfd7c6..000000000000
--- a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-content-type-method.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-commit 97565d04e40634a1ab62790f718a8377754d2954
-Author: Peng Wu <alexepico@gmail.com>
-Date:   Wed Feb 19 10:57:40 2014 -0500
-
-    support setContentType method
-
-    ibus now supports setContentType method, if an application input some
-    password, the password will not be shown.
-
-    BUG=rhbz#1027029
-    R=Shawn.P.Huang@gmail.com
-
-    Review URL: https://codereview.appspot.com/22330043
-
-    Patch from Peng Wu <alexepico@gmail.com>.
-
-diff --git a/src/PYBopomofoEngine.cc b/src/PYBopomofoEngine.cc
-index 581c4cf..16d47b3 100644
---- a/src/PYBopomofoEngine.cc
-+++ b/src/PYBopomofoEngine.cc
-@@ -72,6 +72,9 @@ BopomofoEngine::processKeyEvent (guint keyval, guint keycode, guint modifiers)
- {
-     gboolean retval = FALSE;
- 
-+    if (contentIsPassword())
-+        return retval;
-+
-     /* check Shift + Release hotkey,
-      * and then ignore other Release key event */
-     if (modifiers & IBUS_RELEASE_MASK) {
-@@ -139,6 +142,8 @@ BopomofoEngine::focusIn (void)
- void
- BopomofoEngine::focusOut (void)
- {
-+    Engine::focusOut();
-+
-     reset ();
- }
- 
-diff --git a/src/PYEngine.cc b/src/PYEngine.cc
-index d9fa04a..553d13f 100644
---- a/src/PYEngine.cc
-+++ b/src/PYEngine.cc
-@@ -67,6 +67,12 @@ static gboolean ibus_pinyin_engine_process_key_event
-                                                  guint                   modifiers);
- static void     ibus_pinyin_engine_focus_in     (IBusEngine             *engine);
- static void     ibus_pinyin_engine_focus_out    (IBusEngine             *engine);
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+static void     ibus_pinyin_engine_set_content_type
-+                                                (IBusEngine     *engine,
-+                                                 guint           purpose,
-+                                                 guint           hints);
-+#endif
- static void     ibus_pinyin_engine_reset        (IBusEngine             *engine);
- static void     ibus_pinyin_engine_enable       (IBusEngine             *engine);
- static void     ibus_pinyin_engine_disable      (IBusEngine             *engine);
-@@ -123,6 +129,10 @@ ibus_pinyin_engine_class_init (IBusPinyinEngineClass *klass)
-     engine_class->focus_in = ibus_pinyin_engine_focus_in;
-     engine_class->focus_out = ibus_pinyin_engine_focus_out;
- 
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+    engine_class->set_content_type = ibus_pinyin_engine_set_content_type;
-+#endif
-+
-     engine_class->page_up = ibus_pinyin_engine_page_up;
-     engine_class->page_down = ibus_pinyin_engine_page_down;
- 
-@@ -182,6 +192,17 @@ ibus_pinyin_engine_process_key_event (IBusEngine     *engine,
-     return pinyin->engine->processKeyEvent (keyval, keycode, modifiers);
- }
- 
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+static void
-+ibus_pinyin_engine_set_content_type (IBusEngine     *engine,
-+                                     guint purpose,
-+                                     guint hints)
-+{
-+    IBusPinyinEngine *pinyin = (IBusPinyinEngine *) engine;
-+    return pinyin->engine->setContentType (purpose, hints);
-+}
-+#endif
-+
- static void
- ibus_pinyin_engine_property_activate (IBusEngine    *engine,
-                                       const gchar   *prop_name,
-@@ -220,6 +241,39 @@ FUNCTION(cursor_up,   cursorUp)
- FUNCTION(cursor_down, cursorDown)
- #undef FUNCTION
- 
-+Engine::Engine (IBusEngine *engine) : m_engine (engine)
-+{
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+    m_input_purpose = IBUS_INPUT_PURPOSE_FREE_FORM;
-+#endif
-+}
-+
-+gboolean
-+Engine::contentIsPassword()
-+{
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+   return IBUS_INPUT_PURPOSE_PASSWORD == m_input_purpose;
-+#else
-+   return false;
-+#endif
-+}
-+
-+void
-+Engine::focusOut (void)
-+{
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+    m_input_purpose = IBUS_INPUT_PURPOSE_FREE_FORM;
-+#endif
-+}
-+
-+#if IBUS_CHECK_VERSION(1, 5, 4)
-+void
-+Engine::setContentType (guint purpose, guint hints)
-+{
-+    m_input_purpose = (IBusInputPurpose) purpose;
-+}
-+#endif
-+
- Engine::~Engine (void)
- {
- }
-diff --git a/src/PYEngine.h b/src/PYEngine.h
-index b74e6e8..21041b1 100644
---- a/src/PYEngine.h
-+++ b/src/PYEngine.h
-@@ -37,13 +37,18 @@ GType   ibus_pinyin_engine_get_type    (void);
- 
- class Engine {
- public:
--    Engine (IBusEngine *engine) : m_engine (engine) { }
-+    Engine (IBusEngine *engine);
-     virtual ~Engine (void);
- 
-+    gboolean contentIsPassword();
-+
-     // virtual functions
-     virtual gboolean processKeyEvent (guint keyval, guint keycode, guint modifiers) = 0;
-     virtual void focusIn (void) = 0;
--    virtual void focusOut (void) = 0;
-+    virtual void focusOut (void);
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+    virtual void setContentType (guint purpose, guint hints);
-+#endif
-     virtual void reset (void) = 0;
-     virtual void enable (void) = 0;
-     virtual void disable (void) = 0;
-@@ -122,6 +127,11 @@ protected:
- 
- protected:
-     Pointer<IBusEngine>  m_engine;      // engine pointer
-+
-+#if IBUS_CHECK_VERSION (1, 5, 4)
-+    IBusInputPurpose m_input_purpose;
-+#endif
-+
- };
- 
- };
-diff --git a/src/PYPinyinEngine.cc b/src/PYPinyinEngine.cc
-index 7aea261..babaaed 100644
---- a/src/PYPinyinEngine.cc
-+++ b/src/PYPinyinEngine.cc
-@@ -82,6 +82,9 @@ PinyinEngine::processKeyEvent (guint keyval, guint keycode, guint modifiers)
- {
-     gboolean retval = FALSE;
- 
-+    if (contentIsPassword())
-+        return retval;
-+
-     /* check Shift + Release hotkey,
-      * and then ignore other Release key event */
-     if (modifiers & IBUS_RELEASE_MASK) {
-@@ -195,6 +198,8 @@ PinyinEngine::focusIn (void)
- void
- PinyinEngine::focusOut (void)
- {
-+    Engine::focusOut ();
-+
-     reset ();
- }
- 
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-gettext.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-gettext.patch
deleted file mode 100644
index 2014bad9820a..000000000000
--- a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-gettext.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/setup/main.py
-+++ b/setup/main.py
-@@ -45,7 +45,12 @@ class PreferencesDialog:
-         locale.setlocale(locale.LC_ALL, "")
-         localedir = os.getenv("IBUS_LOCALEDIR")
-         gettext.bindtextdomain("ibus-pinyin", localedir)
--        gettext.bind_textdomain_codeset("ibus-pinyin", "UTF-8")
-+        # Python's gettext module doesn't provide all methods in
-+        # new Python version since Python 3.10
-+        try:
-+            gettext.bind_textdomain_codeset("ibus-pinyin", "UTF-8")
-+        except AttributeError:
-+            pass
- 
-         self.__bus = IBus.Bus()
-         self.__config = self.__bus.get_config()
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-python3.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-python3.patch
deleted file mode 100644
index 03988ee0ab7e..000000000000
--- a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-python3.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-commit 616770084991de0f36bea7b5861ef1b1657c9a31
-Author: ZhaoQiang <zhaoqiang@gnome.org>
-Date:   Mon Nov 19 19:35:10 2018 +0800
-
-    Update ibus-setup-pinyin.in: to avoid ibus-pinyin-setup crash in pure python3 env.
-
-diff --git a/configure.ac b/configure.ac
-index aa6242a..ca99a6f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -82,6 +82,11 @@ AC_PATH_PROG(ENV_IBUS_TEST, env)
- AC_SUBST(ENV_IBUS_TEST)
- 
- # check python
-+AC_ARG_WITH(python,
-+    AS_HELP_STRING([--with-python[=PATH]],
-+        [Select python2 or python3]),
-+    [PYTHON=$with_python], []
-+)
- AM_PATH_PYTHON([2.5])
- 
- # --enable-boost
-diff --git a/setup/ibus-setup-pinyin.in b/setup/ibus-setup-pinyin.in
-index 2566737..314072c 100644
---- a/setup/ibus-setup-pinyin.in
-+++ b/setup/ibus-setup-pinyin.in
-@@ -26,5 +26,5 @@ export IBUS_PREFIX=@prefix@
- export IBUS_DATAROOTDIR=@datarootdir@
- export IBUS_LOCALEDIR=@localedir@
- cd @prefix@/share/ibus-pinyin/setup/
--exec python main.py $@
-+exec @PYTHON@ main.py $@
- 
-diff --git a/setup/main.py b/setup/main.py
-index fb27103..2e4051a 100644
---- a/setup/main.py
-+++ b/setup/main.py
-@@ -20,15 +20,21 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- 
-+from __future__ import print_function
-+
- import gettext
- import locale
- import os
- import sys
- 
-+from gi import require_version as gi_require_version
-+gi_require_version('GLib', '2.0')
-+gi_require_version('Gtk', '3.0')
-+gi_require_version('IBus', '1.0')
-+
- from gi.repository import GLib
- from gi.repository import Gtk
- from gi.repository import IBus
--from xdg import BaseDirectory
- 
- import version
- 
-@@ -250,8 +256,8 @@ class PreferencesDialog:
- 
-         def __correct_pinyin_toggled_cb(widget):
-             val = widget.get_active()
--            map(lambda w: self.__builder.get_object(w[0]).set_sensitive(val),
--                self.__correct_pinyin_widgets)
-+            for w in self.__correct_pinyin_widgets:
-+                self.__builder.get_object(w[0]).set_sensitive(val)
-         self.__correct_pinyin.connect("toggled", __correct_pinyin_toggled_cb)
- 
-         # init value
-@@ -300,8 +306,8 @@ class PreferencesDialog:
- 
-         def __fuzzy_pinyin_toggled_cb(widget):
-             val = widget.get_active()
--            map(lambda w: self.__builder.get_object(w[0]).set_sensitive(val),
--                self.__fuzzy_pinyin_widgets)
-+            for w in self.__fuzzy_pinyin_widgets:
-+                self.__builder.get_object(w[0]).set_sensitive(val)
-         self.__fuzzy_pinyin.connect("toggled", __fuzzy_pinyin_toggled_cb)
- 
-         # init value
-@@ -404,7 +410,7 @@ class PreferencesDialog:
-         elif isinstance(val, str):
-             var = GLib.Variant.new_string(val)
-         else:
--            print >> sys.stderr, "val(%s) is not in support type." % repr(val)
-+            print("val(%s) is not in support type." % repr(val), file=sys.stderr)
-             return
- 
-         self.__values[name] = val
diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch
deleted file mode 100644
index 0faa622e3230..000000000000
--- a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-UPSTREAM: https://github.com/ibus/ibus-pinyin/pull/12
-BUG: https://bugs.gentoo.org/896366
-AUTHOR: jinqiang zhang <peeweep@0x0.ee>
-
-As sqlite 3.41.0 release note say:
-
- The double-quoted string misfeature is now disabled by default for CLI
- builds. Legacy use cases can reenable the misfeature at run-time using
- the ".dbconfig dqs_dml on" and ".dbconfig dqs_ddl on" commands.
-
-We should change this double quote to single quote
-
---- a/data/db/english/english.awk
-+++ b/data/db/english/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/app-i18n/ibus-pinyin/files/ibus-pinyin-boost.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-boost.patch
deleted file mode 100644
index 124339e81bf2..000000000000
--- a/app-i18n/ibus-pinyin/files/ibus-pinyin-boost.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -93,9 +93,9 @@
- )
- if test x"$enable_boost" = x"yes"; then
-     # check boost
--    BOOST_REQUIRE([1.39])
--    BOOST_FIND_HEADER([boost/bind.hpp])
--    BOOST_FIND_HEADER([boost/signals2.hpp])
-+    AX_BOOST_BASE([1.39])
-+    AC_CHECK_HEADERS([boost/bind.hpp])
-+    AC_CHECK_HEADERS([boost/signals2.hpp])
- fi
- AM_CONDITIONAL(HAVE_BOOST, test x"$enable_boost" = x"yes")
- 
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r6.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r6.ebuild
deleted file mode 100644
index 17c7102262c0..000000000000
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2008-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit autotools lua-single python-single-r1
-
-DESCRIPTION="Chinese Pinyin and Bopomofo engines for IBus"
-HOMEPAGE="https://github.com/ibus/ibus-pinyin"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost lua nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/pyzy
-	dev-db/sqlite:3
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	boost? ( dev-libs/boost )
-	lua? ( ${LUA_DEPS} )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	dev-build/autoconf-archive
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-boost.patch
-	"${FILESDIR}"/${P}-content-type-method.patch
-	"${FILESDIR}"/${P}-python3.patch
-	"${FILESDIR}"/${P}-sqlite-3.41.0.patch
-	"${FILESDIR}"/${P}-gettext.patch #905906
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	if use lua; then
-		lua-single_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable boost) \
-		$(use_enable lua lua-extension) \
-		$(use_enable nls)
-}
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.1.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.1.ebuild
index 11b12c65352d..8b83f5c0a1c7 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.1.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ibus/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="boost lua nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	lua? ( ${LUA_REQUIRED_USE} )"