| 1 |
commit: 58514445b4bd22e224c7939f414c19364c435c5b |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 12 14:33:08 2017 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 12 14:38:50 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58514445 |
| 7 |
|
| 8 |
app-i18n/ibus-unikey: update to EAPI 6 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild | 26 ++++++++++------------- |
| 13 |
app-i18n/ibus-unikey/metadata.xml | 27 ++++++++++++------------ |
| 14 |
2 files changed, 25 insertions(+), 28 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
index 5883a554f0f..813a0ff4abb 100644 |
| 18 |
--- a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild |
| 19 |
+++ b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild |
| 20 |
@@ -1,11 +1,10 @@ |
| 21 |
# Copyright 1999-2017 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI="5" |
| 25 |
-inherit eutils |
| 26 |
+EAPI="6" |
| 27 |
|
| 28 |
-DESCRIPTION="Vietnamese Input Method Engine for IBUS using Unikey IME" |
| 29 |
-HOMEPAGE="https://code.google.com/p/ibus-unikey/" |
| 30 |
+DESCRIPTION="Vietnamese UniKey engine for IBus" |
| 31 |
+HOMEPAGE="https://code.google.com/p/ibus-unikey" |
| 32 |
SRC_URI="https://ibus-unikey.googlecode.com/files/${P}.tar.gz |
| 33 |
https://dev.gentoo.org/~dlan/distfiles/${P}-gcc6.patch" |
| 34 |
|
| 35 |
@@ -14,21 +13,18 @@ SLOT="0" |
| 36 |
KEYWORDS="~amd64 ~x86" |
| 37 |
IUSE="gtk3" |
| 38 |
|
| 39 |
-RDEPEND="gtk3? ( >app-i18n/ibus-1.4.0[gtk] |
| 40 |
- x11-libs/gtk+:3 ) |
| 41 |
- !gtk3? ( >=app-i18n/ibus-1.4.0[gtk2] |
| 42 |
- >=x11-libs/gtk+-2.12:2 ) |
| 43 |
- x11-libs/libX11" |
| 44 |
+RDEPEND="app-i18n/ibus |
| 45 |
+ x11-libs/libX11 |
| 46 |
+ virtual/libintl |
| 47 |
+ gtk3? ( x11-libs/gtk+:3 ) |
| 48 |
+ !gtk3? ( x11-libs/gtk+:2 )" |
| 49 |
DEPEND="${RDEPEND} |
| 50 |
virtual/pkgconfig |
| 51 |
dev-util/intltool |
| 52 |
- >=sys-devel/gettext-0.17" |
| 53 |
+ sys-devel/gettext" |
| 54 |
|
| 55 |
-src_prepare() { |
| 56 |
- epatch "${DISTDIR}"/${P}-gcc6.patch |
| 57 |
-} |
| 58 |
+PATCHES=( "${DISTDIR}"/${P}-gcc6.patch ) |
| 59 |
|
| 60 |
src_configure() { |
| 61 |
- use gtk3 && myconf="--with-gtk-version=3" || myconf="" |
| 62 |
- econf ${myconf} |
| 63 |
+ econf --with-gtk-version=$(usex gtk3 3 2) |
| 64 |
} |
| 65 |
|
| 66 |
diff --git a/app-i18n/ibus-unikey/metadata.xml b/app-i18n/ibus-unikey/metadata.xml |
| 67 |
index 4394e73cdef..617c95b6381 100644 |
| 68 |
--- a/app-i18n/ibus-unikey/metadata.xml |
| 69 |
+++ b/app-i18n/ibus-unikey/metadata.xml |
| 70 |
@@ -1,17 +1,18 @@ |
| 71 |
<?xml version="1.0" encoding="UTF-8"?> |
| 72 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 73 |
<pkgmetadata> |
| 74 |
- <maintainer type="project"> |
| 75 |
- <email>cjk@g.o</email> |
| 76 |
- <name>Cjk</name> |
| 77 |
- </maintainer> |
| 78 |
- <longdescription lang="en">Ibus-unikey is a IM Engine for IBus |
| 79 |
-Use for type Vietnamese |
| 80 |
-Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85</longdescription> |
| 81 |
- <use> |
| 82 |
- <flag name="gtk3">Enable support for gtk+3</flag> |
| 83 |
- </use> |
| 84 |
- <upstream> |
| 85 |
- <remote-id type="google-code">ibus-unikey</remote-id> |
| 86 |
- </upstream> |
| 87 |
+ <maintainer type="project"> |
| 88 |
+ <email>cjk@g.o</email> |
| 89 |
+ <name>Cjk</name> |
| 90 |
+ </maintainer> |
| 91 |
+ <longdescription lang="en"> |
| 92 |
+ The UniKey engine for IBus. It provides a Vietnamese input method using |
| 93 |
+ UniKey. Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85 |
| 94 |
+ </longdescription> |
| 95 |
+ <use> |
| 96 |
+ <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag> |
| 97 |
+ </use> |
| 98 |
+ <upstream> |
| 99 |
+ <remote-id type="google-code">ibus-unikey</remote-id> |
| 100 |
+ </upstream> |
| 101 |
</pkgmetadata> |
Archives