Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/, app-i18n/fcitx/
Date: Sat, 07 Jul 2018 02:03:33
Message-Id: 1530928978.a794a92c2f98a230f0628daa07c7ff9b4957f40d.floppym@gentoo
1 commit: a794a92c2f98a230f0628daa07c7ff9b4957f40d
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Fri Jul 6 22:21:36 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 7 02:02:58 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a794a92c
7
8 app-i18n/*fcitx*: Delete old versions.
9
10 app-i18n/fcitx-qt5/Manifest | 2 -
11 app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild | 40 --------
12 app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild | 48 ----------
13 app-i18n/fcitx/Manifest | 1 -
14 app-i18n/fcitx/fcitx-4.2.9.5.ebuild | 150 ------------------------------
15 5 files changed, 241 deletions(-)
16
17 diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
18 index 05eec52503f..5959966f61d 100644
19 --- a/app-i18n/fcitx-qt5/Manifest
20 +++ b/app-i18n/fcitx-qt5/Manifest
21 @@ -1,3 +1 @@
22 -DIST fcitx-qt5-1.2.1.tar.xz 134304 BLAKE2B c158b20bdcb287e9cb52aa74d6a7f66f113a759538b6748b1d38dcbb2213956e88dec54ed29307427d45d84861654bf5e70c9effba70d88738bf0a1a664cc3cd SHA512 0fd726974492e173084e29d3308aa1d97141a1e4034b7192cf505391540533eff473849929e931e4a84589d233fefac70cbd9c122cf6d0d0de412150cad1b1d3
23 -DIST fcitx-qt5-1.2.2.tar.xz 134216 BLAKE2B 9922dafaa42937737f5ef0018f519e83ed3c3105bef5a30505b323239c999ac8c921435b2bb72b35a73ebf1a9b7787ecd4ad405d8b6311e806e3bcbcbd79ff5e SHA512 902180ff8336c688d5d548a1628dc481f1ce0ea6cc79719ab53337ebfbb745232bfc58cf6e739a60c562d30c3d996eb5e07bd8ef932eade72a79fb35e096e1c3
24 DIST fcitx-qt5-1.2.3.tar.xz 134124 BLAKE2B 0c17f9c3b9d9878fe228881c7287375d3b73a8c27f806590747e56b8644a86300e243d62efcb6589d197edd352e2a79d49be704718ff53381e2fb5e2a5a2b1af SHA512 e3e9a76419caca4eeebf3c149a72ee939a25f463d03dd8461caf44cace310278b08e83d460112f240cd54ed05dba3c5e9732198f0c3d0b9d81c3a444c33ab8d3
25
26 diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild
27 deleted file mode 100644
28 index c353b639401..00000000000
29 --- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild
30 +++ /dev/null
31 @@ -1,40 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI="6"
36 -
37 -inherit cmake-utils
38 -
39 -if [[ "${PV}" =~ (^|\.)9999$ ]]; then
40 - inherit git-r3
41 -
42 - EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
43 -fi
44 -
45 -DESCRIPTION="Fcitx input method module for Qt 5"
46 -HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
47 -if [[ "${PV}" =~ (^|\.)9999$ ]]; then
48 - SRC_URI=""
49 -else
50 - SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
51 -fi
52 -
53 -LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
54 -SLOT="4"
55 -KEYWORDS="amd64 ~hppa ppc ppc64 x86"
56 -IUSE=""
57 -
58 -# Private headers of dev-qt/qtgui:5 used.
59 -RDEPEND=">=app-i18n/fcitx-4.2.9:4
60 - dev-qt/qtcore:5
61 - dev-qt/qtdbus:5
62 - dev-qt/qtgui:5=
63 - dev-qt/qtwidgets:5
64 - virtual/libintl
65 - x11-libs/libxkbcommon"
66 -DEPEND="${RDEPEND}
67 - dev-qt/qtconcurrent:5
68 - kde-frameworks/extra-cmake-modules:5
69 - virtual/pkgconfig"
70 -
71 -DOCS=()
72
73 diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild
74 deleted file mode 100644
75 index 69572891889..00000000000
76 --- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild
77 +++ /dev/null
78 @@ -1,48 +0,0 @@
79 -# Copyright 1999-2018 Gentoo Foundation
80 -# Distributed under the terms of the GNU General Public License v2
81 -
82 -EAPI="6"
83 -
84 -inherit cmake-utils
85 -
86 -if [[ "${PV}" =~ (^|\.)9999$ ]]; then
87 - inherit git-r3
88 -
89 - EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-qt5.git"
90 -fi
91 -
92 -DESCRIPTION="Fcitx input method module for Qt 5"
93 -HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5"
94 -if [[ "${PV}" =~ (^|\.)9999$ ]]; then
95 - SRC_URI=""
96 -else
97 - SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
98 -fi
99 -
100 -LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
101 -SLOT="4"
102 -KEYWORDS="amd64 ~hppa ppc ppc64 x86"
103 -IUSE=""
104 -
105 -# Private headers of dev-qt/qtgui:5 used.
106 -RDEPEND=">=app-i18n/fcitx-4.2.9:4
107 - dev-qt/qtcore:5
108 - dev-qt/qtdbus:5
109 - dev-qt/qtgui:5=
110 - dev-qt/qtwidgets:5
111 - virtual/libintl
112 - x11-libs/libxkbcommon"
113 -DEPEND="${RDEPEND}
114 - dev-qt/qtconcurrent:5
115 - kde-frameworks/extra-cmake-modules:5
116 - virtual/pkgconfig"
117 -
118 -DOCS=()
119 -
120 -src_prepare() {
121 - # https://gitlab.com/fcitx/fcitx-qt5/issues/34
122 - # https://gitlab.com/fcitx/fcitx-qt5/commit/af033e3d5305108eecc568adff7f8b2da5831ed6
123 - sed -e "/^#include \"batchdialog.h\"$/i\\#include <QIcon>" -i quickphrase-editor/batchdialog.cpp || die
124 -
125 - cmake-utils_src_prepare
126 -}
127
128 diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
129 index 799e2637725..cfcbad155f7 100644
130 --- a/app-i18n/fcitx/Manifest
131 +++ b/app-i18n/fcitx/Manifest
132 @@ -1,4 +1,3 @@
133 -DIST fcitx-4.2.9.5_dict.tar.xz 8736972 BLAKE2B 01255554aa0caf5e4f638121febcf0951549d5752884dd436c90042587048598724b91d4839ff2470e8b9ee119f0abb40650c45fd8253ae1bd74608812c84a1d SHA512 5e2ec5405b01fe85b1659b1db3e15389b0d7e096808db598d0865381bcb8f6de960e8e16d4432c95c586cfc3359d17d4f7bad0cff2fe0146fe00b9fb80491168
134 DIST fcitx-4.2.9.6_dict.tar.xz 8738408 BLAKE2B 812256657ef8f6648a8a3de4bef4e423288ee3d91d493783eae2cb55b5b5964a791f3317af1aea0d877e01ea06491c34f6c594038d27713be3a6b35c93bc5545 SHA512 dc8308d1a4e9b7595da285ca6521f33027f5b8e6968bc28f751bd4f40116166cabbe1c05e29072afbe88473d2a9d6999124476260785e07f62a243df6e896bb0
135 DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
136 DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131
137
138 diff --git a/app-i18n/fcitx/fcitx-4.2.9.5.ebuild b/app-i18n/fcitx/fcitx-4.2.9.5.ebuild
139 deleted file mode 100644
140 index 5fe6492b498..00000000000
141 --- a/app-i18n/fcitx/fcitx-4.2.9.5.ebuild
142 +++ /dev/null
143 @@ -1,150 +0,0 @@
144 -# Copyright 1999-2018 Gentoo Foundation
145 -# Distributed under the terms of the GNU General Public License v2
146 -
147 -EAPI="6"
148 -
149 -inherit cmake-utils gnome2-utils xdg-utils
150 -
151 -if [[ "${PV}" =~ (^|\.)9999$ ]]; then
152 - inherit git-r3
153 -
154 - EGIT_REPO_URI="https://github.com/fcitx/fcitx"
155 -fi
156 -
157 -DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
158 -HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
159 -if [[ "${PV}" =~ (^|\.)9999$ ]]; then
160 - SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
161 - https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
162 - https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
163 - https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
164 - https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
165 -else
166 - SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
167 -fi
168 -
169 -LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
170 -SLOT="4"
171 -KEYWORDS="amd64 ~hppa ppc ppc64 x86"
172 -IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
173 -REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
174 -
175 -RDEPEND="dev-libs/glib:2
176 - sys-apps/dbus
177 - sys-apps/util-linux
178 - virtual/libiconv
179 - virtual/libintl
180 - x11-libs/libxkbcommon
181 - X? (
182 - x11-libs/libX11
183 - x11-libs/libXfixes
184 - x11-libs/libXinerama
185 - x11-libs/libXrender
186 - xml? (
187 - x11-libs/libxkbfile
188 - x11-misc/xkeyboard-config
189 - )
190 - )
191 - cairo? (
192 - x11-libs/cairo[X]
193 - x11-libs/libXext
194 - pango? ( x11-libs/pango )
195 - !pango? ( media-libs/fontconfig )
196 - )
197 - enchant? ( app-text/enchant:0= )
198 - gtk2? ( x11-libs/gtk+:2 )
199 - gtk3? ( x11-libs/gtk+:3 )
200 - introspection? ( dev-libs/gobject-introspection )
201 - lua? ( dev-lang/lua:= )
202 - nls? ( sys-devel/gettext )
203 - opencc? ( app-i18n/opencc:= )
204 - qt4? (
205 - dev-qt/qtcore:4
206 - dev-qt/qtdbus:4
207 - dev-qt/qtgui:4
208 - )
209 - xml? (
210 - app-text/iso-codes
211 - dev-libs/libxml2
212 - )"
213 -DEPEND="${RDEPEND}
214 - kde-frameworks/extra-cmake-modules:5
215 - virtual/pkgconfig"
216 -
217 -DOCS=(AUTHORS ChangeLog THANKS)
218 -
219 -src_prepare() {
220 - if [[ "${PV}" =~ (^|\.)9999$ ]]; then
221 - ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
222 - ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
223 - ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
224 - ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
225 - ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
226 - fi
227 -
228 - # https://github.com/fcitx/fcitx/issues/250
229 - sed \
230 - -e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \
231 - -e "/find_package(XkbFile REQUIRED)/s/^/ /" \
232 - -e "/find_package(XkbFile REQUIRED)/a\\ find_package(XKeyboardConfig REQUIRED)\n endif(ENABLE_X11)" \
233 - -e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \
234 - -i CMakeLists.txt
235 -
236 - cmake-utils_src_prepare
237 - xdg_environment_reset
238 -}
239 -
240 -src_configure() {
241 - local mycmakeargs=(
242 - -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
243 - -DSYSCONFDIR="${EPREFIX}/etc"
244 - -DENABLE_CAIRO=$(usex cairo)
245 - -DENABLE_DEBUG=$(usex debug)
246 - -DENABLE_ENCHANT=$(usex enchant)
247 - -DENABLE_GETTEXT=$(usex nls)
248 - -DENABLE_GIR=$(usex introspection)
249 - -DENABLE_GTK2_IM_MODULE=$(usex gtk2)
250 - -DENABLE_GTK3_IM_MODULE=$(usex gtk3)
251 - -DENABLE_LIBXML2=$(usex xml)
252 - -DENABLE_LUA=$(usex lua)
253 - -DENABLE_OPENCC=$(usex opencc)
254 - -DENABLE_PANGO=$(usex pango)
255 - -DENABLE_QT=$(usex qt4)
256 - -DENABLE_QT_GUI=$(usex qt4)
257 - -DENABLE_QT_IM_MODULE=$(usex qt4)
258 - -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
259 - -DENABLE_STATIC=$(usex static-libs)
260 - -DENABLE_TABLE=$(usex table)
261 - -DENABLE_TEST=$(usex test)
262 - -DENABLE_X11=$(usex X)
263 - -DENABLE_XDGAUTOSTART=$(usex autostart)
264 - )
265 -
266 - cmake-utils_src_configure
267 -}
268 -
269 -src_install() {
270 - cmake-utils_src_install
271 - rm -r "${ED}usr/share/doc/${PN}"
272 -}
273 -
274 -pkg_postinst() {
275 - gnome2_icon_cache_update
276 - xdg_desktop_database_update
277 - xdg_mimeinfo_database_update
278 - use gtk2 && gnome2_query_immodules_gtk2
279 - use gtk3 && gnome2_query_immodules_gtk3
280 -
281 - elog
282 - elog "Quick Phrase Editor is provided by:"
283 - elog " app-i18n/fcitx-qt5:4"
284 - elog
285 -}
286 -
287 -pkg_postrm() {
288 - gnome2_icon_cache_update
289 - xdg_desktop_database_update
290 - xdg_mimeinfo_database_update
291 - use gtk2 && gnome2_query_immodules_gtk2
292 - use gtk3 && gnome2_query_immodules_gtk3
293 -}