| 1 |
naota 15/03/06 10:51:00 |
| 2 |
|
| 3 |
Modified: mozc-2.16.2037.102.ebuild metadata.xml ChangeLog |
| 4 |
Log: |
| 5 |
Add fcitx support #542070; Fix openssl slot dependency |
| 6 |
|
| 7 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key F8551514) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 app-i18n/mozc/mozc-2.16.2037.102.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/mozc/mozc-2.16.2037.102.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/mozc/mozc-2.16.2037.102.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/mozc/mozc-2.16.2037.102.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: mozc-2.16.2037.102.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-i18n/mozc/mozc-2.16.2037.102.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- mozc-2.16.2037.102.ebuild 6 Mar 2015 06:30:28 -0000 1.2 |
| 23 |
+++ mozc-2.16.2037.102.ebuild 6 Mar 2015 10:51:00 -0000 1.3 |
| 24 |
@@ -1,10 +1,11 @@ |
| 25 |
# Copyright 1999-2015 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/mozc-2.16.2037.102.ebuild,v 1.2 2015/03/06 06:30:28 naota Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/mozc-2.16.2037.102.ebuild,v 1.3 2015/03/06 10:51:00 naota Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
| 32 |
-inherit elisp-common eutils multilib multiprocessing python-single-r1 toolchain-funcs |
| 33 |
+PLOCALES="de ja zh_CN zh_TW" |
| 34 |
+inherit elisp-common eutils l10n multilib multiprocessing python-single-r1 toolchain-funcs |
| 35 |
|
| 36 |
DESCRIPTION="The Mozc engine for IBus Framework" |
| 37 |
HOMEPAGE="http://code.google.com/p/mozc/" |
| 38 |
@@ -15,6 +16,8 @@ |
| 39 |
JSONCPP_VER="0.6.0-rc2" |
| 40 |
GYP_DATE="20140602" |
| 41 |
JAPANESE_USAGE_DICT_VER="10" |
| 42 |
+FCITX_PATCH_VER="2" |
| 43 |
+FCITX_PATCH="fcitx-mozc-${PV}.${FCITX_PATCH_VER}.patch" |
| 44 |
MOZC_URL="http://dev.gentoo.org/~naota/files/${P}.tar.bz2" |
| 45 |
PROTOBUF_URL="http://protobuf.googlecode.com/files/protobuf-${PROTOBUF_VER}.tar.bz2" |
| 46 |
GMOCK_URL="https://googlemock.googlecode.com/files/gmock-${GMOCK_VER}.zip" |
| 47 |
@@ -22,20 +25,23 @@ |
| 48 |
JSONCPP_URL="mirror://sourceforge/jsoncpp/jsoncpp-src-${JSONCPP_VER}.tar.gz" |
| 49 |
GYP_URL="http://dev.gentoo.org/~naota/files/gyp-${GYP_DATE}.tar.bz2" |
| 50 |
JAPANESE_USAGE_DICT_URL="http://dev.gentoo.org/~naota/files/japanese-usage-dictionary-${JAPANESE_USAGE_DICT_VER}.tar.bz2" |
| 51 |
+FCITX_PATCH_URL="http://download.fcitx-im.org/fcitx-mozc/${FCITX_PATCH}" |
| 52 |
SRC_URI="${MOZC_URL} ${PROTOBUF_URL} ${GYP_URL} ${JAPANESE_USAGE_DICT_URL} |
| 53 |
+ fcitx? ( ${FCITX_PATCH_URL} ) |
| 54 |
test? ( ${GMOCK_URL} ${GTEST_URL} ${JSONCPP_URL} )" |
| 55 |
|
| 56 |
LICENSE="BSD ipadic public-domain unicode" |
| 57 |
SLOT="0" |
| 58 |
KEYWORDS="~amd64 ~x86" |
| 59 |
-IUSE="emacs +ibus +qt4 renderer test" |
| 60 |
+IUSE="emacs fcitx +ibus +qt4 renderer test" |
| 61 |
|
| 62 |
RDEPEND="app-i18n/tegaki-zinnia-japanese |
| 63 |
dev-libs/glib:2 |
| 64 |
- dev-libs/openssl |
| 65 |
+ dev-libs/openssl:0 |
| 66 |
>=dev-libs/protobuf-2.5.0 |
| 67 |
x11-libs/libxcb |
| 68 |
emacs? ( virtual/emacs ) |
| 69 |
+ fcitx? ( app-i18n/fcitx ) |
| 70 |
ibus? ( >=app-i18n/ibus-1.4.1 ) |
| 71 |
renderer? ( x11-libs/gtk+:2 ) |
| 72 |
qt4? ( |
| 73 |
@@ -83,6 +89,9 @@ |
| 74 |
sed -i -e "s/<!(which clang)/$(tc-getCC)/" \ |
| 75 |
-e "s/<!(which clang++)/$(tc-getCXX)/" \ |
| 76 |
gyp/common.gypi || die |
| 77 |
+ if use fcitx; then |
| 78 |
+ EPATCH_OPTS="-p2" epatch "${DISTDIR}/${FCITX_PATCH}" |
| 79 |
+ fi |
| 80 |
epatch_user |
| 81 |
} |
| 82 |
|
| 83 |
@@ -114,6 +123,7 @@ |
| 84 |
|
| 85 |
local mytarget="server/server.gyp:mozc_server" |
| 86 |
use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper" |
| 87 |
+ use fcitx && mytarget="${mytarget} unix/fcitx/fcitx.gyp:fcitx-mozc" |
| 88 |
use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc" |
| 89 |
use renderer && mytarget="${mytarget} renderer/renderer.gyp:mozc_renderer" |
| 90 |
if use qt4 ; then |
| 91 |
@@ -133,14 +143,38 @@ |
| 92 |
tc-export CC CXX AR AS RANLIB LD |
| 93 |
V=1 "${PYTHON}" build_mozc.py runtests -c "${BUILDTYPE}" || die |
| 94 |
} |
| 95 |
- |
| 96 |
src_install() { |
| 97 |
+ install_fcitx_locale() { |
| 98 |
+ lang=$1 |
| 99 |
+ insinto "/usr/share/locale/${lang}/LC_MESSAGES/" |
| 100 |
+ newins out_linux/${BUILDTYPE}/gen/unix/fcitx/po/${lang}.mo fcitx-mozc.mo |
| 101 |
+ } |
| 102 |
+ |
| 103 |
if use emacs ; then |
| 104 |
dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die |
| 105 |
elisp-install ${PN} unix/emacs/*.{el,elc} || die |
| 106 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die |
| 107 |
fi |
| 108 |
|
| 109 |
+ if use fcitx; then |
| 110 |
+ exeinto /usr/$(get_libdir)/fcitx |
| 111 |
+ doexe "out_linux/${BUILDTYPE}/fcitx-mozc.so" |
| 112 |
+ insinto /usr/share/fcitx/addon |
| 113 |
+ doins "unix/fcitx/fcitx-mozc.conf" |
| 114 |
+ insinto /usr/share/fcitx/inputmethod |
| 115 |
+ doins "unix/fcitx/mozc.conf" |
| 116 |
+ insinto /usr/share/fcitx/mozc/icon |
| 117 |
+ ( |
| 118 |
+ cd data/images |
| 119 |
+ newins product_icon_32bpp-128.png mozc.png |
| 120 |
+ cd unix |
| 121 |
+ for f in ui-* ; do |
| 122 |
+ newins ${f} mozc-${f/ui-} |
| 123 |
+ done |
| 124 |
+ ) |
| 125 |
+ l10n_for_each_locale_do install_fcitx_locale |
| 126 |
+ fi |
| 127 |
+ |
| 128 |
if use ibus ; then |
| 129 |
exeinto /usr/$(get_libdir)/ibus-mozc || die |
| 130 |
newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die |
| 131 |
|
| 132 |
|
| 133 |
|
| 134 |
1.2 app-i18n/mozc/metadata.xml |
| 135 |
|
| 136 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/mozc/metadata.xml?rev=1.2&view=markup |
| 137 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/mozc/metadata.xml?rev=1.2&content-type=text/plain |
| 138 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/mozc/metadata.xml?r1=1.1&r2=1.2 |
| 139 |
|
| 140 |
Index: metadata.xml |
| 141 |
=================================================================== |
| 142 |
RCS file: /var/cvsroot/gentoo-x86/app-i18n/mozc/metadata.xml,v |
| 143 |
retrieving revision 1.1 |
| 144 |
retrieving revision 1.2 |
| 145 |
diff -u -r1.1 -r1.2 |
| 146 |
--- metadata.xml 23 Jul 2012 03:50:46 -0000 1.1 |
| 147 |
+++ metadata.xml 6 Mar 2015 10:51:00 -0000 1.2 |
| 148 |
@@ -6,6 +6,7 @@ |
| 149 |
Mozc is a Japanese Input Method Editor (IME) designed for multi-platform such as Chromium OS, Windows, Mac and Linux. This open-source project originates from Google Japanese Input. |
| 150 |
</longdescription> |
| 151 |
<use> |
| 152 |
+ <flag name='fcitx'>Enable support for <pkg>app-i18n/fcitx</pkg></flag> |
| 153 |
<flag name='ibus'>Enable support for <pkg>app-i18n/ibus</pkg></flag> |
| 154 |
<flag name='renderer'>Enable native candidate window.</flag> |
| 155 |
<flag name='scim'>Enable support for <pkg>app-i18n/scim</pkg></flag> |
| 156 |
|
| 157 |
|
| 158 |
|
| 159 |
1.14 app-i18n/mozc/ChangeLog |
| 160 |
|
| 161 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/mozc/ChangeLog?rev=1.14&view=markup |
| 162 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/mozc/ChangeLog?rev=1.14&content-type=text/plain |
| 163 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/mozc/ChangeLog?r1=1.13&r2=1.14 |
| 164 |
|
| 165 |
Index: ChangeLog |
| 166 |
=================================================================== |
| 167 |
RCS file: /var/cvsroot/gentoo-x86/app-i18n/mozc/ChangeLog,v |
| 168 |
retrieving revision 1.13 |
| 169 |
retrieving revision 1.14 |
| 170 |
diff -u -r1.13 -r1.14 |
| 171 |
--- ChangeLog 6 Mar 2015 06:30:28 -0000 1.13 |
| 172 |
+++ ChangeLog 6 Mar 2015 10:51:00 -0000 1.14 |
| 173 |
@@ -1,6 +1,10 @@ |
| 174 |
# ChangeLog for app-i18n/mozc |
| 175 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 176 |
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/ChangeLog,v 1.13 2015/03/06 06:30:28 naota Exp $ |
| 177 |
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/ChangeLog,v 1.14 2015/03/06 10:51:00 naota Exp $ |
| 178 |
+ |
| 179 |
+ 06 Mar 2015; Naohiro Aota <naota@g.o> metadata.xml, |
| 180 |
+ mozc-2.16.2037.102.ebuild: |
| 181 |
+ Add fcitx support #542070; Fix openssl slot dependency |
| 182 |
|
| 183 |
06 Mar 2015; Naohiro Aota <naota@g.o> mozc-2.16.2037.102.ebuild: |
| 184 |
Add handwriting dependency; add Qt immodule dependency |
Archives