app-i18n/ibus-m17n: update to EAPI 6

Gentoo-Bug: 621940

Package-Manager: Portage-2.3.6, Repoman-2.3.1

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 1d601030eb3e764a751fce163ecf4f6e997ff304..dc763ec9608181cd66a621608612cf40263ec3f0 100644 (file)
--- 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 4b13f2869f9fe6185560da7c349200987d5610ae..8979852a197b2b196fd80d900bf49fbff8c04f49 100644 (file)
--- 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 a5db7b7107e23ab8ab3d47672c768f2342306bd9..cd556d26d1a680ac610a174fd17fc02c4dcf85ef 100644 (file)
--- 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>