From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB42A158013 for ; Tue, 12 Dec 2023 13:39:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8AF52BC018; Tue, 12 Dec 2023 13:39:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4F2F2BC018 for ; Tue, 12 Dec 2023 13:39:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C838335D6A for ; Tue, 12 Dec 2023 13:39:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D876D929 for ; Tue, 12 Dec 2023 13:39:30 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1702388353.08dfd6e1ed50374939b378dd4b0867f87b0e7354.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/mozc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/mozc/Manifest app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild X-VCS-Directories: app-i18n/mozc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 08dfd6e1ed50374939b378dd4b0867f87b0e7354 X-VCS-Branch: master Date: Tue, 12 Dec 2023 13:39:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 23227fbb-a0a0-414b-80b2-3b93d610be7e X-Archives-Hash: 1a3c103eaa20af71e181d478a7ead2a1 commit: 08dfd6e1ed50374939b378dd4b0867f87b0e7354 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 12 13:14:00 2023 +0000 Commit: Andreas Sturmlechner gentoo 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 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: