commit: 8cef23d172c3714c629a31b8aff53ea016b20e55 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Tue Aug 1 13:08:57 2017 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Tue Aug 1 13:08:57 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cef23d1
app-i18n/ibus-anthy: update to EAPI 6 Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-i18n/ibus-anthy/Manifest | 1 - app-i18n/ibus-anthy/ibus-anthy-1.5.4.ebuild | 45 ++++++++++++----------------- app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild | 28 ++++++++++-------- app-i18n/ibus-anthy/metadata.xml | 26 +++++++++-------- 4 files changed, 49 insertions(+), 51 deletions(-) diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest index 65bd6f14fda..c9314cd67bf 100644 --- a/app-i18n/ibus-anthy/Manifest +++ b/app-i18n/ibus-anthy/Manifest @@ -1,3 +1,2 @@ -DIST anthy.i 3170 SHA256 3615639f5cd9bf2adcbc2bac8d3ae968646df1d9d2ba987d80442d5ad99ecdf9 SHA512 400d67c2f0ffbdb3eab241646922d549ec4a42ae5b33714a91b864f4b5dfdf0d9a0d28cb6dcdffa55eb9633651ceae034bb547d7a5c41d9b8d352e955773e069 WHIRLPOOL 9be409df613530658c68bc7491e1dd258f5f1ef1d09895a3557a9e63c3ced5083c1ecd9e274536c9afbc98031c353c05c73304bb4354aaf8e21a1c15de39b8b6 DIST ibus-anthy-1.5.4.tar.gz 592595 SHA256 4c0a8b88a2c547e72173a7d682d82797f6c65fe712abe5f3b89495d4eec7b031 SHA512 8478e9ea14472d0153cc7a35feae4edea791476dc98cfc266b598f915376d267bd5db48ea0a676209d7a6fa680628116a30fec59afaf696477cfaa14082aad8d WHIRLPOOL f4aec300dc5cff62f81a3ae64ac2d46768e3fbaa579e14abac8bd87e0801155e8258f6f3d66d7015122e929cd2e0f48183aeb37245b3046afa3d80b8ce42d58c DIST ibus-anthy-1.5.9.tar.gz 765672 SHA256 ddf0c52ef769c79cf04ceea8860b4bec54d681b7537db39730e6d67c06721af9 SHA512 2f57db784ddbd4ea57afba245dc532fe4ee8c9fea5fc7df9b3ca26600816ef4c0626b4ebdbbd976826c391890216af587863707caa26c3926a6278cc6b720ef6 WHIRLPOOL 990b15bad9ed2089f7ee6a4b807dabf9001f184a935aeec40ce12f2fa0b9449c55b087444873684b7be2c41ef13f0faa5035913e458707c716df89a7762f2075 diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.4.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.4.ebuild index 2676374983b..6d49cad2552 100644 --- a/app-i18n/ibus-anthy/ibus-anthy-1.5.4.ebuild +++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.4.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI="6" PYTHON_COMPAT=( python2_7 ) -inherit eutils python-single-r1 autotools gnome2-utils -DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework" +inherit gnome2-utils ltprune python-single-r1 + +DESCRIPTION="Japanese Anthy engine for IBus" HOMEPAGE="https://github.com/ibus/ibus/wiki"; -SRC_URI="https://ibus.googlecode.com/files/${P}.tar.gz - https://raw.github.com/ibus/ibus-anthy/${PV}/engine/anthy.i"; +SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" @@ -17,34 +17,27 @@ IUSE="deprecated nls" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - >=app-i18n/ibus-1.5.0 app-i18n/anthy - deprecated? ( >=dev-python/pygtk-2.15.2 ) + app-i18n/ibus[python(+),${PYTHON_USEDEP}] + deprecated? ( dev-python/pygtk ) nls? ( virtual/libintl )" DEPEND="${RDEPEND} - dev-libs/gobject-introspection dev-util/intltool virtual/pkgconfig deprecated? ( dev-lang/swig ) - nls? ( >=sys-devel/gettext-0.16.1 )" - -src_prepare() { - >py-compile #397497 - cp "${DISTDIR}"/anthy.i "${S}"/engine # deal with packaging bug -} + nls? ( sys-devel/gettext )" src_configure() { - econf --enable-private-png \ + econf \ $(use_enable deprecated pygtk2-anthy) \ - $(use_enable nls) + $(use_enable nls) \ + --enable-private-png \ + --with-layout=default } src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS ChangeLog NEWS README - - find "${ED}" -name '*.la' -type f -delete || die + default + prune_libtool_files --modules python_optimize } @@ -54,11 +47,11 @@ pkg_preinst() { } pkg_postinst() { - elog - elog "app-dicts/kasumi is not required but probably useful for you." - elog - elog "# emerge app-dicts/kasumi" - elog + gnome2_icon_cache_update + + if ! has_version app-dicts/kasumi; then + elog "app-dicts/kasumi is not required but probably useful for you." + fi } pkg_postrm() { diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild index 8eedc823baf..b9ed07ae1ce 100644 --- a/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild +++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild @@ -1,15 +1,14 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - +EAPI="6" PYTHON_COMPAT=( python2_7 ) -inherit gnome2-utils python-single-r1 +inherit gnome2-utils ltprune python-single-r1 -DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework" +DESCRIPTION="Japanese Anthy engine for IBus" HOMEPAGE="https://github.com/ibus/ibus/wiki"; -SRC_URI="https://github.com/ibus/ibus-anthy/releases/download/${PV}/${P}.tar.gz"; +SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" @@ -19,24 +18,26 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} app-i18n/anthy - app-i18n/ibus[introspection] - nls? ( virtual/libintl:0= )" - + app-i18n/ibus[python(+),${PYTHON_USEDEP}] + nls? ( virtual/libintl )" DEPEND="${RDEPEND} - dev-libs/gobject-introspection dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )" src_configure() { econf \ + $(use_enable nls) \ --enable-private-png \ - $(use_enable nls) + --with-layout=default \ + --with-python=${EPYTHON} } src_install() { default - find "${ED}" -name '*.la' -type f -delete || die + prune_libtool_files --modules + + python_optimize } pkg_preinst() { @@ -44,8 +45,11 @@ pkg_preinst() { } pkg_postinst() { - elog "app-dicts/kasumi is not required but probably useful for you." gnome2_icon_cache_update + + if ! has_version app-dicts/kasumi; then + elog "app-dicts/kasumi is not required but probably useful for you." + fi } pkg_postrm() { diff --git a/app-i18n/ibus-anthy/metadata.xml b/app-i18n/ibus-anthy/metadata.xml index 0ae1c4a28ec..9cf1079f1ff 100644 --- a/app-i18n/ibus-anthy/metadata.xml +++ b/app-i18n/ibus-anthy/metadata.xml @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Cjk</name> - </maintainer> - <longdescription lang="en">The Anthy engine for IBus platform. It provides Japanese input method from -libanthy.</longdescription> - <upstream> - <remote-id type="github">ibus/ibus</remote-id> - </upstream> - <use> - <flag name="deprecated">Install deprecated pygtk2 library</flag> - </use> + <maintainer type="project"> + <email>[email protected]</email> + <name>Cjk</name> + </maintainer> + <longdescription lang="en"> + The Anthy engine for IBus. It provides Japanese input method from + <pkg>app-i18n/anthy</pkg>. + </longdescription> + <upstream> + <remote-id type="github">ibus/ibus-anthy</remote-id> + </upstream> + <use> + <flag name="deprecated">Install deprecated pygtk2 library</flag> + </use> </pkgmetadata>
