app-i18n/im-freewnn: update to EAPI 6

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
index 5c50e7d3cc403d61b651ccf6855ddef6e03a7500..04bc5f5a3e3d114532f7dc108b3051b6008b723d 100644 (file)
--- a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
+++ b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils gnome2-utils multilib prefix
+EAPI="6"
+
+inherit autotools gnome2-utils ltprune prefix
 
 DESCRIPTION="Japanese FreeWnn input method module for GTK+2"
 HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/"
@@ -13,27 +14,20 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-RDEPEND="
-       dev-libs/glib:2
-       x11-libs/pango
-       >=x11-libs/gtk+-2.4:2
-       >=app-i18n/freewnn-1.1.1_alpha21-r1
-"
+RDEPEND="app-i18n/freewnn
+       x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
-       virtual/pkgconfig
-"
+       sys-devel/gettext
+       virtual/pkgconfig"
 
-pkg_setup() {
-       # An arch specific config directory is used on multilib systems
-       has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-       GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
+PATCHES=(
+       "${FILESDIR}"/${P}-as-needed.patch
+       "${FILESDIR}"/${PN}-headers.patch
+       "${FILESDIR}"/${PN}-wnnenvrc.patch
+)
 
 src_prepare() {
-       epatch "${FILESDIR}"/${PN}-wnnenvrc.patch
-       # bug #298744
-       epatch "${FILESDIR}/${P}-as-needed.patch"
-       epatch "${FILESDIR}"/${PN}-headers.patch
+       default
        eprefixify ${PN}.c
 
        mv configure.{in,ac} || die

diff --git a/app-i18n/im-freewnn/metadata.xml b/app-i18n/im-freewnn/metadata.xml
index c921b96adf6ced372394a69a4687e96d659e0e44..e1a49f498885809fa68430a67d65a8f2a65b1bba 100644 (file)
--- a/app-i18n/im-freewnn/metadata.xml
+++ b/app-i18n/im-freewnn/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-       <email>cjk@gentoo.org</email>
-       <name>Cjk</name>
-</maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>