[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-sunpinyin/files/, app-i18n/ibus-sunpinyin/

["Akinori Hattori" <hattya@gentoo.org>]

commit:     dc24cff689054f4d8b965117002f4e7082849bff
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  9 13:23:06 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Aug  9 13:23:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc24cff6

app-i18n/ibus-sunpinyin: new upstream release

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/ibus-sunpinyin/Manifest                         |  2 +-
 .../ibus-sunpinyin/files/ibus-sunpinyin-python3.patch    | 16 ++++++++++++++++
 ...0130108-r2.ebuild => ibus-sunpinyin-3.0.0_rc1.ebuild} | 10 +++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index d42f82335ff..016fef2a715 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1 +1 @@
-DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
+DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e

diff --git a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-python3.patch b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-python3.patch
new file mode 100644
index 00000000000..07f4699680e
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-python3.patch
@@ -0,0 +1,16 @@
+--- 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_pre20130108-r2.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
similarity index 80%
rename from app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild
rename to app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
index e9553afe6cd..695603734e1 100644
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
@@ -5,11 +5,13 @@ EAPI="6"
 PLOCALES="zh_CN"
 PYTHON_COMPAT=( python2_7 )
 
-inherit l10n python-single-r1 scons-utils toolchain-funcs
+inherit l10n python-single-r1 scons-utils toolchain-funcs vcs-snapshot
+
+MY_P="${P#*-}"
 
 DESCRIPTION="SunPinyin engine for IBus"
 HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-SRC_URI="https://dev.gentoo.org/~jstein/dist/sunpinyin-${PV}.tar.xz"
+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"
@@ -24,7 +26,9 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
-S="${WORKDIR}/${P#*-}"
+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