commit: 85b1e0a554a699df3186db2754741c00f7ea013f Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Thu Jul 20 14:49:24 2017 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Thu Jul 20 15:04:10 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85b1e0a5
app-i18n/ibus-m17n: update to EAPI 6 Gentoo-Bug: 621940 Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild | 32 +++++++++--------------------- app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild | 33 +++++++++---------------------- app-i18n/ibus-m17n/metadata.xml | 3 +-- 3 files changed, 19 insertions(+), 49 deletions(-) diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild index 1d601030eb3..dc763ec9608 100644 --- a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild +++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="3" +EAPI="6" DESCRIPTION="The M17N engine IMEngine for IBus Framework" HOMEPAGE="https://github.com/ibus/ibus/wiki"; @@ -12,34 +12,20 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="gtk nls" -RDEPEND=">=app-i18n/ibus-1.3 - gtk? ( >=x11-libs/gtk+-2.12.12:2 ) +CDEPEND="app-i18n/ibus dev-libs/m17n-lib + gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/gettext-0.16.1" -RDEPEND="${RDEPEND} +RDEPEND="${CDEPEND} dev-db/m17n-db dev-db/m17n-contrib" -# gtk? ( -# || ( -# >=x11-libs/gtk+-2.90.5:3 -# >=x11-libs/gtk+-2.12.12:2 -# ) -# ) +DEPEND="${CDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" src_configure() { - local myconf - econf \ - $(use_with gtk gtk 2.0) \ $(use_enable nls) \ - ${myconf} || die -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc AUTHORS ChangeLog NEWS README || die + $(use_with gtk gtk 2.0) } diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild index 4b13f2869f9..8979852a197 100644 --- a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild +++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="3" +EAPI="6" DESCRIPTION="The M17N engine IMEngine for IBus Framework" HOMEPAGE="https://github.com/ibus/ibus/wiki"; @@ -12,35 +12,20 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="gtk nls" -RDEPEND=">=app-i18n/ibus-1.3.99.20110817 - dev-libs/libxml2 - gtk? ( >=x11-libs/gtk+-2.12.12:2 ) +CDEPEND="app-i18n/ibus dev-libs/m17n-lib + gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/gettext-0.16.1" -RDEPEND="${RDEPEND} +RDEPEND="${CDEPEND} dev-db/m17n-db dev-db/m17n-contrib" -# gtk? ( -# || ( -# >=x11-libs/gtk+-2.90.5:3 -# >=x11-libs/gtk+-2.12.12:2 -# ) -# ) +DEPEND="${CDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" src_configure() { - local myconf - econf \ - $(use_with gtk gtk 2.0) \ $(use_enable nls) \ - ${myconf} || die -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc AUTHORS ChangeLog NEWS README || die + $(use_with gtk gtk 2.0) } diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml index a5db7b7107e..cd556d26d1a 100644 --- a/app-i18n/ibus-m17n/metadata.xml +++ b/app-i18n/ibus-m17n/metadata.xml @@ -15,8 +15,7 @@ </upstream> <use> <flag name="gtk"> - Build the preference interfaces, based on - <pkg>x11-libs/gtk+</pkg> (GTK+ 2). + Build the preference interfaces, based on <pkg>x11-libs/gtk+</pkg>:2 </flag> </use> </pkgmetadata>
