1 |
commit: bcad7f0bcea8f20982b023f03db4d76bd712e206 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 12 16:00:15 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 12 16:00:15 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcad7f0b |
7 |
|
8 |
app-i18n/ibus-handwrite: update to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
.../ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild | 35 +++++++++++----------- |
13 |
app-i18n/ibus-handwrite/metadata.xml | 14 ++++----- |
14 |
2 files changed, 25 insertions(+), 24 deletions(-) |
15 |
|
16 |
diff --git a/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild b/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild |
17 |
index c06ecaed54b..2f77a8b03ab 100644 |
18 |
--- a/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild |
19 |
+++ b/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild |
20 |
@@ -1,12 +1,11 @@ |
21 |
# Copyright 1999-2017 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI=5 |
25 |
+EAPI="6" |
26 |
|
27 |
-PYTHON_COMPAT=( python2_7 ) |
28 |
-inherit eutils python-single-r1 autotools-utils multilib |
29 |
+inherit autotools |
30 |
|
31 |
-DESCRIPTION="hand write recognition/input using ibus IM engine" |
32 |
+DESCRIPTION="Hand write recognition/input for IBus" |
33 |
HOMEPAGE="https://code.google.com/p/ibus-handwrite/" |
34 |
SRC_URI="https://ibus-handwrite.googlecode.com/files/${P}.tar.bz2" |
35 |
|
36 |
@@ -14,27 +13,29 @@ LICENSE="GPL-3" |
37 |
SLOT="0" |
38 |
KEYWORDS="amd64 x86" |
39 |
IUSE="nls +zinnia" |
40 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
41 |
|
42 |
-RDEPEND="zinnia? ( app-i18n/zinnia app-i18n/zinnia-tomoe ) |
43 |
- >=app-i18n/ibus-1.3.0 |
44 |
- >=x11-libs/gtk+-2.10:2 |
45 |
+RDEPEND="app-i18n/ibus |
46 |
+ x11-libs/gtk+:2 |
47 |
x11-libs/gtkglext |
48 |
- ${PYTHON_DEPS}" |
49 |
+ nls? ( virtual/libintl ) |
50 |
+ zinnia? ( |
51 |
+ app-i18n/zinnia |
52 |
+ app-i18n/zinnia-tomoe |
53 |
+ )" |
54 |
DEPEND="${RDEPEND} |
55 |
- virtual/pkgconfig" |
56 |
+ virtual/pkgconfig |
57 |
+ nls? ( sys-devel/gettext )" |
58 |
|
59 |
-DOCS=( AUTHORS ChangeLog NEWS README ) |
60 |
+PATCHES=( "${FILESDIR}"/${PN}-link.patch ) |
61 |
|
62 |
src_prepare() { |
63 |
- epatch "${FILESDIR}"/${PN}-link.patch #bug #501954 |
64 |
+ default |
65 |
+ eautoreconf |
66 |
} |
67 |
|
68 |
src_configure() { |
69 |
- local myeconfargs=( |
70 |
- $(use_enable nls) |
71 |
- $(use_enable zinnia) |
72 |
+ econf \ |
73 |
+ $(use_enable nls) \ |
74 |
+ $(use_enable zinnia) \ |
75 |
$(use_with zinnia zinnia-tomoe "${EPREFIX}"/usr/$(get_libdir)/zinnia/model/tomoe) |
76 |
- ) |
77 |
- autotools-utils_src_configure |
78 |
} |
79 |
|
80 |
diff --git a/app-i18n/ibus-handwrite/metadata.xml b/app-i18n/ibus-handwrite/metadata.xml |
81 |
index 37f9895979f..23f5c6be388 100644 |
82 |
--- a/app-i18n/ibus-handwrite/metadata.xml |
83 |
+++ b/app-i18n/ibus-handwrite/metadata.xml |
84 |
@@ -1,11 +1,11 @@ |
85 |
<?xml version="1.0" encoding="UTF-8"?> |
86 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
87 |
<pkgmetadata> |
88 |
- <maintainer type="project"> |
89 |
- <email>cjk@g.o</email> |
90 |
- <name>Cjk</name> |
91 |
- </maintainer> |
92 |
-<use> |
93 |
- <flag name="zinnia">Build with <pkg>app-i18n/zinnia</pkg> engine.</flag> |
94 |
-</use> |
95 |
+ <maintainer type="project"> |
96 |
+ <email>cjk@g.o</email> |
97 |
+ <name>Cjk</name> |
98 |
+ </maintainer> |
99 |
+ <use> |
100 |
+ <flag name="zinnia">Enable support for <pkg>app-i18n/zinnia</pkg></flag> |
101 |
+ </use> |
102 |
</pkgmetadata> |