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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 73872138359 for ; Wed, 6 May 2020 13:50:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80EBFE0899; Wed, 6 May 2020 13:50:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51A56E0899 for ; Wed, 6 May 2020 13:50:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9BB234F547 for ; Wed, 6 May 2020 13:50:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C5051E7 for ; Wed, 6 May 2020 13:50:39 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1588773019.740e260d059b22f8a9fb57d5290acde5aa30b9f7.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libutf8proc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libutf8proc/Manifest dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild X-VCS-Directories: dev-libs/libutf8proc/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 740e260d059b22f8a9fb57d5290acde5aa30b9f7 X-VCS-Branch: master Date: Wed, 6 May 2020 13:50:39 +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: 80c9a92d-34fa-411a-a6ff-6166d8b8b5b9 X-Archives-Hash: 8873adb2bacb191e4b43589ee077a0f1 commit: 740e260d059b22f8a9fb57d5290acde5aa30b9f7 Author: Akinori Hattori gentoo org> AuthorDate: Wed May 6 13:46:39 2020 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Wed May 6 13:50:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740e260d dev-libs/libutf8proc: add cjk USE flag Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Akinori Hattori gentoo.org> dev-libs/libutf8proc/Manifest | 2 ++ dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild | 14 ++++++++++++-- dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild | 14 ++++++++++++-- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest index c73e10750f0..5c64c819e15 100644 --- a/dev-libs/libutf8proc/Manifest +++ b/dev-libs/libutf8proc/Manifest @@ -1,3 +1,5 @@ DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad DIST libutf8proc-2.4.0.tar.gz 154936 BLAKE2B a4fea823806bb784c83504de2ade985d3f0e86aa8d64747f389724ef10122953312e398a7a342cf28f25502693ee507be246338dba37c976998f6a1922cd94c5 SHA512 2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a DIST libutf8proc-2.5.0.tar.gz 155485 BLAKE2B a0cd9285e7f171b9449d9d98f91173bad2b793a00a9c10287c43cc2050b6a0306e289cbd3b4faebb0d97fd305b77ecbb7ce11f119d9ead2a580029db0d7ad898 SHA512 0c553faf4f3841c17c7aa4cce1e917b1585c430ac3f7f240ab98cbe01b9743f2074532e6f71faf3df030f5af00e483a3faf9716a67e6a4b1bb66a3de48308014 +DIST libutf8proc-EastAsianWidth-12.1.0.xz 61760 BLAKE2B 2df2f75a9a2dd150044a5028d1863acab00ecce4511794d2e69259f3a06c20741beb1a6191cefa19e83f9511aafcf5b268d15e0b9db7c2342413dc91c4d3592c SHA512 ff5fc3ac705cf9f7a3aacc6bfd808bd4feab802c7098d8dadcefe6f6639ed82589ba67a37a3a93ff2605aa96009fefc470ce065c9cf84b47370fa17f9a16ea18 +DIST libutf8proc-EastAsianWidth-13.0.0.xz 62040 BLAKE2B 1665047336ded524d0b0a0c6a88afe0d9041a82eda688451b9b2556bcf9eebe6d817119e9aa6e07c602b076e710ecfc73d0bf3487ec5dcb131cd56914e1e6354 SHA512 8f6670299d545cc323a226cb310915ab2600d4e372221814afa67a75c6963bc0a4473a6e28fc847c0ad9761466c6f80de7b1eb3ed04fa28703a20ab34bcee0f2 diff --git a/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild index c9a00ee06e5..38e2c5e109a 100644 --- a/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild +++ b/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild @@ -7,12 +7,13 @@ inherit toolchain-funcs DESCRIPTION="A clean C Library for processing UTF-8 Unicode data" HOMEPAGE="https://github.com/JuliaStrings/utf8proc" -SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz + cjk? ( https://dev.gentoo.org/~hattya/distfiles/${PN}-EastAsianWidth-12.1.0.xz )" LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux" -IUSE="static-libs test" +IUSE="cjk static-libs test" RESTRICT="!test? ( test )" BDEPEND="test? ( =app-i18n/unicode-data-12.0* )" @@ -20,6 +21,15 @@ S="${WORKDIR}/${P#lib}" PATCHES=( "${FILESDIR}"/${PN}-grapheme-test.patch ) +src_prepare() { + if use cjk; then + einfo "Modifying East Asian Ambiguous (A) as wide ..." + cp "${WORKDIR}"/${PN}-EastAsianWidth-12.1.0 ${PN#lib}_data.c || die + fi + + default +} + src_compile() { emake \ AR="$(tc-getAR)" \ diff --git a/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild index 776f2dc9a1e..5d41081fd98 100644 --- a/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild +++ b/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild @@ -7,12 +7,13 @@ inherit toolchain-funcs DESCRIPTION="A clean C Library for processing UTF-8 Unicode data" HOMEPAGE="https://github.com/JuliaStrings/utf8proc" -SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz + cjk? ( https://dev.gentoo.org/~hattya/distfiles/${PN}-EastAsianWidth-13.0.0.xz )" LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux" -IUSE="static-libs test" +IUSE="cjk static-libs test" RESTRICT="!test? ( test )" BDEPEND="test? ( =app-i18n/unicode-data-13.0* )" @@ -20,6 +21,15 @@ S="${WORKDIR}/${P#lib}" PATCHES=( "${FILESDIR}"/${PN}-grapheme-test.patch ) +src_prepare() { + if use cjk; then + einfo "Modifying East Asian Ambiguous (A) as wide ..." + cp "${WORKDIR}"/${PN}-EastAsianWidth-13.0.0 ${PN#lib}_data.c || die + fi + + default +} + src_compile() { emake \ AR="$(tc-getAR)" \