From 28e3d252dc8ac8a5635206dfefe1cfe05058d1db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Aug 2018 06:32:46 +0100 Subject: gentoo resync : 12.08.2018 --- app-i18n/ibus-sunpinyin/Manifest | 7 +-- .../files/ibus-sunpinyin-python3.patch | 16 +++++++ .../ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild | 49 --------------------- .../ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild | 51 ++++++++++++++++++++++ app-i18n/ibus-sunpinyin/metadata.xml | 2 +- 5 files changed, 72 insertions(+), 53 deletions(-) create mode 100644 app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-python3.patch delete mode 100644 app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild create mode 100644 app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild (limited to 'app-i18n/ibus-sunpinyin') diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest index 1599e95fe5d7..7a4ce9315f92 100644 --- a/app-i18n/ibus-sunpinyin/Manifest +++ b/app-i18n/ibus-sunpinyin/Manifest @@ -1,3 +1,4 @@ -DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2 -EBUILD ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild 1080 BLAKE2B 4403780f922c47cdda854d49666869696e88b6641af9db951c62eef14fba97acf824761bee5485c1e1075ce43ae17bce1174a63d9d13d136bbc11d699a9d0b56 SHA512 e76aefc9199e00ced36d430bf40b82dcdd44de91786a6283f7712efd7fe0c505ba71b5744b427226b38555e989867ec57a918b0069112be83b2ecc7079922577 -MISC metadata.xml 313 BLAKE2B e3d71fcea434a51c92b8194791283c33981d3c4b44bda0df1e70b561517c228daebdc713327171192e1523b7ac2f91116a030bb729eb143606810e6ef5522ce4 SHA512 61d943d4f8b8ab912ced89b69be51ad2792ba67672e969f4e32fba373f7133181c1080ba9a2603e3f7623ebac42e32eb3e0e429d66846ab4c7e13afbc0b05974 +AUX ibus-sunpinyin-python3.patch 388 BLAKE2B 35131840c58bc47980dbbe046723217afb8926f61de601d664524b961c80f718753e41a82b7cdcd8b137d71c97ad84b91a3b71677610b2f369f9be2da2582185 SHA512 90c7d08588e996e7df966f9ee4b3b044a038392a0f3f074f4803b45a6579ad774119a3c700167924f073a3109f8172f8fea12129c2eb36e914b89eb68cc5a7dc +DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e +EBUILD ibus-sunpinyin-3.0.0_rc1.ebuild 1287 BLAKE2B aa4e01e681c5bedcbb6e5502bfd5c1868293dd0223fd7f1ada3ad03eababd4311e651a88f6c0af854fef1517fc9a978da2554220d0361d35e18f1ab5f2990c30 SHA512 76a496271a1c0078fde67c988b418fd67316901266062d265af124182fb7ade521fee0eae33973fbb4353442f36cb384b4163577558fa515854d8289d13cb704 +MISC metadata.xml 318 BLAKE2B cd239258d08a95f0d27a760678be36731954a721daae521d147b882fd07eb5206a38ce9ac9938e94e3501611cd95aba5699fb2e5a5176f3652e8e5531e5e4cf8 SHA512 44d76425ce41ba6cb84f584c7dfe3b0552eb65aec93b4ed72f9c2e6c153e5e51a3965bf4248486046d3ca9e39f861c3bcde90424ba35e4a57f2102a24faf0df5 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 000000000000..07f4699680ef --- /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-2.0.4_pre20130108-r2.ebuild deleted file mode 100644 index 77a59d469623..000000000000 --- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit python-single-r1 scons-utils toolchain-funcs - -DESCRIPTION="The SunPinYin IMEngine for IBus Framework" -HOMEPAGE="https://sunpinyin.googlecode.com/" -SRC_URI="https://dev.gentoo.org/~jstein/dist/sunpinyin-${PV}.tar.xz" - -LICENSE="LGPL-2.1 CDDL" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+nls" - -RDEPEND="${PYTHON_DEPS} - app-i18n/ibus[python,${PYTHON_USEDEP}] - ~app-i18n/sunpinyin-${PV}:= - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -src_unpack() { - default - mv "${WORKDIR}/sunpinyin-${PV}" "${S}" || die -} - -src_prepare() { - sed -i -e "s/python/${EPYTHON}/" wrapper/ibus/setup/ibus-setup-sunpinyin.in || die -} - -src_configure() { - tc-export CXX - myesconsargs=( - --prefix="${EPREFIX}"/usr - --libexecdir="${EPREFIX}"/usr/libexec - ) -} - -src_compile() { - escons -C wrapper/ibus -} - -src_install() { - escons -C wrapper/ibus --install-sandbox="${ED}" install -} diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild new file mode 100644 index 000000000000..695603734e1d --- /dev/null +++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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="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} + app-i18n/ibus[python,${PYTHON_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 +} diff --git a/app-i18n/ibus-sunpinyin/metadata.xml b/app-i18n/ibus-sunpinyin/metadata.xml index 583f6476f8be..271ef4abaa80 100644 --- a/app-i18n/ibus-sunpinyin/metadata.xml +++ b/app-i18n/ibus-sunpinyin/metadata.xml @@ -6,6 +6,6 @@ Cjk - sunpinyin + sunpinyin/sunpinyin -- cgit v1.2.3