gentoo resync : 16.09.2020

4 files changed, 181 insertions, 1 deletions

diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index c29f9b67957d..ee8c544ae091 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1,4 +1,7 @@
+AUX ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch 4691 BLAKE2B 162301e028b0b8f864c394368897d635b3fea8939e52c9068884b08752f51a5d550381680dda65b42e80f471bd0ab616940f138fd53c79655454d6fbfa070b3c SHA512 e67e202fe2587a4b985b047c893164d3a68ba7ff4ae08d9cf5dde501614c9d71bc4d9628858f7bd9ef2f954c9826134d8965c59f8548723df6e94ab8652daafd
 AUX ibus-sunpinyin-python3.patch 388 BLAKE2B 35131840c58bc47980dbbe046723217afb8926f61de601d664524b961c80f718753e41a82b7cdcd8b137d71c97ad84b91a3b71677610b2f369f9be2da2582185 SHA512 90c7d08588e996e7df966f9ee4b3b044a038392a0f3f074f4803b45a6579ad774119a3c700167924f073a3109f8172f8fea12129c2eb36e914b89eb68cc5a7dc
+DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
+EBUILD ibus-sunpinyin-2.0.4_pre20200306162733.ebuild 2176 BLAKE2B 0d888d6dc8454753b7718dea85bca241a8680d3fea5a452b12d69e3c9e2d4f307783292a49aeb459108d0d390467492c688c1efaedffe8cc0e00d34fa76a8f51 SHA512 765578cd624782d80fd94dd6925b2e43ef44af73c2da19e69b344100e0a49f09a15f6b067b690e1b9ed6b500400d926fee6326af8fbfee6a8195822b37c458f7
 EBUILD ibus-sunpinyin-3.0.0_rc1-r1.ebuild 1331 BLAKE2B afb4525f5edfee440423c10c0412fd9a7d5cb6dc283bbd4cae5413f16e3d892b0e4ee178529b881d9243e9bce0482a65fe4f2f1168b6a21b2e184a5cdba28feb SHA512 915b0c1d6704e5b18a4b931bcb84cfd480f02322c01e74a0246eb7e7dc58e2a4609513889a9a88af7072e5b9361c03975a65e7cae0449deee17bb41f178c843b
-MISC metadata.xml 318 BLAKE2B cd239258d08a95f0d27a760678be36731954a721daae521d147b882fd07eb5206a38ce9ac9938e94e3501611cd95aba5699fb2e5a5176f3652e8e5531e5e4cf8 SHA512 44d76425ce41ba6cb84f584c7dfe3b0552eb65aec93b4ed72f9c2e6c153e5e51a3965bf4248486046d3ca9e39f861c3bcde90424ba35e4a57f2102a24faf0df5
+MISC metadata.xml 420 BLAKE2B d59e5e24e6892f397a61f9b4f9cb3d82ca59a522ad8a82c29fcd9d636f097c0b8257363ae6d6977dafb3894aa8aa5f2f22b7664e4cfd8c79a571f9bf62e55f73 SHA512 ed92e8d756f41ea6618cf6f159a3514739a32344b4a63ab64037083e693d18af37de8747edf6c2f6e9006e4ce60ac128f4dbe36c2ab85801b78cbfe28a753a61
diff --git a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch
new file mode 100644
index 000000000000..25b11f0a8009
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch
@@ -0,0 +1,85 @@
+https://github.com/sunpinyin/sunpinyin/issues/111
+
+--- /wrapper/ibus/setup/main.py
++++ /wrapper/ibus/setup/main.py
+@@ -63,7 +63,7 @@
+ class Logger:
+     @staticmethod
+     def pr(message):
+-        print >> sys.stderr, message
++        print(message, file=sys.stderr)
+ 
+ 
+ class Option(object):
+@@ -73,10 +73,10 @@
+     """
+     config = ibus.Bus().get_config()
+     __wrappers = {
+-        type(True): glib.Variant.new_boolean,
+-        type(1): glib.Variant.new_int32,
+-        type('str'): glib.Variant.new_string,
+-        type([]): glib.Variant.new_strv,
++        bool: glib.Variant.new_boolean,
++        int: glib.Variant.new_int32,
++        str: glib.Variant.new_string,
++        list: glib.Variant.new_strv,
+     }
+ 
+     def __init__(self, name, default):
+@@ -258,7 +258,7 @@
+     def read_config(self):
+         if not self.saved_pairs:
+             self.saved_pairs = self.read()
+-        keys = set([pair.split(':')[0] for pair in self.saved_pairs])
++        keys = {pair.split(':')[0] for pair in self.saved_pairs}
+         for opt in self.options:
+             opt.is_enabled = (opt.key() in keys)
+             # throw away unknown pair
+@@ -445,28 +445,28 @@
+     # TODO: the UI should looks like a virtual keyboard,
+     #       user are allowed to choose the mappings to all punctuation keys.
+     def __init__(self):
+-        mappings = [MappingInfo('togglebutton1', [('`',None), ('~',u'～')]),
++        mappings = [MappingInfo('togglebutton1', [('`', None), ('~', '～')]),
+                     MappingInfo('togglebutton2', []),
+-                    MappingInfo('togglebutton3', [('2',None), ('@',u'＠')]),
+-                    MappingInfo('togglebutton4', [('3',None), ('#',u'＃')]),
+-                    MappingInfo('togglebutton5', [('4',None), ('$',u'¥' )]),
+-                    MappingInfo('togglebutton6', [('5',None), ('%',u'％')]),
+-                    MappingInfo('togglebutton7', [('6',None), ('^',u'…')]),
+-                    MappingInfo('togglebutton8', [('7',None), ('&',u'＆')]),
+-                    MappingInfo('togglebutton9', [('8',None), ('*',u'＊')]),
+-                    MappingInfo('togglebutton10', [('9',None), ('*',u'（')]),
+-                    MappingInfo('togglebutton11', [('0',None), ('*',u'）')]),
+-                    MappingInfo('togglebutton12', [('-',u'－'), ('_',u'——')]),
+-                    MappingInfo('togglebutton13', [('=',u'＝'), ('+',u'＋')]),
+-                    MappingInfo('togglebutton14', [('\\',None), ('|',u'‖')]),
+-                    MappingInfo('togglebutton27', [('[',u'〔'), ('{',u'｛')]),
+-                    MappingInfo('togglebutton28', [(']',u'〕'), ('}',u'｝')]),
++                    MappingInfo('togglebutton3', [('2', None), ('@', '＠')]),
++                    MappingInfo('togglebutton4', [('3', None), ('#', '＃')]),
++                    MappingInfo('togglebutton5', [('4', None), ('$', '¥' )]),
++                    MappingInfo('togglebutton6', [('5', None), ('%', '％')]),
++                    MappingInfo('togglebutton7', [('6', None), ('^', '…')]),
++                    MappingInfo('togglebutton8', [('7', None), ('&', '＆')]),
++                    MappingInfo('togglebutton9', [('8', None), ('*', '＊')]),
++                    MappingInfo('togglebutton10', [('9', None), ('*', '（')]),
++                    MappingInfo('togglebutton11', [('0', None), ('*', '）')]),
++                    MappingInfo('togglebutton12', [('-', '－'), ('_', '——')]),
++                    MappingInfo('togglebutton13', [('=', '＝'), ('+', '＋')]),
++                    MappingInfo('togglebutton14', [('\\', None), ('|', '‖')]),
++                    MappingInfo('togglebutton27', [('[', '〔'), ('{', '｛')]),
++                    MappingInfo('togglebutton28', [(']', '〕'), ('}', '｝')]),
+                     MappingInfo('togglebutton39', []),
+                     MappingInfo('togglebutton40', []),
+-                    MappingInfo('togglebutton50', [(',',None), ('<',u'〈')]),
+-                    MappingInfo('togglebutton51', [('.',u'·'), ('>',u'〉')]),
+-                    MappingInfo('togglebutton52', [('/',u'／'), ('?',None)])]
+-                    #'\'',(u'‘',u'’'),
++                    MappingInfo('togglebutton50', [(',', None), ('<', '〈')]),
++                    MappingInfo('togglebutton51', [('.', '·'), ('>', '〉')]),
++                    MappingInfo('togglebutton52', [('/', '／'), ('?', None)])]
++                    #'\'', ('‘', '’'),
+         MultiCheckDialog.__init__(self, ui_name="punctmapping",
+                                   config_name="General/PunctMapping/Mappings",
+                                   mappings=mappings,
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
new file mode 100644
index 000000000000..a73dd516a5ce
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2009-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+
+inherit python-single-r1 scons-utils toolchain-funcs
+
+MY_PN="sunpinyin"
+MY_P="${MY_PN}-${PV}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin"
+elif [[ "${PV}" == *_pre* ]]; then
+	SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf"
+fi
+
+DESCRIPTION="Chinese SunPinyin engine for IBus"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${MY_P}.tar.gz"
+else
+	SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/v${PV/_/-}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+LICENSE="|| ( CDDL LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+DEPEND="app-i18n/ibus
+	~app-i18n/sunpinyin-${PV}
+	dev-libs/glib:2
+	virtual/libintl"
+RDEPEND="${DEPEND}
+	app-i18n/sunpinyin-data
+	gui? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			app-i18n/ibus[introspection,python,${PYTHON_MULTI_USEDEP}]
+			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		')
+		x11-libs/gtk+:3[introspection]
+	)"
+
+if [[ "${PV}" == *_pre* ]]; then
+	S="${WORKDIR}/${MY_PN}-${SUNPINYIN_GIT_REVISION}"
+elif [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/${MY_PN}-${PV/_/-}"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.4_pre20200306162733-python-3.patch"
+)
+
+src_prepare() {
+	default
+	sed -e "/^exec python /s/python/${EPYTHON}/" -i wrapper/ibus/setup/ibus-setup-sunpinyin.in || die
+
+	if ! use gui; then
+		sed \
+			-e "s:'setup/ibus-setup-sunpinyin'::" \
+			-e "/env\.Alias('install-libexec'/s:, setup_target::" \
+			-i wrapper/ibus/SConstruct || die
+	fi
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	escons -C wrapper/ibus \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--libexecdir="${EPREFIX}/usr/libexec" \
+		--datadir="${EPREFIX}/usr/share"
+}
+
+src_install() {
+	escons -C wrapper/ibus --install-sandbox="${D}" install
+}
diff --git a/app-i18n/ibus-sunpinyin/metadata.xml b/app-i18n/ibus-sunpinyin/metadata.xml
index 271ef4abaa80..db1b8135a9fd 100644
--- a/app-i18n/ibus-sunpinyin/metadata.xml
+++ b/app-i18n/ibus-sunpinyin/metadata.xml
@@ -5,6 +5,9 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<use>
+		<flag name="gui">Install graphical user interface tool (ibus-setup-sunpinyin)</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">sunpinyin/sunpinyin</remote-id>
 	</upstream>