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

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
index 5883a554f0fba174f934cf663dbb7b3567fc4ae4..813a0ff4abb715a193689f8597bee017472b5e63 100644 (file)
--- a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit eutils
+EAPI="6"
 
-DESCRIPTION="Vietnamese Input Method Engine for IBUS using Unikey IME"
-HOMEPAGE="https://code.google.com/p/ibus-unikey/"
+DESCRIPTION="Vietnamese UniKey engine for IBus"
+HOMEPAGE="https://code.google.com/p/ibus-unikey"
 SRC_URI="https://ibus-unikey.googlecode.com/files/${P}.tar.gz
        https://dev.gentoo.org/~dlan/distfiles/${P}-gcc6.patch"
 
@@ -14,21 +13,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk3"
 
-RDEPEND="gtk3? ( >app-i18n/ibus-1.4.0[gtk]
-               x11-libs/gtk+:3 )
-       !gtk3? ( >=app-i18n/ibus-1.4.0[gtk2]
-               >=x11-libs/gtk+-2.12:2 )
-       x11-libs/libX11"
+RDEPEND="app-i18n/ibus
+       x11-libs/libX11
+       virtual/libintl
+       gtk3? ( x11-libs/gtk+:3 )
+       !gtk3? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
        dev-util/intltool
-       >=sys-devel/gettext-0.17"
+       sys-devel/gettext"
 
-src_prepare() {
-       epatch "${DISTDIR}"/${P}-gcc6.patch
-}
+PATCHES=( "${DISTDIR}"/${P}-gcc6.patch )
 
 src_configure() {
-       use gtk3 && myconf="--with-gtk-version=3" || myconf=""
-       econf ${myconf}
+       econf --with-gtk-version=$(usex gtk3 3 2)
 }

diff --git a/app-i18n/ibus-unikey/metadata.xml b/app-i18n/ibus-unikey/metadata.xml
index 4394e73cdefeab5f24c8861ba4c3715abf540ab1..617c95b63813598f28a8a5f1cc01a4f6eb7fb989 100644 (file)
--- a/app-i18n/ibus-unikey/metadata.xml
+++ b/app-i18n/ibus-unikey/metadata.xml
@@ -1,17 +1,18 @@
 <?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>
-       <longdescription lang="en">Ibus-unikey is a IM Engine for IBus
-Use for type Vietnamese
-Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85</longdescription>
-       <use>
-               <flag name="gtk3">Enable support for gtk+3</flag>
-       </use>
-       <upstream>
-               <remote-id type="google-code">ibus-unikey</remote-id>
-       </upstream>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <longdescription lang="en">
+    The UniKey engine for IBus. It provides a Vietnamese input method using
+    UniKey. Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85
+  </longdescription>
+  <use>
+    <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+  </use>
+  <upstream>
+    <remote-id type="google-code">ibus-unikey</remote-id>
+  </upstream>
 </pkgmetadata>