gentoo resync : 25.11.2020

4 files changed, 2 insertions, 74 deletions

diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index ee8c544ae091..7f981aabba9e 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1,7 +1,4 @@
 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
+EBUILD ibus-sunpinyin-2.0.4_pre20200306162733.ebuild 2180 BLAKE2B d2c7cc069013764e681d2dd560d933432a975860f751074800ef840b5591f4d9ec046565b57767b70b2f31076f6910eb09143fa4810c012dedf571f76bcf45d4 SHA512 09a8092c2e4e15e80f1943a342e62a0388c27115c61926fb6a6893c0b727e824226cc6ed8876a621dc95ce40dc1b2f7e00e468226f40699ef362db7c27a93378
 MISC metadata.xml 420 BLAKE2B d59e5e24e6892f397a61f9b4f9cb3d82ca59a522ad8a82c29fcd9d636f097c0b8257363ae6d6977dafb3894aa8aa5f2f22b7664e4cfd8c79a571f9bf62e55f73 SHA512 ed92e8d756f41ea6618cf6f159a3514739a32344b4a63ab64037083e693d18af37de8747edf6c2f6e9006e4ce60ac128f4dbe36c2ab85801b78cbfe28a753a61
diff --git a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-python3.patch b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-python3.patch
deleted file mode 100644
index 07f4699680ef..000000000000
--- a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-python3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/wrapper/ibus/setup/main.py
-+++ b/wrapper/ibus/setup/main.py
-@@ -37,8 +37,11 @@
- import sys
- import os
- from os import path
--import gtk
--import ibus
-+from gi import require_version as gi_require_version
-+gi_require_version('Gtk', '3.0')
-+gi_require_version('IBus', '1.0')
-+from gi.repository import Gtk as gtk
-+from gi.repository import IBus as ibus
- import gettext
- import locale
- 
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
index a73dd516a5ce..faabcbdc3751 100644
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 
 inherit python-single-r1 scons-utils toolchain-funcs
 
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild
deleted file mode 100644
index 6037fa22fe86..000000000000
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PLOCALES="zh_CN"
-PYTHON_COMPAT=( python2_7 )
-
-inherit l10n python-single-r1 scons-utils toolchain-funcs vcs-snapshot
-
-MY_P="${P#*-}"
-
-DESCRIPTION="Chinese SunPinyin engine for IBus"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-SRC_URI="https://github.com/${PN#*-}/${PN#*-}/archive/v${PV/_rc/-rc}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-	')
-	~app-i18n/sunpinyin-${PV}:=
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-python3.patch )
-
-src_prepare() {
-	sed -i "/^locales/s/'.*'/$(l10n_get_locales | sed "s/\([^[:space:]]\+\)/\'\1\',/g")/" wrapper/ibus/SConstruct
-	sed -i "s/python/${EPYTHON}/" wrapper/ibus/setup/${PN/-/-setup-}.in
-
-	default
-	tc-export CXX
-}
-
-src_compile() {
-	escons -C wrapper/ibus \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--libexecdir="${EPREFIX}"/usr/libexec
-}
-
-src_install() {
-	escons -C wrapper/ibus --install-sandbox="${D}" install
-	dodoc wrapper/ibus/README
-}