* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2015-09-01 18:51 Tobias Klausmann
0 siblings, 0 replies; 41+ messages in thread
From: Tobias Klausmann @ 2015-09-01 18:51 UTC (permalink / raw
To: gentoo-commits
commit: de7cdc142ab7a6a0532da79dd1f4965d4af171d4
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 1 18:51:34 2015 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Tue Sep 1 18:51:34 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de7cdc14
app-i18n/mozc: Fixing HOMEPAGE move due to code.google.com shutdown
Package-Manager: portage-2.2.20.1
app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild | 2 +-
app-i18n/mozc/mozc-1.13.1651.102.ebuild | 2 +-
app-i18n/mozc/mozc-2.16.2037.102.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild b/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild
index 6225fb0..7444fcf 100644
--- a/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild
+++ b/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit elisp-common eutils multilib multiprocessing python-single-r1 toolchain-funcs
DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="https://code.google.com/p/mozc/"
+HOMEPAGE="https://github.com/google/mozc"
PROTOBUF_VER="2.5.0"
GMOCK_VER="1.6.0"
diff --git a/app-i18n/mozc/mozc-1.13.1651.102.ebuild b/app-i18n/mozc/mozc-1.13.1651.102.ebuild
index 571ac0d..eeb2202 100644
--- a/app-i18n/mozc/mozc-1.13.1651.102.ebuild
+++ b/app-i18n/mozc/mozc-1.13.1651.102.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit elisp-common eutils multilib multiprocessing python-single-r1 toolchain-funcs
DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="https://code.google.com/p/mozc/"
+HOMEPAGE="https://github.com/google/mozc"
PROTOBUF_VER="2.5.0"
GMOCK_VER="1.6.0"
diff --git a/app-i18n/mozc/mozc-2.16.2037.102.ebuild b/app-i18n/mozc/mozc-2.16.2037.102.ebuild
index 68746a6..8d46344 100644
--- a/app-i18n/mozc/mozc-2.16.2037.102.ebuild
+++ b/app-i18n/mozc/mozc-2.16.2037.102.ebuild
@@ -8,7 +8,7 @@ PLOCALES="de ja zh_CN zh_TW"
inherit elisp-common eutils l10n multilib multiprocessing python-single-r1 toolchain-funcs
DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="https://code.google.com/p/mozc/"
+HOMEPAGE="https://github.com/google/mozc"
PROTOBUF_VER="2.5.0"
GMOCK_VER="1.6.0"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2016-03-23 15:43 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2016-03-23 15:43 UTC (permalink / raw
To: gentoo-commits
commit: 59917714df000995040ca9df5e89dbd33b74ed74
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Mar 21 19:34:39 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 15:41:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59917714
app-i18n/mozc: Add Arfrever as maintainer.
app-i18n/mozc/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index ce34e29..932a35b 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>arfrever.fta@gmail.com</email>
+ <name>Arfrever Frehtes Taifersar Arahesis</name>
+ </maintainer>
<maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2017-04-20 7:59 David Seifert
0 siblings, 0 replies; 41+ messages in thread
From: David Seifert @ 2017-04-20 7:59 UTC (permalink / raw
To: gentoo-commits
commit: 057e0985696289a4595f12e6e89a32712bfe0954
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 07:16:23 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 07:57:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=057e0985
app-i18n/mozc: [QA] Add missing python metadata variables
Package-Manager: Portage-2.3.5, Repoman-2.3.2
app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild | 5 +++--
app-i18n/mozc/mozc-1.13.1651.102.ebuild | 5 +++--
app-i18n/mozc/mozc-2.16.2037.102.ebuild | 3 ++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild b/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild
index 3d2032729ca..7aa21965a5f 100644
--- a/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild
+++ b/app-i18n/mozc/mozc-1.10.1390.102-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -24,9 +24,10 @@ LICENSE="BSD ipadic public-domain unicode"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="emacs +ibus +qt4 renderer test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="dev-libs/glib:2
- dev-libs/openssl
+ dev-libs/openssl:0=
x11-libs/libxcb
emacs? ( virtual/emacs )
ibus? ( >=app-i18n/ibus-1.4.1 )
diff --git a/app-i18n/mozc/mozc-1.13.1651.102.ebuild b/app-i18n/mozc/mozc-1.13.1651.102.ebuild
index 763647dbc98..6fa63db9ed9 100644
--- a/app-i18n/mozc/mozc-1.13.1651.102.ebuild
+++ b/app-i18n/mozc/mozc-1.13.1651.102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -26,9 +26,10 @@ LICENSE="BSD ipadic public-domain unicode"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="emacs +ibus +qt4 renderer test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="dev-libs/glib:2
- dev-libs/openssl
+ dev-libs/openssl:0=
>=dev-libs/protobuf-2.5.0
x11-libs/libxcb
emacs? ( virtual/emacs )
diff --git a/app-i18n/mozc/mozc-2.16.2037.102.ebuild b/app-i18n/mozc/mozc-2.16.2037.102.ebuild
index 2eab7707029..cb43400250d 100644
--- a/app-i18n/mozc/mozc-2.16.2037.102.ebuild
+++ b/app-i18n/mozc/mozc-2.16.2037.102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -33,6 +33,7 @@ LICENSE="BSD ipadic public-domain unicode"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="emacs fcitx +ibus +qt4 renderer test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="app-i18n/tegaki-zinnia-japanese
dev-libs/glib:2
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2017-09-28 17:18 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2017-09-28 17:18 UTC (permalink / raw
To: gentoo-commits
commit: 8effb27cc81b23cd05c9c2dfc63983a64d65437d
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Sep 28 16:31:10 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 17:11:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8effb27c
app-i18n/mozc: Add live ebuild.
app-i18n/mozc/mozc-9999.ebuild | 309 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 309 insertions(+)
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
new file mode 100644
index 00000000000..686839da1c0
--- /dev/null
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=(python2_7)
+
+inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/google/mozc"
+ EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
+else
+ MOZC_GIT_REVISION=""
+ JAPANESE_USAGE_DICTIONARY_GIT_REVISION=""
+ JAPANESE_USAGE_DICTIONARY_DATE=""
+fi
+
+FCITX_PATCH_VERSION="2.18.2612.102.1"
+
+DESCRIPTION="Mozc - Japanese input method editor"
+HOMEPAGE="https://github.com/google/mozc"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz
+ https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz"
+fi
+SRC_URI+=" fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )"
+
+# Mozc: BSD
+# src/data/dictionary_oss: ipadic, public-domain
+# src/data/unicode: unicode
+# japanese-usage-dictionary: BSD-2
+LICENSE="BSD BSD-2 ipadic public-domain unicode"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
+REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
+
+RDEPEND="dev-libs/protobuf:=
+ emacs? ( virtual/emacs )
+ fcitx4? ( app-i18n/fcitx:4 )
+ gui? (
+ app-i18n/zinnia
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ handwriting-tegaki? ( app-i18n/tegaki-zinnia-japanese )
+ handwriting-tomoe? ( app-i18n/zinnia-tomoe )
+ )
+ ibus? (
+ >=app-i18n/ibus-1.4.1
+ dev-libs/glib:2
+ x11-libs/libxcb
+ )
+ renderer? (
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gtk+:2
+ x11-libs/pango
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-util/gyp
+ dev-util/ninja
+ virtual/pkgconfig
+ test? (
+ >=dev-cpp/gtest-1.8.0
+ dev-libs/jsoncpp
+ )"
+
+S="${WORKDIR}/${P}/src"
+
+SITEFILE="50${PN}-gentoo.el"
+
+execute() {
+ einfo "$@"
+ "$@"
+}
+
+src_unpack() {
+ if [[ "${PV}" == "9999" ]]; then
+ git-r3_src_unpack
+ else
+ unpack ${P}.tar.gz
+ mv mozc-${MOZC_GIT_REVISION} ${P} || die
+
+ unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+ cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
+ fi
+}
+
+src_prepare() {
+ eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-system_libraries.patch"
+ eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
+ eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
+
+ if use fcitx4; then
+ eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch"
+ fi
+
+ eapply_user
+
+ sed \
+ -e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
+ -e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
+ -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+ -i build_mozc.py || die
+
+ sed \
+ -e "s/'release_extra_cflags%': \['-O2'\]/'release_extra_cflags%': []/" \
+ -e "s/'debug_extra_cflags%': \['-O0', '-g'\]/'debug_extra_cflags%': []/" \
+ -i gyp/common.gypi || die
+
+ local ar=($(tc-getAR))
+ local cc=($(tc-getCC))
+ local cxx=($(tc-getCXX))
+ local ld=($(tc-getLD))
+ local nm=($(tc-getNM))
+ local readelf=($(tc-getPROG READELF readelf))
+
+ # Use absolute paths. Non-absolute paths are mishandled by GYP.
+ ar[0]=$(type -P ${ar[0]})
+ cc[0]=$(type -P ${cc[0]})
+ cxx[0]=$(type -P ${cxx[0]})
+ ld[0]=$(type -P ${ld[0]})
+ nm[0]=$(type -P ${nm[0]})
+ readelf[0]=$(type -P ${readelf[0]})
+
+ sed \
+ -e "s:<!(which ar):${ar[@]}:" \
+ -e "s:<!(which clang):${cc[@]}:" \
+ -e "s:<!(which clang++):${cxx[@]}:" \
+ -e "s:<!(which ld):${ld[@]}:" \
+ -e "s:<!(which nm):${nm[@]}:" \
+ -e "s:<!(which readelf):${readelf[@]}:" \
+ -i gyp/common.gypi || die
+}
+
+src_configure() {
+ if use debug; then
+ BUILD_TYPE="Debug"
+ else
+ BUILD_TYPE="Release"
+ fi
+
+ local gyp_arguments=()
+
+ if tc-is-gcc; then
+ gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
+ elif tc-is-clang; then
+ gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
+ else
+ gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
+ fi
+
+ gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
+ gyp_arguments+=(-D use_libprotobuf=1)
+ gyp_arguments+=(-D use_libzinnia=1)
+ gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
+
+ gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
+ gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
+
+ if use handwriting-tegaki; then
+ gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model")
+ elif use handwriting-tomoe; then
+ gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model")
+ fi
+
+ if use ibus; then
+ gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
+ gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
+ fi
+
+ unset AR CC CXX LD NM READELF
+
+ execute "${PYTHON}" build_mozc.py gyp \
+ --gypdir="${EPREFIX}/usr/bin" \
+ --server_dir="${EPREFIX}/usr/libexec/mozc" \
+ --verbose \
+ $(usex gui "" --noqt) \
+ -- "${gyp_arguments[@]}" || die "Configuration failed"
+}
+
+src_compile() {
+ local targets=(server/server.gyp:mozc_server)
+ if use emacs; then
+ targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
+ fi
+ if use fcitx4; then
+ targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
+ fi
+ if use gui; then
+ targets+=(gui/gui.gyp:mozc_tool)
+ fi
+ if use ibus; then
+ targets+=(unix/ibus/ibus.gyp:ibus_mozc)
+ fi
+ if use renderer; then
+ targets+=(renderer/renderer.gyp:mozc_renderer)
+ fi
+ if use test; then
+ targets+=(gyp/tests.gyp:unittests)
+ fi
+
+ execute "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} -v "${targets[@]}" || die "Building failed"
+
+ if use emacs; then
+ elisp-compile unix/emacs/*.el
+ fi
+}
+
+src_test() {
+ execute "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 || die "Testing failed"
+}
+
+src_install() {
+ exeinto /usr/libexec/mozc
+ doexe out_linux/${BUILD_TYPE}/mozc_server
+
+ if use gui; then
+ doexe out_linux/${BUILD_TYPE}/mozc_tool
+ fi
+
+ if use renderer; then
+ doexe out_linux/${BUILD_TYPE}/mozc_renderer
+ fi
+
+ insinto /usr/libexec/mozc/documents
+ doins data/installer/credits_en.html
+
+ if use emacs; then
+ dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
+ elisp-install ${PN} unix/emacs/*.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
+ fi
+
+ if use fcitx4; then
+ exeinto /usr/$(get_libdir)/fcitx
+ doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
+
+ insinto /usr/share/fcitx/addon
+ doins unix/fcitx/fcitx-mozc.conf
+
+ insinto /usr/share/fcitx/inputmethod
+ doins unix/fcitx/mozc.conf
+
+ insinto /usr/share/fcitx/mozc/icon
+ newins data/images/product_icon_32bpp-128.png mozc.png
+ local image
+ for image in data/images/unix/ui-*.png; do
+ newins "${image}" "mozc-${image#data/images/unix/ui-}"
+ done
+
+ local locale mo_file
+ for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
+ locale="${mo_file##*/}"
+ locale="${locale%.mo}"
+ insinto /usr/share/locale/${locale}/LC_MESSAGES
+ newins "${mo_file}" fcitx-mozc.mo
+ done
+ fi
+
+ if use ibus; then
+ exeinto /usr/libexec
+ newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
+
+ insinto /usr/share/ibus/component
+ doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
+
+ insinto /usr/share/ibus-mozc
+ newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
+ local image
+ for image in data/images/unix/ui-*.png; do
+ newins "${image}" "${image#data/images/unix/ui-}"
+ done
+ fi
+}
+
+pkg_postinst() {
+ if use emacs; then
+ elisp-site-regen
+
+ elog "USAGE IN EMACS"
+ elog
+ elog "mozc-mode is minor mode to input Japanese text using Mozc server."
+ elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
+ elog
+ elog "In order to use mozc-mode by default, the following settings should be added to"
+ elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
+ elog
+ elog " (require 'mozc)"
+ elog " (set-language-environment \"Japanese\")"
+ elog " (setq default-input-method \"japanese-mozc\")"
+ elog
+ elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
+ elog "by default) will enable mozc-mode."
+ elog
+ elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
+ elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
+ fi
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2017-10-02 17:36 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2017-10-02 17:36 UTC (permalink / raw
To: gentoo-commits
commit: dbf4ddc55a29d001496e4acbbb426811288eb76b
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Sep 30 12:41:39 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Oct 2 17:36:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbf4ddc5
app-i18n/mozc: Update Manifest.
Closes: https://bugs.gentoo.org/632482
app-i18n/mozc/Manifest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index ee7002187dc..03af05380cd 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -9,5 +9,5 @@ DIST jsoncpp-src-0.6.0-rc2.tar.gz 117661 SHA256 d4d193d163f520b08b9155cba9786158
DIST mozc-1.10.1390.102.tar.bz2 57879881 SHA256 72a8ed6657daa1c03b1efe50c262a69be2ab66d45747a47df6e54996b6d5ee39 SHA512 4482e822f8a14bffd02cb1eaa5d14ba0a213266b2f0dd6402c42b9b357bf0d8c4dd572cef79f1d400bd68b7bd6cb4367933574f8f5967f68738249a300e3cfb9 WHIRLPOOL 90518e621ef784b438fcf677e211fdb6753719f3d78d14ce866ccea22d6d87f8d64e334bc568eebe93cb2850d3d545eb0b73d6f6de820eaf1d43f16bfdef4100
DIST mozc-1.13.1651.102.tar.bz2 31635636 SHA256 a275accc726d55d696adf235fa40822ae099f0a02d3dc9f8d0257ba191a1bc49 SHA512 caa75e60704e904a72fd06e315a219ff304a54adaeee70a8ab75d413f7801960add103b9aae1c19ee92f6d10c4c408fd840cf78c5dde0cc21c605feac59deaf4 WHIRLPOOL 72a870cc1bc5bc63227bba61c73183f69160aa5c58c9b89e75fa65bf16bbdc2c2b873b7407d0543b3847bc046866392d9bbe6d771d7b4b7eb3f6be759f1a63b4
DIST mozc-2.16.2037.102.tar.bz2 41172838 SHA256 4b78769b36366f056282267935a859e587f77e9aaf17132687d0e4d0c4da5cd0 SHA512 ff114a93054b43109407c44bc7c75de79fa2b028f9dba5c2ecc1776c5cbb032f184a91155b6b31bc17f0183dd70b0150ce13e80f59e26810daf4b65ba7e52be1 WHIRLPOOL 625c5a28da164ee96cdf523af32a7101357254cea1d57cd7f272bdf86ba8344d3e39bf2b2bfb0a79640d7961fd46c183eabc4002c8d86215ecffe183e4e0d193
-DIST mozc-2.20.2673.102.tar.gz 48623065 SHA256 794ec312e9a5567d2097059beb25718ddb1636cd8dd99b880ec97e26824276ea SHA512 409d406fdb21d55c93a4287cd3757a164c65c1c309918b4e905aec422d9c86bc6e51ae67c23ad0db2c87ab968443bd62f5a58684a0bf5d52751988a5ec5b0bd5 WHIRLPOOL 022029c7828502907f3c3e6fd39cfa059a947f75538b6958ec81528caec0a1be0cce48a3e94ff67303021f2003fcd1a966cdf3a4bbbf113968e454ba3e84295c
+DIST mozc-2.20.2673.102.tar.gz 48624369 SHA256 004cb773d335e7e1075cf20fd9e713f6dcf6d158d75077bcb95358a116ad3cca SHA512 ad7a78b03b29847057625fd5422c03ac8fc5755c5e85c66fd6e80f81be719dd56bf1349a1d745797118deed239641512789687b4f9ffe49bab1bc966385229ae WHIRLPOOL f78140126a950eb28548c6ef8b20ec5599e04ac1de7d22d2b0ba00cc2471d43ec9823996e399f9025cfcbc7b50a3ecdbd3283463acb423b65089f56c96cc88db
DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2017-10-05 18:57 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2017-10-05 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 7eeefa9fae3a533aeaf4a4255a4943973508a5fd
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Oct 5 18:27:59 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Oct 5 18:57:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eeefa9f
app-i18n/mozc: Disable check for zinnia.pc with USE="-gui".
app-i18n/mozc/mozc-2.20.2673.102.ebuild | 2 +-
app-i18n/mozc/mozc-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.20.2673.102.ebuild b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
index 017f643d86c..9c1d6fade0a 100644
--- a/app-i18n/mozc/mozc-2.20.2673.102.ebuild
+++ b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
@@ -160,7 +160,7 @@ src_configure() {
gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
gyp_arguments+=(-D use_libjsoncpp=$(usex test 1 0))
gyp_arguments+=(-D use_libprotobuf=1)
- gyp_arguments+=(-D use_libzinnia=1)
+ gyp_arguments+=(-D use_libzinnia=$(usex gui 1 0))
gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index 75b207ea2ec..bd3c79ff279 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -160,7 +160,7 @@ src_configure() {
gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
gyp_arguments+=(-D use_libjsoncpp=$(usex test 1 0))
gyp_arguments+=(-D use_libprotobuf=1)
- gyp_arguments+=(-D use_libzinnia=1)
+ gyp_arguments+=(-D use_libzinnia=$(usex gui 1 0))
gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2017-10-05 18:57 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2017-10-05 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 1e174f0bb9d7ba4b6d5e8cd89676fdcdda88b276
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Oct 5 18:32:55 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Oct 5 18:57:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e174f0b
app-i18n/mozc: Depend on >=dev-libs/protobuf-3.0.0.
Bug: https://bugs.gentoo.org/633458
app-i18n/mozc/mozc-2.20.2673.102.ebuild | 2 +-
app-i18n/mozc/mozc-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.20.2673.102.ebuild b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
index 9c1d6fade0a..eb93090b736 100644
--- a/app-i18n/mozc/mozc-2.20.2673.102.ebuild
+++ b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
@@ -39,7 +39,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
-RDEPEND="dev-libs/protobuf:=
+RDEPEND=">=dev-libs/protobuf-3.0.0:=
emacs? ( virtual/emacs )
fcitx4? ( app-i18n/fcitx:4 )
gui? (
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index bd3c79ff279..c56eb0e73da 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -39,7 +39,7 @@ KEYWORDS=""
IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
-RDEPEND="dev-libs/protobuf:=
+RDEPEND=">=dev-libs/protobuf-3.0.0:=
emacs? ( virtual/emacs )
fcitx4? ( app-i18n/fcitx:4 )
gui? (
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2017-12-10 9:27 Ulrich Müller
0 siblings, 0 replies; 41+ messages in thread
From: Ulrich Müller @ 2017-12-10 9:27 UTC (permalink / raw
To: gentoo-commits
commit: 2212b2e744efd09b6ee04ed20c6a43aa3183b42d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 08:44:47 2017 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 09:26:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2212b2e7
app-i18n/mozc: Update Manifest hashes.
app-i18n/mozc/Manifest | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index c6ed7c5ef6f..2c870086b6a 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,3 +1,3 @@
-DIST fcitx-mozc-2.18.2612.102.1.patch 140722 SHA256 0ec5dc2e9798ce7a6dbcbe847cf016b0b49be1851008143d167c13333a15ed27 SHA512 725c464727f230707b90975705ef1565f1178f9144e66c5a688696a4ef520a6fec1d11f7aa68ee05f82aa9417060b1cccf49a155e30734871a525eaa4c76addb WHIRLPOOL 25d0efd313175f6648504b989302c73ab6d82a0cf4eecf332b68347331e1feff2df6251edd49c3d4e9251a2c7e01df56eb8de54ebbbc31582f7c2b89d1da53c1
-DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 SHA256 0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7 WHIRLPOOL 1c4324a6408cfc0b2e1df33a32583384ccf10374bc1a8f49f574e681a72174f7bee7e8500c93d714ee6459c087f7cd408e57cb52b8506ec50292249e50045cd2
-DIST mozc-2.20.2673.102.tar.gz 48624369 SHA256 004cb773d335e7e1075cf20fd9e713f6dcf6d158d75077bcb95358a116ad3cca SHA512 ad7a78b03b29847057625fd5422c03ac8fc5755c5e85c66fd6e80f81be719dd56bf1349a1d745797118deed239641512789687b4f9ffe49bab1bc966385229ae WHIRLPOOL f78140126a950eb28548c6ef8b20ec5599e04ac1de7d22d2b0ba00cc2471d43ec9823996e399f9025cfcbc7b50a3ecdbd3283463acb423b65089f56c96cc88db
+DIST fcitx-mozc-2.18.2612.102.1.patch 140722 BLAKE2B a412b8dd94bcf44f7fd946bcc1072f3dde7d8d8da55d3ad04ef5d8ef851a63f4d4d8e7e6249172a9d1e75e1f1672e32e6a673e6016d94b034f80d23b660a80e2 SHA512 725c464727f230707b90975705ef1565f1178f9144e66c5a688696a4ef520a6fec1d11f7aa68ee05f82aa9417060b1cccf49a155e30734871a525eaa4c76addb
+DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
+DIST mozc-2.20.2673.102.tar.gz 48624369 BLAKE2B 0d80065f989c1f61e5f2852e7f471dd83777323b21499c118dc87f4fd6596329ab096dd64db3419895090ab61d6aef9a07e61c7fddeaf4f3a40ce3f3acbad949 SHA512 ad7a78b03b29847057625fd5422c03ac8fc5755c5e85c66fd6e80f81be719dd56bf1349a1d745797118deed239641512789687b4f9ffe49bab1bc966385229ae
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2018-01-08 21:31 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2018-01-08 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 35c797b137b17993e8491610b2ed56f919fe7eda
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Jan 8 19:13:10 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 21:29:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c797b1
app-i18n/mozc: In live ebuild, use live version of Fcitx-Mozc patch.
app-i18n/mozc/mozc-2.20.2673.102.ebuild | 21 +++++++++++++++------
app-i18n/mozc/mozc-9999.ebuild | 22 ++++++++++++++++------
2 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.20.2673.102.ebuild b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
index ee84afb7d91..907a92420d3 100644
--- a/app-i18n/mozc/mozc-2.20.2673.102.ebuild
+++ b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -15,19 +15,18 @@ else
MOZC_GIT_REVISION="280e38fe3d9db4df52f0713acf2ca65898cd697a"
JAPANESE_USAGE_DICTIONARY_GIT_REVISION="e5b3425575734c323e1d947009dd74709437b684"
JAPANESE_USAGE_DICTIONARY_DATE="20120416091336"
+ FCITX_PATCH_VERSION="2.18.2612.102.1"
fi
-FCITX_PATCH_VERSION="2.18.2612.102.1"
-
DESCRIPTION="Mozc - Japanese input method editor"
HOMEPAGE="https://github.com/google/mozc"
if [[ "${PV}" == "9999" ]]; then
SRC_URI=""
else
SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz
- https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz"
+ https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+ fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )"
fi
-SRC_URI+=" fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )"
# Mozc: BSD
# src/data/dictionary_oss: ipadic, public-domain
@@ -83,6 +82,12 @@ execute() {
src_unpack() {
if [[ "${PV}" == "9999" ]]; then
git-r3_src_unpack
+
+ if use fcitx4; then
+ local EGIT_SUBMODULES=()
+ git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
+ git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
+ fi
else
unpack ${P}.tar.gz
mv mozc-${MOZC_GIT_REVISION} ${P} || die
@@ -99,7 +104,11 @@ src_prepare() {
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
if use fcitx4; then
- eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch"
+ if [[ "${PV}" == "9999" ]]; then
+ cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
+ else
+ eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch"
+ fi
fi
eapply_user
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index 35e9ab69f40..388857a1862 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -15,19 +15,18 @@ else
MOZC_GIT_REVISION=""
JAPANESE_USAGE_DICTIONARY_GIT_REVISION=""
JAPANESE_USAGE_DICTIONARY_DATE=""
+ FCITX_PATCH_VERSION=""
fi
-FCITX_PATCH_VERSION="2.18.2612.102.1"
-
DESCRIPTION="Mozc - Japanese input method editor"
HOMEPAGE="https://github.com/google/mozc"
if [[ "${PV}" == "9999" ]]; then
SRC_URI=""
else
SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz
- https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz"
+ https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+ fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )"
fi
-SRC_URI+=" fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )"
# Mozc: BSD
# src/data/dictionary_oss: ipadic, public-domain
@@ -83,6 +82,12 @@ execute() {
src_unpack() {
if [[ "${PV}" == "9999" ]]; then
git-r3_src_unpack
+
+ if use fcitx4; then
+ local EGIT_SUBMODULES=()
+ git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
+ git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
+ fi
else
unpack ${P}.tar.gz
mv mozc-${MOZC_GIT_REVISION} ${P} || die
@@ -99,7 +104,11 @@ src_prepare() {
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
if use fcitx4; then
- eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch"
+ if [[ "${PV}" == "9999" ]]; then
+ cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
+ else
+ eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch"
+ fi
fi
eapply_user
@@ -157,6 +166,7 @@ src_configure() {
gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
fi
+ gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
gyp_arguments+=(-D use_libgtest=$(usex test 1 0))
gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
gyp_arguments+=(-D use_libjsoncpp=$(usex test 1 0))
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2018-02-12 19:16 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2018-02-12 19:16 UTC (permalink / raw
To: gentoo-commits
commit: e338b308da29781c24d75a5a7fb9f0238552eec9
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Feb 10 16:52:56 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 19:16:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e338b308
app-i18n/mozc: Disable no longer needed patch.
https://github.com/google/mozc/commit/8ad0a053b9bc55be63bab1736c36754e2d73f133
app-i18n/mozc/mozc-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index 388857a1862..96d3d9bd6f2 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -99,7 +99,6 @@ src_unpack() {
src_prepare() {
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-system_libraries.patch"
- eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-gcc-5.patch"
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2018-03-08 19:33 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2018-03-08 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 1c63264809c507c37cc99bcffc2f0c07f5dd91a3
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Mar 8 18:10:46 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 8 19:32:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c632648
app-i18n/mozc: Stabilize 2.20.2673.102 on amd64/x86.
app-i18n/mozc/mozc-2.20.2673.102.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/mozc/mozc-2.20.2673.102.ebuild b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
index 907a92420d3..eead0419398 100644
--- a/app-i18n/mozc/mozc-2.20.2673.102.ebuild
+++ b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
@@ -34,7 +34,7 @@ fi
# japanese-usage-dictionary: BSD-2
LICENSE="BSD BSD-2 ipadic public-domain unicode"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2018-03-15 19:23 Sergei Trofimovich
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich @ 2018-03-15 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 3fcbb95c43e1a9302ea0617876202957886e4c51
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 19:23:05 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 19:23:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fcbb95c
app-i18n/mozc: keyworded 2.20.2673.102 for ppc64, bug #642714
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc64"
app-i18n/mozc/mozc-2.20.2673.102.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/mozc/mozc-2.20.2673.102.ebuild b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
index eead0419398..a0dd5acee8e 100644
--- a/app-i18n/mozc/mozc-2.20.2673.102.ebuild
+++ b/app-i18n/mozc/mozc-2.20.2673.102.ebuild
@@ -34,7 +34,7 @@ fi
# japanese-usage-dictionary: BSD-2
LICENSE="BSD BSD-2 ipadic public-domain unicode"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2018-04-16 18:29 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2018-04-16 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 8ee61793ebfadfed93497a5b5806b0d2a25cf660
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Apr 16 17:27:40 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 18:27:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee61793
app-i18n/mozc: Version bump (2.23.2815.102).
app-i18n/mozc/Manifest | 2 +
app-i18n/mozc/mozc-2.23.2815.102.ebuild | 322 ++++++++++++++++++++++++++++++++
2 files changed, 324 insertions(+)
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 2c870086b6a..a85a1186efc 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,3 +1,5 @@
DIST fcitx-mozc-2.18.2612.102.1.patch 140722 BLAKE2B a412b8dd94bcf44f7fd946bcc1072f3dde7d8d8da55d3ad04ef5d8ef851a63f4d4d8e7e6249172a9d1e75e1f1672e32e6a673e6016d94b034f80d23b660a80e2 SHA512 725c464727f230707b90975705ef1565f1178f9144e66c5a688696a4ef520a6fec1d11f7aa68ee05f82aa9417060b1cccf49a155e30734871a525eaa4c76addb
+DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B 709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3 SHA512 e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0
DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
DIST mozc-2.20.2673.102.tar.gz 48624369 BLAKE2B 0d80065f989c1f61e5f2852e7f471dd83777323b21499c118dc87f4fd6596329ab096dd64db3419895090ab61d6aef9a07e61c7fddeaf4f3a40ce3f3acbad949 SHA512 ad7a78b03b29847057625fd5422c03ac8fc5755c5e85c66fd6e80f81be719dd56bf1349a1d745797118deed239641512789687b4f9ffe49bab1bc966385229ae
+DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
new file mode 100644
index 00000000000..d24cd9f07a0
--- /dev/null
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -0,0 +1,322 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=(python2_7)
+
+inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/google/mozc"
+ EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
+else
+ MOZC_GIT_REVISION="afb03ddfe72dde4cf2409863a3bfea160f7a66d8"
+ JAPANESE_USAGE_DICTIONARY_GIT_REVISION="e5b3425575734c323e1d947009dd74709437b684"
+ JAPANESE_USAGE_DICTIONARY_DATE="20120416091336"
+ FCITX_PATCH_VERSION="2.23.2815.102.1"
+fi
+
+DESCRIPTION="Mozc - Japanese input method editor"
+HOMEPAGE="https://github.com/google/mozc"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz
+ https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+ fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )"
+fi
+
+# Mozc: BSD
+# src/data/dictionary_oss: ipadic, public-domain
+# src/data/unicode: unicode
+# japanese-usage-dictionary: BSD-2
+LICENSE="BSD BSD-2 ipadic public-domain unicode"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
+REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
+
+RDEPEND=">=dev-libs/protobuf-3.0.0:=
+ emacs? ( virtual/emacs )
+ fcitx4? ( app-i18n/fcitx:4 )
+ gui? (
+ app-i18n/zinnia
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ handwriting-tegaki? ( app-i18n/tegaki-zinnia-japanese )
+ handwriting-tomoe? ( app-i18n/zinnia-tomoe )
+ )
+ ibus? (
+ >=app-i18n/ibus-1.4.1
+ dev-libs/glib:2
+ x11-libs/libxcb
+ )
+ renderer? (
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gtk+:2
+ x11-libs/pango
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-util/gyp
+ dev-util/ninja
+ virtual/pkgconfig
+ test? (
+ >=dev-cpp/gtest-1.8.0
+ dev-libs/jsoncpp
+ )"
+
+S="${WORKDIR}/${P}/src"
+
+SITEFILE="50${PN}-gentoo.el"
+
+execute() {
+ einfo "$@"
+ "$@"
+}
+
+src_unpack() {
+ if [[ "${PV}" == "9999" ]]; then
+ git-r3_src_unpack
+
+ if use fcitx4; then
+ local EGIT_SUBMODULES=()
+ git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
+ git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
+ fi
+ else
+ unpack ${P}.tar.gz
+ mv mozc-${MOZC_GIT_REVISION} ${P} || die
+
+ unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+ cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
+ fi
+}
+
+src_prepare() {
+ eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
+ eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
+ eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
+
+ if use fcitx4; then
+ if [[ "${PV}" == "9999" ]]; then
+ cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
+ else
+ eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch"
+ fi
+ fi
+
+ eapply_user
+
+ sed \
+ -e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
+ -e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
+ -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+ -i build_mozc.py || die
+
+ sed \
+ -e "s/'release_extra_cflags%': \['-O2'\]/'release_extra_cflags%': []/" \
+ -e "s/'debug_extra_cflags%': \['-O0', '-g'\]/'debug_extra_cflags%': []/" \
+ -i gyp/common.gypi || die
+
+ local ar=($(tc-getAR))
+ local cc=($(tc-getCC))
+ local cxx=($(tc-getCXX))
+ local ld=($(tc-getLD))
+ local nm=($(tc-getNM))
+ local readelf=($(tc-getPROG READELF readelf))
+
+ # Use absolute paths. Non-absolute paths are mishandled by GYP.
+ ar[0]=$(type -P ${ar[0]})
+ cc[0]=$(type -P ${cc[0]})
+ cxx[0]=$(type -P ${cxx[0]})
+ ld[0]=$(type -P ${ld[0]})
+ nm[0]=$(type -P ${nm[0]})
+ readelf[0]=$(type -P ${readelf[0]})
+
+ sed \
+ -e "s:<!(which ar):${ar[@]}:" \
+ -e "s:<!(which clang):${cc[@]}:" \
+ -e "s:<!(which clang++):${cxx[@]}:" \
+ -e "s:<!(which ld):${ld[@]}:" \
+ -e "s:<!(which nm):${nm[@]}:" \
+ -e "s:<!(which readelf):${readelf[@]}:" \
+ -i gyp/common.gypi || die
+}
+
+src_configure() {
+ if use debug; then
+ BUILD_TYPE="Debug"
+ else
+ BUILD_TYPE="Release"
+ fi
+
+ local gyp_arguments=()
+
+ if tc-is-gcc; then
+ gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
+ elif tc-is-clang; then
+ gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
+ else
+ gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
+ fi
+
+ gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
+ gyp_arguments+=(-D use_fcitx5=NO)
+ gyp_arguments+=(-D use_libgtest=$(usex test 1 0))
+ gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
+ gyp_arguments+=(-D use_libjsoncpp=$(usex test 1 0))
+ gyp_arguments+=(-D use_libprotobuf=1)
+ gyp_arguments+=(-D use_libzinnia=$(usex gui 1 0))
+ gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
+
+ gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
+ gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
+
+ if use handwriting-tegaki; then
+ gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model")
+ elif use handwriting-tomoe; then
+ gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model")
+ fi
+
+ if use ibus; then
+ gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
+ gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
+ fi
+
+ unset AR CC CXX LD NM READELF
+
+ execute "${PYTHON}" build_mozc.py gyp \
+ --gypdir="${EPREFIX}/usr/bin" \
+ --server_dir="${EPREFIX}/usr/libexec/mozc" \
+ --verbose \
+ $(usex gui "" --noqt) \
+ -- "${gyp_arguments[@]}" || die "Configuration failed"
+}
+
+src_compile() {
+ local targets=(server/server.gyp:mozc_server)
+ if use emacs; then
+ targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
+ fi
+ if use fcitx4; then
+ targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
+ fi
+ if use gui; then
+ targets+=(gui/gui.gyp:mozc_tool)
+ fi
+ if use ibus; then
+ targets+=(unix/ibus/ibus.gyp:ibus_mozc)
+ fi
+ if use renderer; then
+ targets+=(renderer/renderer.gyp:mozc_renderer)
+ fi
+ if use test; then
+ targets+=(gyp/tests.gyp:unittests)
+ fi
+
+ execute "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} -v "${targets[@]}" || die "Building failed"
+
+ if use emacs; then
+ elisp-compile unix/emacs/*.el
+ fi
+}
+
+src_test() {
+ execute "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 || die "Testing failed"
+}
+
+src_install() {
+ exeinto /usr/libexec/mozc
+ doexe out_linux/${BUILD_TYPE}/mozc_server
+
+ if use gui; then
+ doexe out_linux/${BUILD_TYPE}/mozc_tool
+ fi
+
+ if use renderer; then
+ doexe out_linux/${BUILD_TYPE}/mozc_renderer
+ fi
+
+ insinto /usr/libexec/mozc/documents
+ doins data/installer/credits_en.html
+
+ if use emacs; then
+ dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
+ elisp-install ${PN} unix/emacs/*.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
+ fi
+
+ if use fcitx4; then
+ exeinto /usr/$(get_libdir)/fcitx
+ doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
+
+ insinto /usr/share/fcitx/addon
+ doins unix/fcitx/fcitx-mozc.conf
+
+ insinto /usr/share/fcitx/inputmethod
+ doins unix/fcitx/mozc.conf
+
+ insinto /usr/share/fcitx/mozc/icon
+ newins data/images/product_icon_32bpp-128.png mozc.png
+ local image
+ for image in data/images/unix/ui-*.png; do
+ newins "${image}" "mozc-${image#data/images/unix/ui-}"
+ done
+
+ local locale mo_file
+ for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
+ locale="${mo_file##*/}"
+ locale="${locale%.mo}"
+ insinto /usr/share/locale/${locale}/LC_MESSAGES
+ newins "${mo_file}" fcitx-mozc.mo
+ done
+ fi
+
+ if use ibus; then
+ exeinto /usr/libexec
+ newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
+
+ insinto /usr/share/ibus/component
+ doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
+
+ insinto /usr/share/ibus-mozc
+ newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
+ local image
+ for image in data/images/unix/ui-*.png; do
+ newins "${image}" "${image#data/images/unix/ui-}"
+ done
+ fi
+}
+
+pkg_postinst() {
+ if use emacs; then
+ elisp-site-regen
+
+ elog "USAGE IN EMACS"
+ elog
+ elog "mozc-mode is minor mode to input Japanese text using Mozc server."
+ elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
+ elog
+ elog "In order to use mozc-mode by default, the following settings should be added to"
+ elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
+ elog
+ elog " (require 'mozc)"
+ elog " (set-language-environment \"Japanese\")"
+ elog " (setq default-input-method \"japanese-mozc\")"
+ elog
+ elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
+ elog "by default) will enable mozc-mode."
+ elog
+ elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
+ elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
+ fi
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2018-05-22 18:24 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2018-05-22 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 4f112befe295283850661f0d6b0cb2cd68cb4b1b
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Tue May 22 01:59:30 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue May 22 18:23:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f112bef
app-i18n/mozc: Stabilize 2.23.2815.102 on amd64/x86.
app-i18n/mozc/mozc-2.23.2815.102.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index d24cd9f07a0..de335e87e8d 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -34,7 +34,7 @@ fi
# japanese-usage-dictionary: BSD-2
LICENSE="BSD BSD-2 ipadic public-domain unicode"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2019-04-19 16:39 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2019-04-19 16:39 UTC (permalink / raw
To: gentoo-commits
commit: f255bdc22ea3380091702991bd3cf58eb87c5186
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Apr 18 17:29:33 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 16:39:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f255bdc2
app-i18n/mozc: Use EAPI="7".
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
app-i18n/mozc/mozc-2.23.2815.102.ebuild | 24 ++++++++++++++++--------
app-i18n/mozc/mozc-9999.ebuild | 24 ++++++++++++++++--------
2 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index 73baeb4cc28..21a1291f1ea 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2010-2019 Arfrever Frehtes Taifersar Arahesis and others
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
PYTHON_COMPAT=(python2_7)
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
@@ -38,9 +38,19 @@ KEYWORDS="amd64 ~ppc64 x86"
IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
+BDEPEND="${PYTHON_DEPS}
+ >=dev-libs/protobuf-3.0.0
+ dev-util/gyp
+ dev-util/ninja
+ virtual/pkgconfig
+ emacs? ( virtual/emacs )
+ fcitx4? ( sys-devel/gettext )"
RDEPEND=">=dev-libs/protobuf-3.0.0:=
emacs? ( virtual/emacs )
- fcitx4? ( app-i18n/fcitx:4 )
+ fcitx4? (
+ app-i18n/fcitx:4
+ virtual/libintl
+ )
gui? (
app-i18n/zinnia
dev-qt/qtcore:5
@@ -61,10 +71,6 @@ RDEPEND=">=dev-libs/protobuf-3.0.0:=
x11-libs/pango
)"
DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/gyp
- dev-util/ninja
- virtual/pkgconfig
test? (
>=dev-cpp/gtest-1.8.0
dev-libs/jsoncpp
@@ -319,5 +325,7 @@ pkg_postinst() {
}
pkg_postrm() {
- use emacs && elisp-site-regen
+ if use emacs; then
+ elisp-site-regen
+ fi
}
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index b51359f01fb..7876d9ed378 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2010-2019 Arfrever Frehtes Taifersar Arahesis and others
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
PYTHON_COMPAT=(python2_7)
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
@@ -38,9 +38,19 @@ KEYWORDS=""
IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
+BDEPEND="${PYTHON_DEPS}
+ >=dev-libs/protobuf-3.0.0
+ dev-util/gyp
+ dev-util/ninja
+ virtual/pkgconfig
+ emacs? ( virtual/emacs )
+ fcitx4? ( sys-devel/gettext )"
RDEPEND=">=dev-libs/protobuf-3.0.0:=
emacs? ( virtual/emacs )
- fcitx4? ( app-i18n/fcitx:4 )
+ fcitx4? (
+ app-i18n/fcitx:4
+ virtual/libintl
+ )
gui? (
app-i18n/zinnia
dev-qt/qtcore:5
@@ -61,10 +71,6 @@ RDEPEND=">=dev-libs/protobuf-3.0.0:=
x11-libs/pango
)"
DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/gyp
- dev-util/ninja
- virtual/pkgconfig
test? (
>=dev-cpp/gtest-1.8.0
dev-libs/jsoncpp
@@ -318,5 +324,7 @@ pkg_postinst() {
}
pkg_postrm() {
- use emacs && elisp-site-regen
+ if use emacs; then
+ elisp-site-regen
+ fi
}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2019-08-09 18:39 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2019-08-09 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 982d87215db538ef5b4324eb28bbafdad65750f0
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Aug 9 17:33:08 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Aug 9 18:39:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=982d8721
app-i18n/mozc: Use simplified form of copyright line.
Fixes: https://bugs.gentoo.org/691648
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
app-i18n/mozc/mozc-2.23.2815.102.ebuild | 2 +-
app-i18n/mozc/mozc-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index d4572c6e970..f1f48646e70 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2019 Arfrever Frehtes Taifersar Arahesis and others
+# Copyright 2010-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index 144d03b4d78..e60cc342803 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2019 Arfrever Frehtes Taifersar Arahesis and others
+# Copyright 2010-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2019-08-16 17:03 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2019-08-16 17:03 UTC (permalink / raw
To: gentoo-commits
commit: a848a07475e8e468d270a8e646545b2b70b9b43b
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Aug 15 18:28:49 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 17:02:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a848a074
app-i18n/mozc: Set RESTRICT="!test? ( test )".
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
app-i18n/mozc/mozc-2.23.2815.102.ebuild | 1 +
app-i18n/mozc/mozc-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index f1f48646e70..3aed7d8c7b6 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -37,6 +37,7 @@ SLOT="0"
KEYWORDS="amd64 ~ppc64 x86"
IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
+RESTRICT="!test? ( test )"
BDEPEND="${PYTHON_DEPS}
>=dev-libs/protobuf-3.0.0
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index e60cc342803..85d5fbb98be 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -37,6 +37,7 @@ SLOT="0"
KEYWORDS=""
IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
+RESTRICT="!test? ( test )"
BDEPEND="${PYTHON_DEPS}
>=dev-libs/protobuf-3.0.0
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2020-07-04 13:53 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2020-07-04 13:53 UTC (permalink / raw
To: gentoo-commits
commit: c5bfd537fd245ded44b825cc3d7d309cadb9867e
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jul 2 14:21:05 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jul 4 13:52:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5bfd537
app-i18n/mozc: ~ARM64 keywording (bug #730282).
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
app-i18n/mozc/mozc-2.23.2815.102.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index 8a55204d5db..d8322fd20ea 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -34,7 +34,7 @@ fi
# japanese-usage-dictionary: BSD-2
LICENSE="BSD BSD-2 ipadic public-domain unicode"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2020-10-20 20:35 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2020-10-20 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 48a41b08e7953b60d17ab3a27425a8b55a2ee639
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Tue Oct 20 02:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 20:35:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48a41b08
app-i18n/mozc: Drop support for Python 3.6. Add support for Python 3.9.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
app-i18n/mozc/mozc-2.23.2815.102.ebuild | 2 +-
app-i18n/mozc/mozc-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index 828d6b1e8d6..3964c794c42 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index 615bd291481..bfc9bcea950 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2021-04-05 19:06 Mike Gilbert
0 siblings, 0 replies; 41+ messages in thread
From: Mike Gilbert @ 2021-04-05 19:06 UTC (permalink / raw
To: gentoo-commits
commit: c7090a1909f414b0b391e778a20d9d31efd75bbd
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun Apr 4 01:00:00 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 5 19:06:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7090a19
app-i18n/mozc: 2.26.4220: Depend on =dev-cpp/abseil-cpp-20200923*.
Bug: https://bugs.gentoo.org/779877
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
index d6d44a3758f..3c1b215306e 100644
--- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
+++ b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2020 Gentoo Authors
+# Copyright 2010-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -53,7 +53,7 @@ BDEPEND="$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
virtual/pkgconfig
emacs? ( app-editors/emacs:* )
fcitx4? ( sys-devel/gettext )"
-DEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)]
+DEPEND="=dev-cpp/abseil-cpp-20200923*[cxx17(+)]
>=dev-libs/protobuf-3.0.0:=
fcitx4? (
app-i18n/fcitx:4
@@ -79,7 +79,7 @@ DEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)]
>=dev-cpp/gtest-1.8.0
dev-libs/jsoncpp
)"
-RDEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)]
+RDEPEND="=dev-cpp/abseil-cpp-20200923*[cxx17(+)]
>=dev-libs/protobuf-3.0.0:=
emacs? ( app-editors/emacs:* )
fcitx4? (
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2021-04-27 22:02 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2021-04-27 22:02 UTC (permalink / raw
To: gentoo-commits
commit: a603db3893ebd264b33212a7b1903a205b23abe4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 22:01:36 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 22:02:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a603db38
app-i18n/mozc: Keyword 2.26.4220_p20201212102434_p20201219202429 arm64, #730282
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
index 3c1b215306e..e833a2cfb26 100644
--- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
+++ b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
@@ -41,7 +41,7 @@ fi
# japanese-usage-dictionary: BSD-2
LICENSE="BSD BSD-2 ipadic public-domain unicode"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="debug emacs fcitx4 +gui ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2021-05-25 11:10 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2021-05-25 11:10 UTC (permalink / raw
To: gentoo-commits
commit: ad673e6582a83d98581afcbc6a1ffa9cb05666cf
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 25 11:10:21 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 25 11:10:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad673e65
app-i18n/mozc: Stabilize 2.26.4220_p20201212102434_p20201219202429 amd64, #790389
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
index 012a22ae09c..d840eb56323 100644
--- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
+++ b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
@@ -41,7 +41,7 @@ fi
# japanese-usage-dictionary: BSD-2
LICENSE="BSD BSD-2 ipadic public-domain unicode"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
IUSE="debug emacs fcitx4 +gui ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2021-05-25 11:10 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2021-05-25 11:10 UTC (permalink / raw
To: gentoo-commits
commit: dc279f2fe18e9df661a75d0b978e159618c88c8e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 25 11:09:27 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 25 11:10:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc279f2f
app-i18n/mozc: Stabilize 2.26.4220_p20201212102434_p20201219202429 x86, #790389
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
index e833a2cfb26..012a22ae09c 100644
--- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
+++ b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
@@ -41,7 +41,7 @@ fi
# japanese-usage-dictionary: BSD-2
LICENSE="BSD BSD-2 ipadic public-domain unicode"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
IUSE="debug emacs fcitx4 +gui ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2021-12-10 0:29 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2021-12-10 0:29 UTC (permalink / raw
To: gentoo-commits
commit: c4c3366c68e5d9313db9c41b76c8641c52bd10aa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 10 00:29:21 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 10 00:29:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4c3366c
app-i18n/mozc: depend on older protobuf
Bug: https://bugs.gentoo.org/828527
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{mozc-2.23.2815.102.ebuild => mozc-2.23.2815.102-r1.ebuild} | 6 +++---
...ild => mozc-2.26.4220_p20201212102434_p20201219202429-r1.ebuild} | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102-r1.ebuild
similarity index 99%
rename from app-i18n/mozc/mozc-2.23.2815.102.ebuild
rename to app-i18n/mozc/mozc-2.23.2815.102-r1.ebuild
index 08be8f8c45aa..0d8162f9bcdb 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2020 Gentoo Authors
+# Copyright 2010-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -41,13 +41,13 @@ REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwritin
RESTRICT="!test? ( test )"
BDEPEND="${PYTHON_DEPS}
- >=dev-libs/protobuf-3.0.0
+ <dev-libs/protobuf-3.19
dev-util/gyp
dev-util/ninja
virtual/pkgconfig
emacs? ( app-editors/emacs:* )
fcitx4? ( sys-devel/gettext )"
-RDEPEND=">=dev-libs/protobuf-3.0.0:=
+RDEPEND="<dev-libs/protobuf-3.19:=
emacs? ( app-editors/emacs:* )
fcitx4? (
app-i18n/fcitx:4
diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429-r1.ebuild
similarity index 99%
rename from app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
rename to app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429-r1.ebuild
index d840eb56323a..dd114a8b310c 100644
--- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
+++ b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429-r1.ebuild
@@ -47,14 +47,14 @@ REQUIRED_USE="|| ( emacs fcitx4 ibus )"
RESTRICT="!test? ( test )"
BDEPEND="$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
- >=dev-libs/protobuf-3.0.0
+ <dev-libs/protobuf-3.19
dev-util/gyp
dev-util/ninja
virtual/pkgconfig
emacs? ( app-editors/emacs:* )
fcitx4? ( sys-devel/gettext )"
DEPEND="=dev-cpp/abseil-cpp-20200923*[cxx17(+)]
- >=dev-libs/protobuf-3.0.0:=
+ <dev-libs/protobuf-3.19:=
fcitx4? (
app-i18n/fcitx:4
virtual/libintl
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2022-01-29 15:20 Yixun Lan
0 siblings, 0 replies; 41+ messages in thread
From: Yixun Lan @ 2022-01-29 15:20 UTC (permalink / raw
To: gentoo-commits
commit: 57fa9afa0c21d48c99e86263b3af95bc33068a6c
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Jan 28 00:00:00 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 29 15:18:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57fa9afa
app-i18n/mozc: Use EAPI="8"
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
app-i18n/mozc/mozc-2.23.2815.102.ebuild | 2 +-
app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index 07c327fea709..b859d8cf38a2 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -1,7 +1,7 @@
# Copyright 2010-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
PYTHON_COMPAT=( python3_{8..10} )
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
index 8e6ad82d5b17..8ac56d51c502 100644
--- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
+++ b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
@@ -1,7 +1,7 @@
# Copyright 2010-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
PYTHON_COMPAT=( python3_{8..10} )
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
@@ -134,7 +134,7 @@ src_unpack() {
if use fcitx4; then
unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz
- mv mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN}
+ mv mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN} || die
fi
fi
}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2022-01-29 15:20 Yixun Lan
0 siblings, 0 replies; 41+ messages in thread
From: Yixun Lan @ 2022-01-29 15:20 UTC (permalink / raw
To: gentoo-commits
commit: 0be644e7108b894dec965287110fed4d7c598919
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jan 20 01:00:00 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 29 15:18:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be644e7
app-i18n/mozc: Add support for Python 3.10
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
app-i18n/mozc/mozc-2.23.2815.102.ebuild | 2 +-
app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index 88ce0b3c1c22..07c327fea709 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python3_{8..10} )
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
index 305c552cc6f5..8e6ad82d5b17 100644
--- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
+++ b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python3_{8..10} )
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2022-03-09 8:59 Jakov Smolić
0 siblings, 0 replies; 41+ messages in thread
From: Jakov Smolić @ 2022-03-09 8:59 UTC (permalink / raw
To: gentoo-commits
commit: f71e2b0902ba37d98bd13f8c3fcf0c553eb8f666
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 08:58:36 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 08:58:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f71e2b09
app-i18n/mozc: drop 2.23.2815.102
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
app-i18n/mozc/Manifest | 4 -
app-i18n/mozc/mozc-2.23.2815.102.ebuild | 369 --------------------------------
2 files changed, 373 deletions(-)
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index c9793aee241a..eb3863c7a745 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,7 +1,3 @@
-DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B 709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3 SHA512 e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0
DIST fcitx-mozc-2.26.4220-20201219202429.tar.gz 37174759 BLAKE2B 3f320523103ee7a35a763f6613889e282e8a654db8ef11b5a1168db12611387e300621f015977875ffec3c10c055e36b3cb525a1e8559013f3ac42bc5b0cc296 SHA512 823e64267aa69e4d30dd7408f946a54072994f9a2d68691a3d393b216a15e70fd28bcb24705f9d9f483a2291517c48c5a1aeda893d2315f9a1d9cd352fb3feb2
-DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
DIST japanese-usage-dictionary-20180701040110.tar.gz 71285 BLAKE2B dfad056a1d5061b6764f583da15b9ad60a3c4421cee0430c4665d1c2779a64f9b31473c1746a3e2b9bda5167349432e51dcf7d4d48f75fde9543e9c16ff74c0d SHA512 68b4d3f52dd6cd4f00a8012a870b4f5929519cd69815b1729f3881d1f964802308f4aa101e236824b4c0f832183a9e8097437ed620403f2a652f126e7cdc1eb3
-DIST mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch 40296 BLAKE2B 982f43fa68031eb0f779ec4d034fef838a4fce7834291db889c9edffba3df4acd5bfdf187dd4a52ee8fd0714de943f9d5112070cd69502e1449dab4dbf8543b2 SHA512 6e05b2f22663ddbfb24a8344928ec24c0b4cf523728c1623367970b8f263142af95c056c82d0827414833d5b9f26c3a024a04a688851021601a5cbcc1474e754
-DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
DIST mozc-2.26.4220-20201212102434.tar.gz 37106063 BLAKE2B 7d3c236809c8feb017f35e3f7a9b024ac34204f483c69913a2d1ae6b771054548f7f81afde35ed3a6887c9f7503584cee0fc646653fc7cde6fd015158de9c3d3 SHA512 9d87947b9b9256a3cc66cb23ab6caf4b6974142090b0d315c101bdc700fd289c259d09cb7f02f5f9e7462f48d652cd2d5b4822a645751fdcaed88b939520c429
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
deleted file mode 100644
index b859d8cf38a2..000000000000
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 2010-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/google/mozc"
- EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
-else
- MOZC_GIT_REVISION="afb03ddfe72dde4cf2409863a3bfea160f7a66d8"
- JAPANESE_USAGE_DICTIONARY_GIT_REVISION="e5b3425575734c323e1d947009dd74709437b684"
- JAPANESE_USAGE_DICTIONARY_DATE="20120416091336"
- FCITX_PATCH_VERSION="2.23.2815.102.1"
-fi
-
-DESCRIPTION="Mozc - Japanese input method editor"
-HOMEPAGE="https://github.com/google/mozc"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz
- https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
- https://dev.gentoo.org/~juippis/distfiles/tmp/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
- fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )"
-fi
-
-# Mozc: BSD
-# src/data/dictionary_oss: ipadic, public-domain
-# src/data/unicode: unicode
-# japanese-usage-dictionary: BSD-2
-LICENSE="BSD BSD-2 ipadic public-domain unicode"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
-REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
- >=dev-libs/protobuf-3.0.0
- dev-util/gyp
- dev-util/ninja
- virtual/pkgconfig
- emacs? ( app-editors/emacs:* )
- fcitx4? ( sys-devel/gettext )"
-RDEPEND=">=dev-libs/protobuf-3.0.0:=
- emacs? ( app-editors/emacs:* )
- fcitx4? (
- app-i18n/fcitx:4
- virtual/libintl
- )
- gui? (
- app-i18n/zinnia
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- handwriting-tegaki? ( app-i18n/tegaki-zinnia-japanese )
- handwriting-tomoe? ( app-i18n/zinnia-tomoe )
- )
- ibus? (
- >=app-i18n/ibus-1.4.1
- dev-libs/glib:2
- x11-libs/libxcb
- )
- renderer? (
- dev-libs/glib:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/pango
- )"
-DEPEND="${RDEPEND}
- test? (
- >=dev-cpp/gtest-1.8.0
- dev-libs/jsoncpp
- )"
-
-S="${WORKDIR}/${P}/src"
-
-SITEFILE="50${PN}-gentoo.el"
-
-execute() {
- einfo "$@"
- "$@"
-}
-
-src_unpack() {
- if [[ "${PV}" == "9999" ]]; then
- git-r3_src_unpack
-
- if use fcitx4; then
- local EGIT_SUBMODULES=()
- git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
- git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
- fi
- else
- unpack ${P}.tar.gz
- mv mozc-${MOZC_GIT_REVISION} ${P} || die
-
- unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
- cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
- fi
-}
-
-src_prepare() {
- eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-python-3_1.patch"
- eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-python-3_2.patch"
- eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-python-3_3.patch"
- eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-python-3_4.patch"
- eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
- eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
- eapply -p2 "${DISTDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
- eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-protobuf-3.18.patch"
- eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-environmental_variables.patch"
- eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
- eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-server_path_check.patch"
- eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
- eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
-
- if use fcitx4; then
- if [[ "${PV}" == "9999" ]]; then
- cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
- else
- eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch"
- fi
- fi
-
- eapply_user
-
- sed \
- -e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
- -e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
- -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
- -i build_mozc.py || die
-
- sed \
- -e "s/'release_extra_cflags%': \['-O2'\]/'release_extra_cflags%': []/" \
- -e "s/'debug_extra_cflags%': \['-O0', '-g'\]/'debug_extra_cflags%': []/" \
- -i gyp/common.gypi || die
-
- local ar=($(tc-getAR))
- local cc=($(tc-getCC))
- local cxx=($(tc-getCXX))
- local ld=($(tc-getLD))
- local nm=($(tc-getNM))
- local readelf=($(tc-getPROG READELF readelf))
-
- # Use absolute paths. Non-absolute paths are mishandled by GYP.
- ar[0]=$(type -P ${ar[0]})
- cc[0]=$(type -P ${cc[0]})
- cxx[0]=$(type -P ${cxx[0]})
- ld[0]=$(type -P ${ld[0]})
- nm[0]=$(type -P ${nm[0]})
- readelf[0]=$(type -P ${readelf[0]})
-
- sed \
- -e "s:<!(which ar):${ar[@]}:" \
- -e "s:<!(which clang):${cc[@]}:" \
- -e "s:<!(which clang++):${cxx[@]}:" \
- -e "s:<!(which ld):${ld[@]}:" \
- -e "s:<!(which nm):${nm[@]}:" \
- -e "s:<!(which readelf):${readelf[@]}:" \
- -i gyp/common.gypi || die
-}
-
-src_configure() {
- if use debug; then
- BUILD_TYPE="Debug"
- else
- BUILD_TYPE="Release"
- fi
-
- local gyp_arguments=()
-
- if tc-is-gcc; then
- gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
- elif tc-is-clang; then
- gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
- else
- gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
- fi
-
- gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
- gyp_arguments+=(-D use_fcitx5=NO)
- gyp_arguments+=(-D use_libgtest=$(usex test 1 0))
- gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
- gyp_arguments+=(-D use_libjsoncpp=$(usex test 1 0))
- gyp_arguments+=(-D use_libprotobuf=1)
- gyp_arguments+=(-D use_libzinnia=$(usex gui 1 0))
- gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
-
- gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
- gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
-
- if use handwriting-tegaki; then
- gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model")
- elif use handwriting-tomoe; then
- gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model")
- fi
-
- if use ibus; then
- gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
- gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
- fi
-
- unset AR CC CXX LD NM READELF
-
- execute "${PYTHON}" build_mozc.py gyp \
- --gypdir="${EPREFIX}/usr/bin" \
- --server_dir="${EPREFIX}/usr/libexec/mozc" \
- --verbose \
- $(usex gui "" --noqt) \
- -- "${gyp_arguments[@]}" || die "Configuration failed"
-}
-
-src_compile() {
- local targets=(server/server.gyp:mozc_server)
- if use emacs; then
- targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
- fi
- if use fcitx4; then
- targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
- fi
- if use gui; then
- targets+=(gui/gui.gyp:mozc_tool)
- fi
- if use ibus; then
- targets+=(unix/ibus/ibus.gyp:ibus_mozc)
- fi
- if use renderer; then
- targets+=(renderer/renderer.gyp:mozc_renderer)
- fi
- if use test; then
- targets+=(gyp/tests.gyp:unittests)
- fi
-
- execute "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} -v "${targets[@]}" || die "Building failed"
-
- if use emacs; then
- elisp-compile unix/emacs/*.el
- fi
-}
-
-src_test() {
- execute "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 || die "Testing failed"
-}
-
-src_install() {
- exeinto /usr/libexec/mozc
- doexe out_linux/${BUILD_TYPE}/mozc_server
-
- if use gui; then
- doexe out_linux/${BUILD_TYPE}/mozc_tool
- fi
-
- if use renderer; then
- doexe out_linux/${BUILD_TYPE}/mozc_renderer
- fi
-
- insinto /usr/libexec/mozc/documents
- doins data/installer/credits_en.html
-
- if use emacs; then
- dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
- elisp-install ${PN} unix/emacs/*.{el,elc}
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
- fi
-
- if use fcitx4; then
- exeinto /usr/$(get_libdir)/fcitx
- doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
-
- insinto /usr/share/fcitx/addon
- doins unix/fcitx/fcitx-mozc.conf
-
- insinto /usr/share/fcitx/inputmethod
- doins unix/fcitx/mozc.conf
-
- insinto /usr/share/fcitx/mozc/icon
- newins data/images/product_icon_32bpp-128.png mozc.png
- local image
- for image in data/images/unix/ui-*.png; do
- newins "${image}" "mozc-${image#data/images/unix/ui-}"
- done
-
- local locale mo_file
- for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
- locale="${mo_file##*/}"
- locale="${locale%.mo}"
- insinto /usr/share/locale/${locale}/LC_MESSAGES
- newins "${mo_file}" fcitx-mozc.mo
- done
- fi
-
- if use ibus; then
- exeinto /usr/libexec
- newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
-
- insinto /usr/share/ibus/component
- doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
-
- insinto /usr/share/ibus-mozc
- newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
- local image
- for image in data/images/unix/ui-*.png; do
- newins "${image}" "${image#data/images/unix/ui-}"
- done
- fi
-}
-
-pkg_postinst() {
- elog
- elog "ENVIRONMENTAL VARIABLES"
- elog
- elog "MOZC_SERVER_DIRECTORY"
- elog " Mozc server directory"
- elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc\""
- elog "MOZC_DOCUMENTS_DIRECTORY"
- elog " Mozc documents directory"
- elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\""
- elog "MOZC_CONFIGURATION_DIRECTORY"
- elog " Mozc configuration directory"
- elog " Value used by default: \"~/.mozc\""
- if use gui; then
- elog "MOZC_ZINNIA_MODEL_FILE"
- elog " Zinnia handwriting recognition model file"
- if use handwriting-tegaki; then
- elog " Value used by default: \"${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model\""
- elif use handwriting-tomoe; then
- elog " Value used by default: \"${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model\""
- fi
- elog " Potential values:"
- elog " \"${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model\""
- elog " \"${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model\""
- fi
- elog
- if use emacs; then
- elog
- elog "USAGE IN EMACS"
- elog
- elog "mozc-mode is minor mode to input Japanese text using Mozc server."
- elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
- elog
- elog "In order to use mozc-mode by default, the following settings should be added to"
- elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
- elog
- elog " (require 'mozc)"
- elog " (set-language-environment \"Japanese\")"
- elog " (setq default-input-method \"japanese-mozc\")"
- elog
- elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
- elog "by default) will enable mozc-mode."
- elog
- elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
- elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
- elog
-
- elisp-site-regen
- fi
-}
-
-pkg_postrm() {
- if use emacs; then
- elisp-site-regen
- fi
-}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2022-03-09 23:36 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2022-03-09 23:36 UTC (permalink / raw
To: gentoo-commits
commit: 43d1e8f15d147eaae284bedf2226b3dc4732da3d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 23:18:28 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 23:18:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d1e8f1
app-i18n/mozc: fix UnusedLocalUse
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/mozc/metadata.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index db3170ba53c6..7fd885c8d62f 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -12,8 +12,6 @@
<use>
<flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag>
<flag name="gui">Install graphical user interface tool (mozc_tool)</flag>
- <flag name="handwriting-tegaki">Use handwriting recognition model from <pkg>app-i18n/tegaki-zinnia-japanese</pkg> by default</flag>
- <flag name="handwriting-tomoe">Use handwriting recognition model from <pkg>app-i18n/zinnia-tomoe</pkg> by default</flag>
<flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>
<flag name="renderer">Enable native candidate window</flag>
</use>
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2022-05-01 7:30 Michał Górny
0 siblings, 0 replies; 41+ messages in thread
From: Michał Górny @ 2022-05-01 7:30 UTC (permalink / raw
To: gentoo-commits
commit: 6fd847bea31e7ccf5796271e0ba51237d3a6378d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 10:39:14 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 1 07:30:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd847be
app-i18n/mozc: Prepare for makeopts_jobs default inf change
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild | 2 +-
app-i18n/mozc/mozc-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
index 8ac56d51c502..7d999af9f7b8 100644
--- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
+++ b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
@@ -159,7 +159,7 @@ src_prepare() {
sed \
-e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
-e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
- -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+ -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs "${MAKEOPTS}" 999)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
-i build_mozc.py || die
local ar=($(tc-getAR))
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index 911bfa462a43..31dff85e7c27 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -159,7 +159,7 @@ src_prepare() {
sed \
-e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
-e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
- -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+ -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs "${MAKEOPTS}" 999)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
-i build_mozc.py || die
local ar=($(tc-getAR))
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2022-07-02 14:07 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2022-07-02 14:07 UTC (permalink / raw
To: gentoo-commits
commit: b72993b4129d7cd1840b5940ea96957476f00cb2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 2 14:06:11 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 14:07:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b72993b4
app-i18n/mozc: sync live
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/mozc/mozc-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index 31dff85e7c27..5dfce42e1918 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2022-12-25 20:02 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2022-12-25 20:02 UTC (permalink / raw
To: gentoo-commits
commit: 669a3f32c87981d710784a2f0ee1c97f3ecc32de
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 19:59:50 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 20:01:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=669a3f32
app-i18n/mozc: drop unmaintained broken out-of-sync 9999 ebuild
Bug: https://bugs.gentoo.org/843227
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-i18n/mozc/mozc-9999.ebuild | 380 -----------------------------------------
1 file changed, 380 deletions(-)
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
deleted file mode 100644
index 5dfce42e1918..000000000000
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 2010-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/google/mozc"
- EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
-else
- MOZC_GIT_REVISION=""
- MOZC_DATE="${PV#*_p}"
- MOZC_DATE="${MOZC_DATE%%_p*}"
-
- FCITX_MOZC_GIT_REVISION=""
- FCITX_MOZC_DATE="${PV#*_p}"
- FCITX_MOZC_DATE="${FCITX_MOZC_DATE#*_p}"
- FCITX_MOZC_DATE="${FCITX_MOZC_DATE%%_p*}"
-
- JAPANESE_USAGE_DICTIONARY_GIT_REVISION=""
- JAPANESE_USAGE_DICTIONARY_DATE=""
-fi
-
-DESCRIPTION="Mozc - Japanese input method editor"
-HOMEPAGE="https://github.com/google/mozc"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
- https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
- fcitx4? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )"
-fi
-
-# Mozc: BSD
-# src/data/dictionary_oss: ipadic, public-domain
-# src/data/unicode: unicode
-# japanese-usage-dictionary: BSD-2
-LICENSE="BSD BSD-2 ipadic public-domain unicode"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug emacs fcitx4 +gui ibus renderer test"
-REQUIRED_USE="|| ( emacs fcitx4 ibus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
- >=dev-libs/protobuf-3.0.0
- dev-util/gyp
- dev-util/ninja
- virtual/pkgconfig
- emacs? ( app-editors/emacs:* )
- fcitx4? ( sys-devel/gettext )"
-DEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)]
- >=dev-libs/protobuf-3.0.0:=
- fcitx4? (
- app-i18n/fcitx:4
- virtual/libintl
- )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- ibus? (
- >=app-i18n/ibus-1.4.1
- dev-libs/glib:2
- x11-libs/libxcb
- )
- renderer? (
- dev-libs/glib:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/pango
- )
- test? (
- >=dev-cpp/gtest-1.8.0
- dev-libs/jsoncpp
- )"
-RDEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)]
- >=dev-libs/protobuf-3.0.0:=
- emacs? ( app-editors/emacs:* )
- fcitx4? (
- app-i18n/fcitx:4
- virtual/libintl
- )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- ibus? (
- >=app-i18n/ibus-1.4.1
- dev-libs/glib:2
- x11-libs/libxcb
- )
- renderer? (
- dev-libs/glib:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/pango
- )"
-
-S="${WORKDIR}/${P}/src"
-
-SITEFILE="50${PN}-gentoo.el"
-
-execute() {
- einfo "$@"
- "$@"
-}
-
-python_check_deps() {
- has_version -b "dev-python/six[${PYTHON_USEDEP}]"
-}
-
-src_unpack() {
- if [[ "${PV}" == "9999" ]]; then
- git-r3_src_unpack
-
- if use fcitx4; then
- local EGIT_SUBMODULES=()
- git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
- git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
- fi
- else
- unpack ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
- mv mozc-${MOZC_GIT_REVISION} ${P} || die
-
- unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
- cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
-
- if use fcitx4; then
- unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz
- mv mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN}
- fi
- fi
-}
-
-src_prepare() {
- if use fcitx4; then
- cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
- fi
-
- pushd "${WORKDIR}/${P}" > /dev/null || die
-
- eapply "${FILESDIR}/${PN}-2.26.4220-system_abseil-cpp.patch"
- eapply "${FILESDIR}/${PN}-2.26.4220-system_gtest.patch"
- eapply "${FILESDIR}/${PN}-2.26.4220-system_jsoncpp.patch"
- eapply "${FILESDIR}/${PN}-2.26.4220-environmental_variables.patch"
- eapply "${FILESDIR}/${PN}-2.26.4220-server_path_check.patch"
-
- eapply_user
-
- popd > /dev/null || die
-
- sed \
- -e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
- -e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
- -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs "${MAKEOPTS}" 999)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
- -i build_mozc.py || die
-
- local ar=($(tc-getAR))
- local cc=($(tc-getCC))
- local cxx=($(tc-getCXX))
- local ld=($(tc-getLD))
- local nm=($(tc-getNM))
- local readelf=($(tc-getREADELF))
-
- # Use absolute paths. Non-absolute paths are mishandled by GYP.
- ar[0]=$(type -P ${ar[0]})
- cc[0]=$(type -P ${cc[0]})
- cxx[0]=$(type -P ${cxx[0]})
- ld[0]=$(type -P ${ld[0]})
- nm[0]=$(type -P ${nm[0]})
- readelf[0]=$(type -P ${readelf[0]})
-
- sed \
- -e "s:<!(which ar):${ar[@]}:" \
- -e "s:<!(which clang):${cc[@]}:" \
- -e "s:<!(which clang++):${cxx[@]}:" \
- -e "s:<!(which ld):${ld[@]}:" \
- -e "s:<!(which nm):${nm[@]}:" \
- -e "s:<!(which readelf):${readelf[@]}:" \
- -i gyp/common.gypi || die
-
- # https://github.com/google/mozc/issues/489
- sed \
- -e "/'-lc++'/d" \
- -e "/'-stdlib=libc++'/d" \
- -i gyp/common.gypi || die
-}
-
-src_configure() {
- if use debug; then
- BUILD_TYPE="Debug"
- else
- BUILD_TYPE="Release"
- fi
-
- local gyp_arguments=()
-
- if tc-is-gcc; then
- gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
- elif tc-is-clang; then
- gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
- else
- gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
- fi
-
- gyp_arguments+=(-D debug_extra_cflags=)
- gyp_arguments+=(-D release_extra_cflags=)
-
- gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
- gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
- gyp_arguments+=(-D use_libprotobuf=1)
- gyp_arguments+=(-D use_system_abseil_cpp=1)
- gyp_arguments+=(-D use_system_gtest=$(usex test 1 0))
- gyp_arguments+=(-D use_system_jsoncpp=$(usex test 1 0))
- gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
-
- gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
- gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
-
- if use ibus; then
- gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
- gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
- fi
-
- unset AR CC CXX LD NM READELF
-
- execute "${PYTHON}" build_mozc.py gyp \
- --gypdir="${EPREFIX}/usr/bin" \
- --server_dir="${EPREFIX}/usr/libexec/mozc" \
- --verbose \
- $(usex gui "" --noqt) \
- -- "${gyp_arguments[@]}" || die "Configuration failed"
-}
-
-src_compile() {
- local targets=(server/server.gyp:mozc_server)
- if use emacs; then
- targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
- fi
- if use fcitx4; then
- targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
- fi
- if use gui; then
- targets+=(gui/gui.gyp:mozc_tool)
- fi
- if use ibus; then
- targets+=(unix/ibus/ibus.gyp:ibus_mozc)
- fi
- if use renderer; then
- targets+=(renderer/renderer.gyp:mozc_renderer)
- fi
- if use test; then
- targets+=(gyp/tests.gyp:unittests)
- fi
-
- execute "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} -v "${targets[@]}" || die "Building failed"
-
- if use emacs; then
- elisp-compile unix/emacs/*.el
- fi
-}
-
-src_test() {
- execute "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 || die "Testing failed"
-}
-
-src_install() {
- exeinto /usr/libexec/mozc
- doexe out_linux/${BUILD_TYPE}/mozc_server
-
- if use gui; then
- doexe out_linux/${BUILD_TYPE}/mozc_tool
- fi
-
- if use renderer; then
- doexe out_linux/${BUILD_TYPE}/mozc_renderer
- fi
-
- insinto /usr/libexec/mozc/documents
- doins data/installer/credits_en.html
-
- if use emacs; then
- dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
- elisp-install ${PN} unix/emacs/*.{el,elc}
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
- fi
-
- if use fcitx4; then
- exeinto /usr/$(get_libdir)/fcitx
- doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
-
- insinto /usr/share/fcitx/addon
- doins unix/fcitx/fcitx-mozc.conf
-
- insinto /usr/share/fcitx/inputmethod
- doins unix/fcitx/mozc.conf
-
- insinto /usr/share/fcitx/mozc/icon
- newins data/images/product_icon_32bpp-128.png mozc.png
- local image
- for image in ../../fcitx-${PN}/src/data/images/unix/ui-*.png; do
- newins "${image}" "mozc-${image#../../fcitx-${PN}/src/data/images/unix/ui-}"
- done
-
- local locale mo_file
- for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
- locale="${mo_file##*/}"
- locale="${locale%.mo}"
- insinto /usr/share/locale/${locale}/LC_MESSAGES
- newins "${mo_file}" fcitx-mozc.mo
- done
- fi
-
- if use ibus; then
- exeinto /usr/libexec
- newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
-
- insinto /usr/share/ibus/component
- doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
-
- insinto /usr/share/ibus-mozc
- newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
- local image
- for image in data/images/unix/ui-*.png; do
- newins "${image}" "${image#data/images/unix/ui-}"
- done
- fi
-}
-
-pkg_postinst() {
- elog
- elog "ENVIRONMENTAL VARIABLES"
- elog
- elog "MOZC_SERVER_DIRECTORY"
- elog " Mozc server directory"
- elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc\""
- elog "MOZC_DOCUMENTS_DIRECTORY"
- elog " Mozc documents directory"
- elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\""
- elog "MOZC_CONFIGURATION_DIRECTORY"
- elog " Mozc configuration directory"
- elog " Value used by default: \"~/.mozc\""
- elog
- if use emacs; then
- elog
- elog "USAGE IN EMACS"
- elog
- elog "mozc-mode is minor mode to input Japanese text using Mozc server."
- elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
- elog
- elog "In order to use mozc-mode by default, the following settings should be added to"
- elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
- elog
- elog " (require 'mozc)"
- elog " (set-language-environment \"Japanese\")"
- elog " (setq default-input-method \"japanese-mozc\")"
- elog
- elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
- elog "by default) will enable mozc-mode."
- elog
- elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
- elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
- elog
-
- elisp-site-regen
- fi
-}
-
-pkg_postrm() {
- if use emacs; then
- elisp-site-regen
- fi
-}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2023-06-09 7:35 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2023-06-09 7:35 UTC (permalink / raw
To: gentoo-commits
commit: 7c6d22d36d75b98c922f4dd8b75b9b2977924574
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 9 07:32:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 07:35:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c6d22d3
app-i18n/mozc: use savedconfig
Closes: https://bugs.gentoo.org/877765
Closes: https://bugs.gentoo.org/843227
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/mozc/metadata.xml | 1 -
app-i18n/mozc/mozc-2.28.5029.102.ebuild | 37 ++++++++++++++++++---------------
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index 36b5449ea94d..7fd885c8d62f 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -13,7 +13,6 @@
<flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag>
<flag name="gui">Install graphical user interface tool (mozc_tool)</flag>
<flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>
- <flag name="mozcdic-ut">Enable support for Mozc UT Dictionaries. Must be placed at compile time at /tmp/mozcdic-ut.txt</flag>
<flag name="renderer">Enable native candidate window</flag>
</use>
<upstream>
diff --git a/app-i18n/mozc/mozc-2.28.5029.102.ebuild b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
index 366320f57f8f..d12f141d9a99 100644
--- a/app-i18n/mozc/mozc-2.28.5029.102.ebuild
+++ b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
PYTHON_COMPAT=( python3_{10..11} )
-inherit edo elisp-common multiprocessing python-any-r1 toolchain-funcs desktop xdg
+inherit desktop edo elisp-common multiprocessing python-any-r1 savedconfig toolchain-funcs xdg
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
@@ -46,18 +46,21 @@ fi
LICENSE="BSD BSD-2 ipadic public-domain unicode"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug emacs fcitx4 +gui ibus renderer test mozcdic-ut"
+IUSE="debug emacs fcitx4 +gui ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus )"
RESTRICT="!test? ( test )"
-BDEPEND="$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
>=dev-libs/protobuf-3.0.0
dev-util/gyp
dev-util/ninja
virtual/pkgconfig
emacs? ( app-editors/emacs:* )
- fcitx4? ( sys-devel/gettext )"
-DEPEND="dev-cpp/abseil-cpp:=[cxx17(+)]
+ fcitx4? ( sys-devel/gettext )
+"
+DEPEND="
+ dev-cpp/abseil-cpp:=[cxx17(+)]
>=dev-libs/protobuf-3.0.0:=
fcitx4? (
app-i18n/fcitx:4
@@ -83,7 +86,8 @@ DEPEND="dev-cpp/abseil-cpp:=[cxx17(+)]
>=dev-cpp/gtest-1.8.0
dev-libs/jsoncpp
)"
-RDEPEND="dev-cpp/abseil-cpp:=[cxx17(+)]
+RDEPEND="
+ dev-cpp/abseil-cpp:=[cxx17(+)]
>=dev-libs/protobuf-3.0.0:=
emacs? ( app-editors/emacs:* )
fcitx4? (
@@ -105,7 +109,8 @@ RDEPEND="dev-cpp/abseil-cpp:=[cxx17(+)]
x11-libs/cairo
x11-libs/gtk+:2
x11-libs/pango
- )"
+ )
+"
S="${WORKDIR}/${P}/src"
@@ -116,7 +121,7 @@ PATCHES=(
)
python_check_deps() {
- has_version -b "dev-python/six[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/six[${PYTHON_USEDEP}]"
}
src_unpack() {
@@ -189,15 +194,11 @@ src_prepare() {
-e "/'-stdlib=libc++'/d" \
-i gyp/common.gypi || die
- # Add mozcdic-ut
- if use mozcdic-ut; then
- if [ ! -f "${BROOT}"/tmp/mozcdic-ut.txt ]; then
- ewarn "No mozcdic-ut.txt found. Please place your customized mozcdic-ut.txt in /tmp/.";
- die
- else
- einfo "mozcdic-ut.txt found. Adding to mozc dictionary..."
- cat "${BROOT}"/tmp/mozcdic-ut.txt >> "${WORKDIR}/${P}/src/data/dictionary_oss/dictionary00.txt" || die
- fi
+ # bug #877765
+ restore_config mozcdic-ut.txt
+ if [[ -f /mozcdic-ut.txt && -s mozcdic-ut.txt ]]; then
+ einfo "mozcdic-ut.txt found. Adding to mozc dictionary..."
+ cat mozcdic-ut.txt >> "${WORKDIR}/${P}/src/data/dictionary_oss/dictionary00.txt" || die
fi
}
@@ -287,6 +288,8 @@ src_install() {
exeinto /usr/libexec/mozc
doexe out_linux/${BUILD_TYPE}/mozc_server
+ [[ -s mozcdic-ut.txt ]] && save_config mozcdic-ut.txt
+
if use gui; then
doexe out_linux/${BUILD_TYPE}/mozc_tool
fi
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2023-06-09 7:35 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2023-06-09 7:35 UTC (permalink / raw
To: gentoo-commits
commit: a1e1efbebd56623d5929e79d96bc318daa99ce75
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 9 07:07:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 07:33:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e1efbe
app-i18n/mozc: add 2.28.5029.102
See the discussion on the bug for the full details.
While at it, I've ported to edo. I'm likely to change the mozcdic-ut setup to
use savedconfig as well.
Thanks-to: Jack Daniels
Thanks-to: gertoe
Thanks-to: Martin Sekera
Bug: https://bugs.gentoo.org/877765
Closes: https://bugs.gentoo.org/843227
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/mozc/Manifest | 3 +
app-i18n/mozc/metadata.xml | 1 +
app-i18n/mozc/mozc-2.28.5029.102.ebuild | 394 ++++++++++++++++++++++++++++++++
3 files changed, 398 insertions(+)
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index eb3863c7a745..76f3cad6b368 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,3 +1,6 @@
DIST fcitx-mozc-2.26.4220-20201219202429.tar.gz 37174759 BLAKE2B 3f320523103ee7a35a763f6613889e282e8a654db8ef11b5a1168db12611387e300621f015977875ffec3c10c055e36b3cb525a1e8559013f3ac42bc5b0cc296 SHA512 823e64267aa69e4d30dd7408f946a54072994f9a2d68691a3d393b216a15e70fd28bcb24705f9d9f483a2291517c48c5a1aeda893d2315f9a1d9cd352fb3feb2
+DIST fcitx-mozc-2.28.5029.102-2.28.5029.102.tar.gz 37246575 BLAKE2B 54381968e33870f2d9f769184cf49428548d04de66e767140c8f053fad7873f1b2e3b02be81ce54e51b824d2c9cd971da37bff8b60efe60c9e2c748ff298afbd SHA512 4962e9505b79d4680a260c257719ba2486a6fe127018298758728faa9535504bc2dd6b1bfb430ac2982cb377cda52c145430531afd0968f49f91d366fdd43d92
DIST japanese-usage-dictionary-20180701040110.tar.gz 71285 BLAKE2B dfad056a1d5061b6764f583da15b9ad60a3c4421cee0430c4665d1c2779a64f9b31473c1746a3e2b9bda5167349432e51dcf7d4d48f75fde9543e9c16ff74c0d SHA512 68b4d3f52dd6cd4f00a8012a870b4f5929519cd69815b1729f3881d1f964802308f4aa101e236824b4c0f832183a9e8097437ed620403f2a652f126e7cdc1eb3
DIST mozc-2.26.4220-20201212102434.tar.gz 37106063 BLAKE2B 7d3c236809c8feb017f35e3f7a9b024ac34204f483c69913a2d1ae6b771054548f7f81afde35ed3a6887c9f7503584cee0fc646653fc7cde6fd015158de9c3d3 SHA512 9d87947b9b9256a3cc66cb23ab6caf4b6974142090b0d315c101bdc700fd289c259d09cb7f02f5f9e7462f48d652cd2d5b4822a645751fdcaed88b939520c429
+DIST mozc-2.28.5029.102-2.28.5029.102.tar.gz 37247099 BLAKE2B 4bb528991102d34a26321e6fa00a73cc83cb103e0b765f1ebb837dd6894387288b13ed75cc255003d07d6f0c4a82f963684fa4f2bd9b5043cfaddb57a5f5cef0 SHA512 b20aa45757db92f66d1c135eacf907b4cec937226a8d09e5f9f6768ae22a6b8464e3b75276773ce55413f2002ffcc3d8cae136e7fd3acfc0733e48bccf848d5b
+DIST mozc-2.28.5029.102-patches.tar.xz 224380 BLAKE2B 377d2cac6ec8a9c90661f10c0b105d8347ca8080ec43cee3dfd4660feadfe2d9b204d6e4b9e22bd11a5fdbbf26e7f6f298b703b88fb1621ea1847741408c1953 SHA512 5836a19ea68de271475b3ca1efce928b0ad012c96ff7ecdc4474b05daf8b8df022203eb46ec839b76e7d50be7a75b8f278d534d762fac0e612a8f09ae13c7c16
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index 7fd885c8d62f..36b5449ea94d 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -13,6 +13,7 @@
<flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag>
<flag name="gui">Install graphical user interface tool (mozc_tool)</flag>
<flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>
+ <flag name="mozcdic-ut">Enable support for Mozc UT Dictionaries. Must be placed at compile time at /tmp/mozcdic-ut.txt</flag>
<flag name="renderer">Enable native candidate window</flag>
</use>
<upstream>
diff --git a/app-i18n/mozc/mozc-2.28.5029.102.ebuild b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
new file mode 100644
index 000000000000..366320f57f8f
--- /dev/null
+++ b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
@@ -0,0 +1,394 @@
+# Copyright 2010-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit edo elisp-common multiprocessing python-any-r1 toolchain-funcs desktop xdg
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/google/mozc"
+ EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
+else
+ MOZC_GIT_REVISION="305e9a7374254148474d067c46d55a4ee6081837"
+ MOZC_DATE="${PV#*_p}"
+ MOZC_DATE="${MOZC_DATE%%_p*}"
+
+ FCITX_MOZC_GIT_REVISION="242b4f703cba27d4ff4dc123c713a478f964e001"
+ FCITX_MOZC_DATE="${PV#*_p}"
+ FCITX_MOZC_DATE="${FCITX_MOZC_DATE#*_p}"
+ FCITX_MOZC_DATE="${FCITX_MOZC_DATE%%_p*}"
+
+ JAPANESE_USAGE_DICTIONARY_GIT_REVISION="a4a66772e33746b91e99caceecced9a28507e925"
+ JAPANESE_USAGE_DICTIONARY_DATE="20180701040110"
+fi
+
+DESCRIPTION="Mozc - Japanese input method editor"
+HOMEPAGE="https://github.com/google/mozc"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="
+ https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
+ https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+ https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.28.5029.102-patches.tar.xz
+ fcitx4? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )
+ "
+fi
+
+# Mozc: BSD
+# src/data/dictionary_oss: ipadic, public-domain
+# src/data/unicode: unicode
+# japanese-usage-dictionary: BSD-2
+LICENSE="BSD BSD-2 ipadic public-domain unicode"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug emacs fcitx4 +gui ibus renderer test mozcdic-ut"
+REQUIRED_USE="|| ( emacs fcitx4 ibus )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+ >=dev-libs/protobuf-3.0.0
+ dev-util/gyp
+ dev-util/ninja
+ virtual/pkgconfig
+ emacs? ( app-editors/emacs:* )
+ fcitx4? ( sys-devel/gettext )"
+DEPEND="dev-cpp/abseil-cpp:=[cxx17(+)]
+ >=dev-libs/protobuf-3.0.0:=
+ fcitx4? (
+ app-i18n/fcitx:4
+ virtual/libintl
+ )
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ ibus? (
+ >=app-i18n/ibus-1.4.1
+ dev-libs/glib:2
+ x11-libs/libxcb
+ )
+ renderer? (
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gtk+:2
+ x11-libs/pango
+ )
+ test? (
+ >=dev-cpp/gtest-1.8.0
+ dev-libs/jsoncpp
+ )"
+RDEPEND="dev-cpp/abseil-cpp:=[cxx17(+)]
+ >=dev-libs/protobuf-3.0.0:=
+ emacs? ( app-editors/emacs:* )
+ fcitx4? (
+ app-i18n/fcitx:4
+ virtual/libintl
+ )
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ ibus? (
+ >=app-i18n/ibus-1.4.1
+ dev-libs/glib:2
+ x11-libs/libxcb
+ )
+ renderer? (
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gtk+:2
+ x11-libs/pango
+ )"
+
+S="${WORKDIR}/${P}/src"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+ "${WORKDIR}"/mozc-2.28.5029.102-patches
+)
+
+python_check_deps() {
+ has_version -b "dev-python/six[${PYTHON_USEDEP}]"
+}
+
+src_unpack() {
+ if [[ "${PV}" == "9999" ]]; then
+ git-r3_src_unpack
+
+ if use fcitx4; then
+ local EGIT_SUBMODULES=()
+ git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
+ git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
+ fi
+ else
+ unpack ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
+ mv mozc-${MOZC_GIT_REVISION} ${P} || die
+
+ unpack ${PN}-2.28.5029.102-patches.tar.xz
+
+ unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
+ cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
+
+ if use fcitx4; then
+ unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz
+ mv mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN} || die
+ fi
+ fi
+}
+
+src_prepare() {
+ if use fcitx4; then
+ cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
+ fi
+
+ pushd "${WORKDIR}/${P}" > /dev/null || die
+ default
+ popd > /dev/null || die
+
+ sed \
+ -e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
+ -e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
+ -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs "${MAKEOPTS}" 999)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+ -i build_mozc.py || die
+
+ local ar=($(tc-getAR))
+ local cc=($(tc-getCC))
+ local cxx=($(tc-getCXX))
+ local ld=($(tc-getLD))
+ local nm=($(tc-getNM))
+ local readelf=($(tc-getREADELF))
+
+ # Use absolute paths. Non-absolute paths are mishandled by GYP.
+ ar[0]=$(type -P ${ar[0]})
+ cc[0]=$(type -P ${cc[0]})
+ cxx[0]=$(type -P ${cxx[0]})
+ ld[0]=$(type -P ${ld[0]})
+ nm[0]=$(type -P ${nm[0]})
+ readelf[0]=$(type -P ${readelf[0]})
+
+ sed \
+ -e "s:<!(which ar):${ar[@]}:" \
+ -e "s:<!(which clang):${cc[@]}:" \
+ -e "s:<!(which clang++):${cxx[@]}:" \
+ -e "s:<!(which ld):${ld[@]}:" \
+ -e "s:<!(which nm):${nm[@]}:" \
+ -e "s:<!(which readelf):${readelf[@]}:" \
+ -i gyp/common.gypi || die
+
+ # https://github.com/google/mozc/issues/489
+ sed \
+ -e "/'-lc++'/d" \
+ -e "/'-stdlib=libc++'/d" \
+ -i gyp/common.gypi || die
+
+ # Add mozcdic-ut
+ if use mozcdic-ut; then
+ if [ ! -f "${BROOT}"/tmp/mozcdic-ut.txt ]; then
+ ewarn "No mozcdic-ut.txt found. Please place your customized mozcdic-ut.txt in /tmp/.";
+ die
+ else
+ einfo "mozcdic-ut.txt found. Adding to mozc dictionary..."
+ cat "${BROOT}"/tmp/mozcdic-ut.txt >> "${WORKDIR}/${P}/src/data/dictionary_oss/dictionary00.txt" || die
+ fi
+ fi
+}
+
+src_configure() {
+ if use debug; then
+ BUILD_TYPE="Debug"
+ else
+ BUILD_TYPE="Release"
+ fi
+
+ local gyp_arguments=()
+
+ if tc-is-gcc; then
+ gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
+ elif tc-is-clang; then
+ gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
+ else
+ gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
+ fi
+
+ gyp_arguments+=(-D debug_extra_cflags=)
+ gyp_arguments+=(-D release_extra_cflags=)
+
+ gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
+ gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
+ gyp_arguments+=(-D use_libprotobuf=1)
+ gyp_arguments+=(-D use_system_abseil_cpp=1)
+ gyp_arguments+=(-D use_system_gtest=$(usex test 1 0))
+ gyp_arguments+=(-D use_system_jsoncpp=$(usex test 1 0))
+ gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
+
+ gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
+ gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
+
+ if use ibus; then
+ gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
+ gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
+ fi
+
+ unset AR CC CXX LD NM READELF
+
+ edo "${PYTHON}" build_mozc.py gyp \
+ --gypdir="${EPREFIX}/usr/bin" \
+ --server_dir="${EPREFIX}/usr/libexec/mozc" \
+ --verbose \
+ $(usex gui "" --noqt) \
+ -- "${gyp_arguments[@]}"
+}
+
+src_compile() {
+ local targets=(server/server.gyp:mozc_server)
+ if use emacs; then
+ targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
+ fi
+ if use fcitx4; then
+ targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
+ fi
+ if use gui; then
+ targets+=(gui/gui.gyp:mozc_tool)
+ fi
+ if use ibus; then
+ targets+=(unix/ibus/ibus.gyp:ibus_mozc)
+ fi
+ if use renderer; then
+ targets+=(renderer/renderer.gyp:mozc_renderer)
+ fi
+ if use test; then
+ targets+=(gyp/tests.gyp:unittests)
+ fi
+
+ if use ibus; then
+ GYP_IBUS_FLAG="--use_gyp_for_ibus_build"
+ fi
+
+ edo "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} ${GYP_IBUS_FLAG} -v "${targets[@]}"
+
+ if use emacs; then
+ elisp-compile unix/emacs/*.el
+ fi
+}
+
+src_test() {
+ edo "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1
+}
+
+src_install() {
+ exeinto /usr/libexec/mozc
+ doexe out_linux/${BUILD_TYPE}/mozc_server
+
+ if use gui; then
+ doexe out_linux/${BUILD_TYPE}/mozc_tool
+ fi
+
+ if use renderer; then
+ doexe out_linux/${BUILD_TYPE}/mozc_renderer
+ fi
+
+ insinto /usr/libexec/mozc/documents
+ doins data/installer/credits_en.html
+
+ if use emacs; then
+ dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
+ elisp-install ${PN} unix/emacs/*.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
+ fi
+
+ if use fcitx4; then
+ exeinto /usr/$(get_libdir)/fcitx
+ doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
+
+ insinto /usr/share/fcitx/addon
+ doins unix/fcitx/fcitx-mozc.conf
+
+ insinto /usr/share/fcitx/inputmethod
+ doins unix/fcitx/mozc.conf
+
+ insinto /usr/share/fcitx/mozc/icon
+ newins data/images/product_icon_32bpp-128.png mozc.png
+ local image
+ for image in ../../fcitx-${PN}/src/data/images/unix/ui-*.png; do
+ newins "${image}" "mozc-${image#../../fcitx-${PN}/src/data/images/unix/ui-}"
+ done
+
+ local locale mo_file
+ for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
+ locale="${mo_file##*/}"
+ locale="${locale%.mo}"
+ insinto /usr/share/locale/${locale}/LC_MESSAGES
+ newins "${mo_file}" fcitx-mozc.mo
+ done
+ fi
+
+ if use ibus; then
+ exeinto /usr/libexec
+ newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
+
+ insinto /usr/share/ibus/component
+ doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
+
+ insinto /usr/share/ibus-mozc
+ newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
+ local image
+ for image in data/images/unix/ui-*.png; do
+ newins "${image}" "${image#data/images/unix/ui-}"
+ done
+ fi
+}
+
+pkg_postinst() {
+ elog
+ elog "ENVIRONMENTAL VARIABLES"
+ elog
+ elog "MOZC_SERVER_DIRECTORY"
+ elog " Mozc server directory"
+ elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc\""
+ elog "MOZC_DOCUMENTS_DIRECTORY"
+ elog " Mozc documents directory"
+ elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\""
+ elog "MOZC_CONFIGURATION_DIRECTORY"
+ elog " Mozc configuration directory"
+ elog " Value used by default: \"~/.mozc\""
+ elog
+ if use emacs; then
+ elog
+ elog "USAGE IN EMACS"
+ elog
+ elog "mozc-mode is minor mode to input Japanese text using Mozc server."
+ elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
+ elog
+ elog "In order to use mozc-mode by default, the following settings should be added to"
+ elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
+ elog
+ elog " (require 'mozc)"
+ elog " (set-language-environment \"Japanese\")"
+ elog " (setq default-input-method \"japanese-mozc\")"
+ elog
+ elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
+ elog "by default) will enable mozc-mode."
+ elog
+ elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
+ elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
+ elog
+
+ elisp-site-regen
+ fi
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ if use emacs; then
+ elisp-site-regen
+ fi
+ xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2023-06-09 7:35 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2023-06-09 7:35 UTC (permalink / raw
To: gentoo-commits
commit: 417e0ea64a1f1f7ee56e598aee501e33fdc95fb9
Author: Juanjie Xi <strangemk3 <AT> gmail <DOT> com>
AuthorDate: Mon May 29 06:42:00 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 07:33:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=417e0ea6
app-i18n/mozc: enable py3.11
Closes: https://bugs.gentoo.org/896558
Signed-off-by: Juanjie Xi <strangemk3 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31206
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
index 263f8861cfa9..e787f078abac 100644
--- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
+++ b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2023-06-09 7:37 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2023-06-09 7:37 UTC (permalink / raw
To: gentoo-commits
commit: 94b2b818f0b5682d65a3126b50b50bf568a640ac
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 9 07:37:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 07:37:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94b2b818
app-i18n/mozc: add min. abseil version
Bug: https://bugs.gentoo.org/843227
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/mozc/mozc-2.28.5029.102.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.28.5029.102.ebuild b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
index d12f141d9a99..ee6de0134b29 100644
--- a/app-i18n/mozc/mozc-2.28.5029.102.ebuild
+++ b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
@@ -60,7 +60,7 @@ BDEPEND="
fcitx4? ( sys-devel/gettext )
"
DEPEND="
- dev-cpp/abseil-cpp:=[cxx17(+)]
+ >=dev-cpp/abseil-cpp-20211102.0-r2:=[cxx17(+)]
>=dev-libs/protobuf-3.0.0:=
fcitx4? (
app-i18n/fcitx:4
@@ -87,7 +87,7 @@ DEPEND="
dev-libs/jsoncpp
)"
RDEPEND="
- dev-cpp/abseil-cpp:=[cxx17(+)]
+ >=dev-cpp/abseil-cpp-20211102.0-r2:=[cxx17(+)]
>=dev-libs/protobuf-3.0.0:=
emacs? ( app-editors/emacs:* )
fcitx4? (
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2023-09-07 20:04 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2023-09-07 20:04 UTC (permalink / raw
To: gentoo-commits
commit: 0dc10f88dfc64cb37485b0f95907acacceb78a9f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 7 20:04:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 7 20:04:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc10f88
app-i18n/mozc: Stabilize 2.28.5029.102 amd64, #908374
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/mozc/mozc-2.28.5029.102.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/mozc/mozc-2.28.5029.102.ebuild b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
index a6790b3d1213..190b0e28acf0 100644
--- a/app-i18n/mozc/mozc-2.28.5029.102.ebuild
+++ b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
@@ -45,7 +45,7 @@ fi
# japanese-usage-dictionary: BSD-2
LICENSE="BSD BSD-2 ipadic public-domain unicode"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
IUSE="debug emacs fcitx4 +gui ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2023-12-07 16:25 Arthur Zamarin
0 siblings, 0 replies; 41+ messages in thread
From: Arthur Zamarin @ 2023-12-07 16:25 UTC (permalink / raw
To: gentoo-commits
commit: 1bc8d13b6849ccc5ca5718d64484839900429ca9
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Thu Dec 7 05:49:38 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 7 16:25:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc8d13b
app-i18n/mozc: Stabilize 2.28.5029.102 x86, #908374
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-i18n/mozc/mozc-2.28.5029.102.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/mozc/mozc-2.28.5029.102.ebuild b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
index 190b0e28acf0..58ea6ff7c9ee 100644
--- a/app-i18n/mozc/mozc-2.28.5029.102.ebuild
+++ b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
@@ -45,7 +45,7 @@ fi
# japanese-usage-dictionary: BSD-2
LICENSE="BSD BSD-2 ipadic public-domain unicode"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
IUSE="debug emacs fcitx4 +gui ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2023-12-12 13:39 Andreas Sturmlechner
0 siblings, 0 replies; 41+ messages in thread
From: Andreas Sturmlechner @ 2023-12-12 13:39 UTC (permalink / raw
To: gentoo-commits
commit: 08dfd6e1ed50374939b378dd4b0867f87b0e7354
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 13:14:00 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 13:39:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08dfd6e1
app-i18n/mozc: drop 2.26.4220_p20201212102434_p20201219202429
Closes: https://bugs.gentoo.org/908374
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-i18n/mozc/Manifest | 2 -
....26.4220_p20201212102434_p20201219202429.ebuild | 380 ---------------------
2 files changed, 382 deletions(-)
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 76f3cad6b368..29bb052622e7 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -1,6 +1,4 @@
-DIST fcitx-mozc-2.26.4220-20201219202429.tar.gz 37174759 BLAKE2B 3f320523103ee7a35a763f6613889e282e8a654db8ef11b5a1168db12611387e300621f015977875ffec3c10c055e36b3cb525a1e8559013f3ac42bc5b0cc296 SHA512 823e64267aa69e4d30dd7408f946a54072994f9a2d68691a3d393b216a15e70fd28bcb24705f9d9f483a2291517c48c5a1aeda893d2315f9a1d9cd352fb3feb2
DIST fcitx-mozc-2.28.5029.102-2.28.5029.102.tar.gz 37246575 BLAKE2B 54381968e33870f2d9f769184cf49428548d04de66e767140c8f053fad7873f1b2e3b02be81ce54e51b824d2c9cd971da37bff8b60efe60c9e2c748ff298afbd SHA512 4962e9505b79d4680a260c257719ba2486a6fe127018298758728faa9535504bc2dd6b1bfb430ac2982cb377cda52c145430531afd0968f49f91d366fdd43d92
DIST japanese-usage-dictionary-20180701040110.tar.gz 71285 BLAKE2B dfad056a1d5061b6764f583da15b9ad60a3c4421cee0430c4665d1c2779a64f9b31473c1746a3e2b9bda5167349432e51dcf7d4d48f75fde9543e9c16ff74c0d SHA512 68b4d3f52dd6cd4f00a8012a870b4f5929519cd69815b1729f3881d1f964802308f4aa101e236824b4c0f832183a9e8097437ed620403f2a652f126e7cdc1eb3
-DIST mozc-2.26.4220-20201212102434.tar.gz 37106063 BLAKE2B 7d3c236809c8feb017f35e3f7a9b024ac34204f483c69913a2d1ae6b771054548f7f81afde35ed3a6887c9f7503584cee0fc646653fc7cde6fd015158de9c3d3 SHA512 9d87947b9b9256a3cc66cb23ab6caf4b6974142090b0d315c101bdc700fd289c259d09cb7f02f5f9e7462f48d652cd2d5b4822a645751fdcaed88b939520c429
DIST mozc-2.28.5029.102-2.28.5029.102.tar.gz 37247099 BLAKE2B 4bb528991102d34a26321e6fa00a73cc83cb103e0b765f1ebb837dd6894387288b13ed75cc255003d07d6f0c4a82f963684fa4f2bd9b5043cfaddb57a5f5cef0 SHA512 b20aa45757db92f66d1c135eacf907b4cec937226a8d09e5f9f6768ae22a6b8464e3b75276773ce55413f2002ffcc3d8cae136e7fd3acfc0733e48bccf848d5b
DIST mozc-2.28.5029.102-patches.tar.xz 224380 BLAKE2B 377d2cac6ec8a9c90661f10c0b105d8347ca8080ec43cee3dfd4660feadfe2d9b204d6e4b9e22bd11a5fdbbf26e7f6f298b703b88fb1621ea1847741408c1953 SHA512 5836a19ea68de271475b3ca1efce928b0ad012c96ff7ecdc4474b05daf8b8df022203eb46ec839b76e7d50be7a75b8f278d534d762fac0e612a8f09ae13c7c16
diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild b/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
deleted file mode 100644
index e787f078abac..000000000000
--- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 2010-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/google/mozc"
- EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
-else
- MOZC_GIT_REVISION="9ba59b64d53365c1fe93c1c245b4ec3e35bdadf0"
- MOZC_DATE="${PV#*_p}"
- MOZC_DATE="${MOZC_DATE%%_p*}"
-
- FCITX_MOZC_GIT_REVISION="1ea089debc31ff216473369ad71c08318384ee06"
- FCITX_MOZC_DATE="${PV#*_p}"
- FCITX_MOZC_DATE="${FCITX_MOZC_DATE#*_p}"
- FCITX_MOZC_DATE="${FCITX_MOZC_DATE%%_p*}"
-
- JAPANESE_USAGE_DICTIONARY_GIT_REVISION="a4a66772e33746b91e99caceecced9a28507e925"
- JAPANESE_USAGE_DICTIONARY_DATE="20180701040110"
-fi
-
-DESCRIPTION="Mozc - Japanese input method editor"
-HOMEPAGE="https://github.com/google/mozc"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
- https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
- fcitx4? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )"
-fi
-
-# Mozc: BSD
-# src/data/dictionary_oss: ipadic, public-domain
-# src/data/unicode: unicode
-# japanese-usage-dictionary: BSD-2
-LICENSE="BSD BSD-2 ipadic public-domain unicode"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="debug emacs fcitx4 +gui ibus renderer test"
-REQUIRED_USE="|| ( emacs fcitx4 ibus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
- >=dev-libs/protobuf-3.0.0
- dev-util/gyp
- dev-util/ninja
- virtual/pkgconfig
- emacs? ( app-editors/emacs:* )
- fcitx4? ( sys-devel/gettext )"
-DEPEND="=dev-cpp/abseil-cpp-20200923*[cxx17(+)]
- >=dev-libs/protobuf-3.0.0:=
- fcitx4? (
- app-i18n/fcitx:4
- virtual/libintl
- )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- ibus? (
- >=app-i18n/ibus-1.4.1
- dev-libs/glib:2
- x11-libs/libxcb
- )
- renderer? (
- dev-libs/glib:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/pango
- )
- test? (
- >=dev-cpp/gtest-1.8.0
- dev-libs/jsoncpp
- )"
-RDEPEND="=dev-cpp/abseil-cpp-20200923*[cxx17(+)]
- >=dev-libs/protobuf-3.0.0:=
- emacs? ( app-editors/emacs:* )
- fcitx4? (
- app-i18n/fcitx:4
- virtual/libintl
- )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- ibus? (
- >=app-i18n/ibus-1.4.1
- dev-libs/glib:2
- x11-libs/libxcb
- )
- renderer? (
- dev-libs/glib:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/pango
- )"
-
-S="${WORKDIR}/${P}/src"
-
-SITEFILE="50${PN}-gentoo.el"
-
-execute() {
- einfo "$@"
- "$@"
-}
-
-python_check_deps() {
- has_version -b "dev-python/six[${PYTHON_USEDEP}]"
-}
-
-src_unpack() {
- if [[ "${PV}" == "9999" ]]; then
- git-r3_src_unpack
-
- if use fcitx4; then
- local EGIT_SUBMODULES=()
- git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
- git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
- fi
- else
- unpack ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
- mv mozc-${MOZC_GIT_REVISION} ${P} || die
-
- unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
- cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
-
- if use fcitx4; then
- unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz
- mv mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN} || die
- fi
- fi
-}
-
-src_prepare() {
- if use fcitx4; then
- cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
- fi
-
- pushd "${WORKDIR}/${P}" > /dev/null || die
-
- eapply "${FILESDIR}/${PN}-2.26.4220-system_abseil-cpp.patch"
- eapply "${FILESDIR}/${PN}-2.26.4220-system_gtest.patch"
- eapply "${FILESDIR}/${PN}-2.26.4220-system_jsoncpp.patch"
- eapply "${FILESDIR}/${PN}-2.26.4220-environmental_variables.patch"
- eapply "${FILESDIR}/${PN}-2.26.4220-server_path_check.patch"
-
- eapply_user
-
- popd > /dev/null || die
-
- sed \
- -e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
- -e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
- -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs "${MAKEOPTS}" 999)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
- -i build_mozc.py || die
-
- local ar=($(tc-getAR))
- local cc=($(tc-getCC))
- local cxx=($(tc-getCXX))
- local ld=($(tc-getLD))
- local nm=($(tc-getNM))
- local readelf=($(tc-getREADELF))
-
- # Use absolute paths. Non-absolute paths are mishandled by GYP.
- ar[0]=$(type -P ${ar[0]})
- cc[0]=$(type -P ${cc[0]})
- cxx[0]=$(type -P ${cxx[0]})
- ld[0]=$(type -P ${ld[0]})
- nm[0]=$(type -P ${nm[0]})
- readelf[0]=$(type -P ${readelf[0]})
-
- sed \
- -e "s:<!(which ar):${ar[@]}:" \
- -e "s:<!(which clang):${cc[@]}:" \
- -e "s:<!(which clang++):${cxx[@]}:" \
- -e "s:<!(which ld):${ld[@]}:" \
- -e "s:<!(which nm):${nm[@]}:" \
- -e "s:<!(which readelf):${readelf[@]}:" \
- -i gyp/common.gypi || die
-
- # https://github.com/google/mozc/issues/489
- sed \
- -e "/'-lc++'/d" \
- -e "/'-stdlib=libc++'/d" \
- -i gyp/common.gypi || die
-}
-
-src_configure() {
- if use debug; then
- BUILD_TYPE="Debug"
- else
- BUILD_TYPE="Release"
- fi
-
- local gyp_arguments=()
-
- if tc-is-gcc; then
- gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
- elif tc-is-clang; then
- gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
- else
- gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
- fi
-
- gyp_arguments+=(-D debug_extra_cflags=)
- gyp_arguments+=(-D release_extra_cflags=)
-
- gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
- gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
- gyp_arguments+=(-D use_libprotobuf=1)
- gyp_arguments+=(-D use_system_abseil_cpp=1)
- gyp_arguments+=(-D use_system_gtest=$(usex test 1 0))
- gyp_arguments+=(-D use_system_jsoncpp=$(usex test 1 0))
- gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
-
- gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
- gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
-
- if use ibus; then
- gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
- gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
- fi
-
- unset AR CC CXX LD NM READELF
-
- execute "${PYTHON}" build_mozc.py gyp \
- --gypdir="${EPREFIX}/usr/bin" \
- --server_dir="${EPREFIX}/usr/libexec/mozc" \
- --verbose \
- $(usex gui "" --noqt) \
- -- "${gyp_arguments[@]}" || die "Configuration failed"
-}
-
-src_compile() {
- local targets=(server/server.gyp:mozc_server)
- if use emacs; then
- targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
- fi
- if use fcitx4; then
- targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
- fi
- if use gui; then
- targets+=(gui/gui.gyp:mozc_tool)
- fi
- if use ibus; then
- targets+=(unix/ibus/ibus.gyp:ibus_mozc)
- fi
- if use renderer; then
- targets+=(renderer/renderer.gyp:mozc_renderer)
- fi
- if use test; then
- targets+=(gyp/tests.gyp:unittests)
- fi
-
- execute "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} -v "${targets[@]}" || die "Building failed"
-
- if use emacs; then
- elisp-compile unix/emacs/*.el
- fi
-}
-
-src_test() {
- execute "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 || die "Testing failed"
-}
-
-src_install() {
- exeinto /usr/libexec/mozc
- doexe out_linux/${BUILD_TYPE}/mozc_server
-
- if use gui; then
- doexe out_linux/${BUILD_TYPE}/mozc_tool
- fi
-
- if use renderer; then
- doexe out_linux/${BUILD_TYPE}/mozc_renderer
- fi
-
- insinto /usr/libexec/mozc/documents
- doins data/installer/credits_en.html
-
- if use emacs; then
- dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
- elisp-install ${PN} unix/emacs/*.{el,elc}
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
- fi
-
- if use fcitx4; then
- exeinto /usr/$(get_libdir)/fcitx
- doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
-
- insinto /usr/share/fcitx/addon
- doins unix/fcitx/fcitx-mozc.conf
-
- insinto /usr/share/fcitx/inputmethod
- doins unix/fcitx/mozc.conf
-
- insinto /usr/share/fcitx/mozc/icon
- newins data/images/product_icon_32bpp-128.png mozc.png
- local image
- for image in ../../fcitx-${PN}/src/data/images/unix/ui-*.png; do
- newins "${image}" "mozc-${image#../../fcitx-${PN}/src/data/images/unix/ui-}"
- done
-
- local locale mo_file
- for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
- locale="${mo_file##*/}"
- locale="${locale%.mo}"
- insinto /usr/share/locale/${locale}/LC_MESSAGES
- newins "${mo_file}" fcitx-mozc.mo
- done
- fi
-
- if use ibus; then
- exeinto /usr/libexec
- newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
-
- insinto /usr/share/ibus/component
- doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
-
- insinto /usr/share/ibus-mozc
- newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
- local image
- for image in data/images/unix/ui-*.png; do
- newins "${image}" "${image#data/images/unix/ui-}"
- done
- fi
-}
-
-pkg_postinst() {
- elog
- elog "ENVIRONMENTAL VARIABLES"
- elog
- elog "MOZC_SERVER_DIRECTORY"
- elog " Mozc server directory"
- elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc\""
- elog "MOZC_DOCUMENTS_DIRECTORY"
- elog " Mozc documents directory"
- elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\""
- elog "MOZC_CONFIGURATION_DIRECTORY"
- elog " Mozc configuration directory"
- elog " Value used by default: \"~/.mozc\""
- elog
- if use emacs; then
- elog
- elog "USAGE IN EMACS"
- elog
- elog "mozc-mode is minor mode to input Japanese text using Mozc server."
- elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
- elog
- elog "In order to use mozc-mode by default, the following settings should be added to"
- elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
- elog
- elog " (require 'mozc)"
- elog " (set-language-environment \"Japanese\")"
- elog " (setq default-input-method \"japanese-mozc\")"
- elog
- elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
- elog "by default) will enable mozc-mode."
- elog
- elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
- elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
- elog
-
- elisp-site-regen
- fi
-}
-
-pkg_postrm() {
- if use emacs; then
- elisp-site-regen
- fi
-}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2024-06-30 12:13 Sam James
0 siblings, 0 replies; 41+ messages in thread
From: Sam James @ 2024-06-30 12:13 UTC (permalink / raw
To: gentoo-commits
commit: c3f9a0c688b203db24d86ebab8cdcb0fa91118b0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 12:11:40 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 12:12:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f9a0c6
app-i18n/mozc: enable py3.12
Good enough according to the reports in bug #929378 from users.
Bug: https://bugs.gentoo.org/929378
Closes: https://bugs.gentoo.org/929323
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild | 2 +-
app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild | 2 +-
app-i18n/mozc/mozc-2.28.5029.102.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild b/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild
index 357167817970..c27f47fad0de 100644
--- a/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild
+++ b/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild
@@ -3,7 +3,7 @@
EAPI="8"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit desktop edo elisp-common multiprocessing python-any-r1 savedconfig toolchain-funcs xdg
diff --git a/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild b/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild
index 01ef457b4e61..c86eb2dc6fcb 100644
--- a/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild
+++ b/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild
@@ -3,7 +3,7 @@
EAPI="8"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit desktop edo elisp-common multiprocessing python-any-r1 savedconfig toolchain-funcs xdg
diff --git a/app-i18n/mozc/mozc-2.28.5029.102.ebuild b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
index 3346d832183d..29c8eaac94f4 100644
--- a/app-i18n/mozc/mozc-2.28.5029.102.ebuild
+++ b/app-i18n/mozc/mozc-2.28.5029.102.ebuild
@@ -3,7 +3,7 @@
EAPI="8"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit desktop edo elisp-common multiprocessing python-any-r1 savedconfig toolchain-funcs xdg
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2024-08-28 4:47 WANG Xuerui
0 siblings, 0 replies; 41+ messages in thread
From: WANG Xuerui @ 2024-08-28 4:47 UTC (permalink / raw
To: gentoo-commits
commit: f4b9e7dab3be1b4bbea21797955c765359e89c95
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 09:47:22 2024 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 04:47:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4b9e7da
app-i18n/mozc: drop 2.28.5029.102-r2
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild | 466 -----------------------------
1 file changed, 466 deletions(-)
diff --git a/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild b/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild
deleted file mode 100644
index c86eb2dc6fcb..000000000000
--- a/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild
+++ /dev/null
@@ -1,466 +0,0 @@
-# Copyright 2010-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit desktop edo elisp-common multiprocessing python-any-r1 savedconfig toolchain-funcs xdg
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/google/mozc"
- EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary)
-else
- MOZC_GIT_REVISION="305e9a7374254148474d067c46d55a4ee6081837"
- MOZC_DATE="${PV#*_p}"
- MOZC_DATE="${MOZC_DATE%%_p*}"
-
- FCITX_MOZC_GIT_REVISION="242b4f703cba27d4ff4dc123c713a478f964e001"
- FCITX_MOZC_DATE="${PV#*_p}"
- FCITX_MOZC_DATE="${FCITX_MOZC_DATE#*_p}"
- FCITX_MOZC_DATE="${FCITX_MOZC_DATE%%_p*}"
-
- JAPANESE_USAGE_DICTIONARY_GIT_REVISION="a4a66772e33746b91e99caceecced9a28507e925"
- JAPANESE_USAGE_DICTIONARY_DATE="20180701040110"
-fi
-
-DESCRIPTION="Mozc - Japanese input method editor"
-HOMEPAGE="https://github.com/google/mozc"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
- SRC_URI="
- https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
- https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
- https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.28.5029.102-patches.tar.xz
- fcitx4? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )
- fcitx5? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )
- "
-fi
-
-# Mozc: BSD
-# src/data/dictionary_oss: ipadic, public-domain
-# src/data/unicode: unicode
-# japanese-usage-dictionary: BSD-2
-LICENSE="BSD BSD-2 ipadic public-domain unicode"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug emacs fcitx4 fcitx5 +gui ibus renderer test"
-REQUIRED_USE="|| ( emacs fcitx4 fcitx5 ibus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-build/gyp
- $(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
- >=dev-libs/protobuf-3.0.0
- app-alternatives/ninja
- virtual/pkgconfig
- emacs? ( app-editors/emacs:* )
- fcitx4? ( sys-devel/gettext )
- fcitx5? ( sys-devel/gettext )
-"
-DEPEND="
- >=dev-cpp/abseil-cpp-20230802.0:=[cxx17(+)]
- >=dev-libs/protobuf-3.0.0:=
- fcitx4? (
- app-i18n/fcitx:4
- virtual/libintl
- )
- fcitx5? (
- app-i18n/fcitx:5
- app-i18n/libime
- sys-devel/gettext
- virtual/libintl
- )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- ibus? (
- >=app-i18n/ibus-1.4.1
- dev-libs/glib:2
- x11-libs/libxcb
- )
- renderer? (
- dev-libs/glib:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/pango
- )
- test? (
- >=dev-cpp/gtest-1.8.0
- dev-libs/jsoncpp
- )"
-RDEPEND="
- >=dev-cpp/abseil-cpp-20230802.0:=[cxx17(+)]
- >=dev-libs/protobuf-3.0.0:=
- emacs? ( app-editors/emacs:* )
- fcitx4? (
- app-i18n/fcitx:4
- virtual/libintl
- )
- fcitx5? (
- app-i18n/fcitx:5
- app-i18n/libime
- sys-devel/gettext
- virtual/libintl
- )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- ibus? (
- >=app-i18n/ibus-1.4.1
- dev-libs/glib:2
- x11-libs/libxcb
- )
- renderer? (
- dev-libs/glib:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/pango
- )
-"
-
-S="${WORKDIR}/${P}/src"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
- "${WORKDIR}"/mozc-2.28.5029.102-patches
- "${FILESDIR}"/mozc-2.28.5029.102-abseil.patch
- "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0.patch
-)
-
-python_check_deps() {
- python_has_version "dev-python/six[${PYTHON_USEDEP}]"
-}
-
-src_unpack() {
- if [[ "${PV}" == "9999" ]]; then
- git-r3_src_unpack
-
- if use fcitx4 || use fcitx5; then
- local EGIT_SUBMODULES=()
- git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
- git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
- fi
- if use fcitx5; then
- cp -pr "${WORKDIR}"/fcitx{,5}-mozc || die
- fi
- else
- unpack ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz
- mv mozc-${MOZC_GIT_REVISION} ${P} || die
-
- unpack ${PN}-2.28.5029.102-patches.tar.xz
-
- unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz
- cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die
-
- if use fcitx4 || use fcitx5; then
- unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz
- if use fcitx4; then
- cp -pr mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN} || die
- fi
- if use fcitx5; then
- cp -pr mozc-${FCITX_MOZC_GIT_REVISION} fcitx5-${PN} || die
- fi
- rm -r mozc-${FCITX_MOZC_GIT_REVISION} || die
- fi
- fi
-}
-
-src_prepare() {
- if use fcitx4; then
- cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die
- PATCHES+=( "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch )
- fi
- if use fcitx5; then
- cp -pr "${WORKDIR}/fcitx5-mozc/src/unix/fcitx5" unix || die
- PATCHES+=( "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch )
- fi
-
- pushd "${WORKDIR}/${P}" > /dev/null || die
- default
- popd > /dev/null || die
-
- sed \
- -e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \
- -e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \
- -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs "${MAKEOPTS}" 999)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
- -i build_mozc.py || die
-
- local ar=($(tc-getAR))
- local cc=($(tc-getCC))
- local cxx=($(tc-getCXX))
- local ld=($(tc-getLD))
- local nm=($(tc-getNM))
- local readelf=($(tc-getREADELF))
-
- # Use absolute paths. Non-absolute paths are mishandled by GYP.
- ar[0]=$(type -P ${ar[0]})
- cc[0]=$(type -P ${cc[0]})
- cxx[0]=$(type -P ${cxx[0]})
- ld[0]=$(type -P ${ld[0]})
- nm[0]=$(type -P ${nm[0]})
- readelf[0]=$(type -P ${readelf[0]})
-
- sed \
- -e "s:<!(which ar):${ar[@]}:" \
- -e "s:<!(which clang):${cc[@]}:" \
- -e "s:<!(which clang++):${cxx[@]}:" \
- -e "s:<!(which ld):${ld[@]}:" \
- -e "s:<!(which nm):${nm[@]}:" \
- -e "s:<!(which readelf):${readelf[@]}:" \
- -i gyp/common.gypi || die
-
- # https://github.com/google/mozc/issues/489
- sed \
- -e "/'-lc++'/d" \
- -e "/'-stdlib=libc++'/d" \
- -i gyp/common.gypi || die
-
- # bug #877765
- restore_config mozcdic-ut.txt
- if [[ -f /mozcdic-ut.txt && -s mozcdic-ut.txt ]]; then
- einfo "mozcdic-ut.txt found. Adding to mozc dictionary..."
- cat mozcdic-ut.txt >> "${WORKDIR}/${P}/src/data/dictionary_oss/dictionary00.txt" || die
- fi
-}
-
-src_configure() {
- if use debug; then
- BUILD_TYPE="Debug"
- else
- BUILD_TYPE="Release"
- fi
-
- local gyp_arguments=()
-
- if tc-is-gcc; then
- gyp_arguments+=(-D compiler_host=gcc -D compiler_target=gcc)
- elif tc-is-clang; then
- gyp_arguments+=(-D compiler_host=clang -D compiler_target=clang)
- else
- gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown)
- fi
-
- gyp_arguments+=(-D debug_extra_cflags=)
- gyp_arguments+=(-D release_extra_cflags=)
-
- gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO))
- gyp_arguments+=(-D use_fcitx5=$(usex fcitx5 YES NO))
- gyp_arguments+=(-D use_libibus=$(usex ibus 1 0))
- gyp_arguments+=(-D use_libprotobuf=1)
- gyp_arguments+=(-D use_system_abseil_cpp=1)
- gyp_arguments+=(-D use_system_gtest=$(usex test 1 0))
- gyp_arguments+=(-D use_system_jsoncpp=$(usex test 1 0))
- gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0))
-
- gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc")
- gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents")
-
- if use ibus; then
- gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc")
- gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png")
- fi
-
- unset AR CC CXX LD NM READELF
-
- edo "${PYTHON}" build_mozc.py gyp \
- --gypdir="${EPREFIX}/usr/bin" \
- --server_dir="${EPREFIX}/usr/libexec/mozc" \
- --verbose \
- $(usex gui "" --noqt) \
- -- "${gyp_arguments[@]}"
-}
-
-src_compile() {
- local targets=(server/server.gyp:mozc_server)
- if use emacs; then
- targets+=(unix/emacs/emacs.gyp:mozc_emacs_helper)
- fi
- if use fcitx4; then
- targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc)
- fi
- if use fcitx5; then
- targets+=(unix/fcitx5/fcitx5.gyp:fcitx5-mozc)
- fi
- if use gui; then
- targets+=(gui/gui.gyp:mozc_tool)
- fi
- if use ibus; then
- targets+=(unix/ibus/ibus.gyp:ibus_mozc)
- fi
- if use renderer; then
- targets+=(renderer/renderer.gyp:mozc_renderer)
- fi
- if use test; then
- targets+=(gyp/tests.gyp:unittests)
- fi
-
- if use ibus; then
- GYP_IBUS_FLAG="--use_gyp_for_ibus_build"
- fi
-
- edo "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} ${GYP_IBUS_FLAG} -v "${targets[@]}"
-
- if use emacs; then
- elisp-compile unix/emacs/*.el
- fi
-}
-
-src_test() {
- edo "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1
-}
-
-src_install() {
- exeinto /usr/libexec/mozc
- doexe out_linux/${BUILD_TYPE}/mozc_server
-
- [[ -s mozcdic-ut.txt ]] && save_config mozcdic-ut.txt
-
- if use gui; then
- doexe out_linux/${BUILD_TYPE}/mozc_tool
- fi
-
- if use renderer; then
- doexe out_linux/${BUILD_TYPE}/mozc_renderer
- fi
-
- insinto /usr/libexec/mozc/documents
- doins data/installer/credits_en.html
-
- if use emacs; then
- dobin out_linux/${BUILD_TYPE}/mozc_emacs_helper
- elisp-install ${PN} unix/emacs/*.{el,elc}
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN}
- fi
-
- if use fcitx4; then
- exeinto /usr/$(get_libdir)/fcitx
- doexe out_linux/${BUILD_TYPE}/fcitx-mozc.so
-
- insinto /usr/share/fcitx/addon
- doins unix/fcitx/fcitx-mozc.conf
-
- insinto /usr/share/fcitx/inputmethod
- doins unix/fcitx/mozc.conf
-
- insinto /usr/share/fcitx/mozc/icon
- newins data/images/product_icon_32bpp-128.png mozc.png
- local image
- for image in ../../fcitx-${PN}/src/data/images/unix/ui-*.png; do
- newins "${image}" "mozc-${image#../../fcitx-${PN}/src/data/images/unix/ui-}"
- done
-
- local locale mo_file
- for mo_file in out_linux/${BUILD_TYPE}/gen/unix/fcitx/po/*.mo; do
- locale="${mo_file##*/}"
- locale="${locale%.mo}"
- insinto /usr/share/locale/${locale}/LC_MESSAGES
- newins "${mo_file}" fcitx-mozc.mo
- done
- fi
-
- if use fcitx5; then
- exeinto /usr/$(get_libdir)/fcitx5
- doexe out_linux/${BUILD_TYPE}/fcitx5-mozc.so
-
- insinto /usr/share/fcitx5/addon
- newins unix/fcitx5/mozc-addon.conf mozc.conf
-
- insinto /usr/share/fcitx5/inputmethod
- doins unix/fcitx5/mozc.conf
-
- local orgfcitx5="org.fcitx.Fcitx5.fcitx-mozc"
- newicon -s 128 data/images/product_icon_32bpp-128.png ${orgfcitx5}.png
- newicon -s 128 data/images/product_icon_32bpp-128.png fcitx-mozc.png
- newicon -s 32 data/images/unix/ime_product_icon_opensource-32.png ${orgfcitx5}.png
- newicon -s 32 data/images/unix/ime_product_icon_opensource-32.png fcitx-mozc.png
- for uiimg in ../../fcitx5-mozc/scripts/icons/ui-*.png; do
- dimg=${uiimg#*ui-}
- newicon -s 48 ${uiimg} ${orgfcitx5}-${dimg/_/-}
- newicon -s 48 ${uiimg} fcitx-mozc-${dimg/_/-}
- done
-
- local locale mo_file
- for mo_file in unix/fcitx5/po/*.po; do
- locale="${mo_file##*/}"
- locale="${locale%.po}"
- msgfmt ${mo_file} -o ${mo_file/.po/.mo} || die
- insinto /usr/share/locale/${locale}/LC_MESSAGES
- newins "${mo_file/.po/.mo}" fcitx5-mozc.mo
- done
- msgfmt --xml -d unix/fcitx5/po/ --template unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in -o \
- unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml || die
- insinto /usr/share/metainfo
- doins unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml
- fi
-
- if use ibus; then
- exeinto /usr/libexec
- newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc
-
- insinto /usr/share/ibus/component
- doins out_linux/${BUILD_TYPE}/gen/unix/ibus/mozc.xml
-
- insinto /usr/share/ibus-mozc
- newins data/images/unix/ime_product_icon_opensource-32.png product_icon.png
- local image
- for image in data/images/unix/ui-*.png; do
- newins "${image}" "${image#data/images/unix/ui-}"
- done
- fi
-}
-
-pkg_postinst() {
- elog
- elog "ENVIRONMENTAL VARIABLES"
- elog
- elog "MOZC_SERVER_DIRECTORY"
- elog " Mozc server directory"
- elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc\""
- elog "MOZC_DOCUMENTS_DIRECTORY"
- elog " Mozc documents directory"
- elog " Value used by default: \"${EPREFIX}/usr/libexec/mozc/documents\""
- elog "MOZC_CONFIGURATION_DIRECTORY"
- elog " Mozc configuration directory"
- elog " Value used by default: \"~/.mozc\""
- elog
- if use emacs; then
- elog
- elog "USAGE IN EMACS"
- elog
- elog "mozc-mode is minor mode to input Japanese text using Mozc server."
- elog "mozc-mode can be used via LEIM (Library of Emacs Input Method)."
- elog
- elog "In order to use mozc-mode by default, the following settings should be added to"
- elog "Emacs init file (~/.emacs.d/init.el or ~/.emacs):"
- elog
- elog " (require 'mozc)"
- elog " (set-language-environment \"Japanese\")"
- elog " (setq default-input-method \"japanese-mozc\")"
- elog
- elog "With the above settings, typing C-\\ (which is bound to \"toggle-input-method\""
- elog "by default) will enable mozc-mode."
- elog
- elog "Alternatively, at run time, after loading mozc.el, mozc-mode can be activated by"
- elog "calling \"set-input-method\" and entering \"japanese-mozc\"."
- elog
-
- elisp-site-regen
- fi
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- if use emacs; then
- elisp-site-regen
- fi
- xdg_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 41+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/
@ 2024-09-02 6:00 WANG Xuerui
0 siblings, 0 replies; 41+ messages in thread
From: WANG Xuerui @ 2024-09-02 6:00 UTC (permalink / raw
To: gentoo-commits
commit: a4c1d6ae064cc132bc733ce97d2910c3d183abba
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 06:45:00 2024 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Mon Sep 2 05:50:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c1d6ae
app-i18n/mozc: keyword 2.28.5029.102-r3 for ~loong
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
app-i18n/mozc/mozc-2.28.5029.102-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/mozc/mozc-2.28.5029.102-r3.ebuild b/app-i18n/mozc/mozc-2.28.5029.102-r3.ebuild
index 880a0b720655..9e3e0a65db7d 100644
--- a/app-i18n/mozc/mozc-2.28.5029.102-r3.ebuild
+++ b/app-i18n/mozc/mozc-2.28.5029.102-r3.ebuild
@@ -46,7 +46,7 @@ fi
# japanese-usage-dictionary: BSD-2
LICENSE="BSD BSD-2 ipadic public-domain unicode"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~loong ~x86"
IUSE="debug emacs fcitx4 fcitx5 +gui ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 fcitx5 ibus )"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 41+ messages in thread
end of thread, other threads:[~2024-09-02 6:00 UTC | newest]
Thread overview: 41+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-27 22:02 [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-02 6:00 WANG Xuerui
2024-08-28 4:47 WANG Xuerui
2024-06-30 12:13 Sam James
2023-12-12 13:39 Andreas Sturmlechner
2023-12-07 16:25 Arthur Zamarin
2023-09-07 20:04 Sam James
2023-06-09 7:37 Sam James
2023-06-09 7:35 Sam James
2023-06-09 7:35 Sam James
2023-06-09 7:35 Sam James
2022-12-25 20:02 Andreas Sturmlechner
2022-07-02 14:07 Sam James
2022-05-01 7:30 Michał Górny
2022-03-09 23:36 Sam James
2022-03-09 8:59 Jakov Smolić
2022-01-29 15:20 Yixun Lan
2022-01-29 15:20 Yixun Lan
2021-12-10 0:29 Sam James
2021-05-25 11:10 Sam James
2021-05-25 11:10 Sam James
2021-04-05 19:06 Mike Gilbert
2020-10-20 20:35 Mike Gilbert
2020-07-04 13:53 Mike Gilbert
2019-08-16 17:03 Mike Gilbert
2019-08-09 18:39 Mike Gilbert
2019-04-19 16:39 Mike Gilbert
2018-05-22 18:24 Mike Gilbert
2018-04-16 18:29 Mike Gilbert
2018-03-15 19:23 Sergei Trofimovich
2018-03-08 19:33 Mike Gilbert
2018-02-12 19:16 Mike Gilbert
2018-01-08 21:31 Mike Gilbert
2017-12-10 9:27 Ulrich Müller
2017-10-05 18:57 Mike Gilbert
2017-10-05 18:57 Mike Gilbert
2017-10-02 17:36 Mike Gilbert
2017-09-28 17:18 Mike Gilbert
2017-04-20 7:59 David Seifert
2016-03-23 15:43 Mike Gilbert
2015-09-01 18:51 Tobias Klausmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox