1 |
commit: 9aca2a1681207b1e96d49a233c4309cf777e9913 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 5 13:59:07 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 5 14:04:41 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aca2a16 |
7 |
|
8 |
app-i18n/ibus-qt: update to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild | 49 +++++++++++++++++------------------ |
13 |
app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild | 36 ++++++++++++------------- |
14 |
app-i18n/ibus-qt/metadata.xml | 7 +++-- |
15 |
3 files changed, 44 insertions(+), 48 deletions(-) |
16 |
|
17 |
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild |
18 |
index e83c2b1b568..848efda5893 100644 |
19 |
--- a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild |
20 |
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild |
21 |
@@ -1,10 +1,12 @@ |
22 |
# Copyright 1999-2017 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
-EAPI="5" |
26 |
-inherit cmake-utils eutils multilib |
27 |
+EAPI="6" |
28 |
+ |
29 |
+inherit cmake-utils |
30 |
|
31 |
MY_P="${P}-Source" |
32 |
+ |
33 |
DESCRIPTION="Qt IBus library and Qt input method plugin" |
34 |
HOMEPAGE="https://github.com/ibus/ibus/wiki" |
35 |
SRC_URI="https://ibus.googlecode.com/files/${MY_P}.tar.gz" |
36 |
@@ -14,46 +16,43 @@ SLOT="0" |
37 |
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" |
38 |
IUSE="doc" |
39 |
|
40 |
-RDEPEND=">=app-i18n/ibus-1.3.7 |
41 |
- >=sys-apps/dbus-1.2 |
42 |
- x11-libs/libX11 |
43 |
- >=dev-qt/qtcore-4.5:4 |
44 |
- >=dev-qt/qtdbus-4.5:4" |
45 |
+RDEPEND="app-i18n/ibus |
46 |
+ dev-libs/icu:= |
47 |
+ dev-qt/qtcore:4 |
48 |
+ dev-qt/qtdbus:4 |
49 |
+ sys-apps/dbus |
50 |
+ x11-libs/libX11" |
51 |
DEPEND="${RDEPEND} |
52 |
- >=dev-libs/icu-4:= |
53 |
- dev-util/cmake |
54 |
virtual/pkgconfig |
55 |
doc? ( app-doc/doxygen )" |
56 |
- |
57 |
S="${WORKDIR}/${MY_P}" |
58 |
|
59 |
-DOCS="AUTHORS README TODO" |
60 |
+PATCHES=( |
61 |
+ "${FILESDIR}"/${PN}-1.2.0.20091217-doc.patch |
62 |
+ "${FILESDIR}"/${P}-display-unset.patch |
63 |
+ "${FILESDIR}"/${P}-gold.patch |
64 |
+ "${FILESDIR}"/${P}-qvariant.patch |
65 |
+) |
66 |
|
67 |
src_configure() { |
68 |
- local mycmakeargs=( -DLIBDIR=$(get_libdir) -DDOCDIR=${EPREFIX}/usr/share/doc/${PF} all ) |
69 |
- |
70 |
+ local mycmakeargs=( |
71 |
+ -DLIBDIR=$(get_libdir) |
72 |
+ -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF} |
73 |
+ ) |
74 |
cmake-utils_src_configure |
75 |
} |
76 |
|
77 |
-src_prepare() { |
78 |
- epatch "${FILESDIR}/${PN}-1.2.0.20091217-doc.patch" \ |
79 |
- "${FILESDIR}"/${P}-display-unset.patch \ |
80 |
- "${FILESDIR}"/${P}-gold.patch \ |
81 |
- "${FILESDIR}"/${P}-qvariant.patch |
82 |
-} |
83 |
- |
84 |
src_compile() { |
85 |
cmake-utils_src_compile |
86 |
|
87 |
- if use doc ; then |
88 |
- cd "${CMAKE_BUILD_DIR}" |
89 |
- emake docs || die |
90 |
+ if use doc; then |
91 |
+ emake -C "${BUILD_DIR}" docs |
92 |
fi |
93 |
} |
94 |
|
95 |
src_install() { |
96 |
- if use doc ; then |
97 |
- HTML_DOCS="${CMAKE_BUILD_DIR}/docs/html/*" |
98 |
+ if use doc; then |
99 |
+ HTML_DOCS=( "${BUILD_DIR}"/docs/html/. ) |
100 |
fi |
101 |
|
102 |
cmake-utils_src_install |
103 |
|
104 |
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild |
105 |
index d8f08b8ea1d..a990fbc5aab 100644 |
106 |
--- a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild |
107 |
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild |
108 |
@@ -1,51 +1,49 @@ |
109 |
# Copyright 1999-2017 Gentoo Foundation |
110 |
# Distributed under the terms of the GNU General Public License v2 |
111 |
|
112 |
-EAPI="5" |
113 |
-inherit cmake-utils eutils multilib |
114 |
+EAPI="6" |
115 |
+ |
116 |
+inherit cmake-utils |
117 |
|
118 |
DESCRIPTION="Qt IBus library and Qt input method plugin" |
119 |
HOMEPAGE="https://github.com/ibus/ibus/wiki" |
120 |
-SRC_URI="https://github.com/ibus/ibus-qt/archive/${PV}.tar.gz -> ${P}.tar.gz" |
121 |
+SRC_URI="https://github.com/ibus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
122 |
|
123 |
LICENSE="GPL-2" |
124 |
SLOT="0" |
125 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
126 |
IUSE="doc" |
127 |
|
128 |
-RDEPEND=">=app-i18n/ibus-1.3.7 |
129 |
- >=sys-apps/dbus-1.2 |
130 |
- x11-libs/libX11 |
131 |
- >=dev-qt/qtcore-4.5:4 |
132 |
- >=dev-qt/qtdbus-4.5:4" |
133 |
+RDEPEND="app-i18n/ibus |
134 |
+ dev-libs/icu:= |
135 |
+ dev-qt/qtcore:4 |
136 |
+ dev-qt/qtdbus:4 |
137 |
+ sys-apps/dbus |
138 |
+ x11-libs/libX11" |
139 |
DEPEND="${RDEPEND} |
140 |
- >=dev-libs/icu-4:= |
141 |
- dev-util/cmake |
142 |
virtual/pkgconfig |
143 |
doc? ( app-doc/doxygen )" |
144 |
|
145 |
-DOCS="AUTHORS README TODO" |
146 |
- |
147 |
PATCHES=( "${FILESDIR}"/${PN}-doc.patch ) |
148 |
|
149 |
src_configure() { |
150 |
- local mycmakeargs=( -DLIBDIR=$(get_libdir) all ) |
151 |
- |
152 |
+ local mycmakeargs=( |
153 |
+ -DLIBDIR=$(get_libdir) |
154 |
+ ) |
155 |
cmake-utils_src_configure |
156 |
} |
157 |
|
158 |
src_compile() { |
159 |
cmake-utils_src_compile |
160 |
|
161 |
- if use doc ; then |
162 |
- cd "${CMAKE_BUILD_DIR}" |
163 |
- emake docs || die |
164 |
+ if use doc; then |
165 |
+ emake -C "${BUILD_DIR}" docs |
166 |
fi |
167 |
} |
168 |
|
169 |
src_install() { |
170 |
- if use doc ; then |
171 |
- HTML_DOCS="${CMAKE_BUILD_DIR}/docs/html/*" |
172 |
+ if use doc; then |
173 |
+ HTML_DOCS=( "${BUILD_DIR}"/docs/html/. ) |
174 |
fi |
175 |
|
176 |
cmake-utils_src_install |
177 |
|
178 |
diff --git a/app-i18n/ibus-qt/metadata.xml b/app-i18n/ibus-qt/metadata.xml |
179 |
index 16d92f4e22c..4346ded0668 100644 |
180 |
--- a/app-i18n/ibus-qt/metadata.xml |
181 |
+++ b/app-i18n/ibus-qt/metadata.xml |
182 |
@@ -5,11 +5,10 @@ |
183 |
<email>cjk@g.o</email> |
184 |
<name>Cjk</name> |
185 |
</maintainer> |
186 |
- <longdescription lang="en">IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides |
187 |
-full featured and user friendly input method user interface. It also may help |
188 |
-developers to develop input method easily.</longdescription> |
189 |
+ <longdescription lang="en"> |
190 |
+ The Qt client for IBus. It provides a Qt immodule. |
191 |
+ </longdescription> |
192 |
<upstream> |
193 |
- <remote-id type="google-code">ibus</remote-id> |
194 |
<remote-id type="github">ibus/ibus-qt</remote-id> |
195 |
</upstream> |
196 |
</pkgmetadata> |