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 CD72A138334 for ; Sun, 21 Apr 2019 19:19:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1C72E091C; Sun, 21 Apr 2019 19:19:08 +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 C64EDE091C for ; Sun, 21 Apr 2019 19:19:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8B809341D6F for ; Sun, 21 Apr 2019 19:19:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35DE15A9 for ; Sun, 21 Apr 2019 19:19:06 +0000 (UTC) From: "Virgil Dupras" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Virgil Dupras" Message-ID: <1555874326.98de6f326806181db1d06969800a009e7c53824c.vdupras@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libutf8proc/files/, dev-libs/libutf8proc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libutf8proc/files/libutf8proc-2.3.0-tests-nofetch.patch dev-libs/libutf8proc/libutf8proc-2.3.0.ebuild X-VCS-Directories: dev-libs/libutf8proc/files/ dev-libs/libutf8proc/ X-VCS-Committer: vdupras X-VCS-Committer-Name: Virgil Dupras X-VCS-Revision: 98de6f326806181db1d06969800a009e7c53824c X-VCS-Branch: master Date: Sun, 21 Apr 2019 19:19:06 +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: f8f4e370-f1ad-4bd5-acbf-fa4d44bc1d4e X-Archives-Hash: 841de84f28831970d208036f926d1dce commit: 98de6f326806181db1d06969800a009e7c53824c Author: Virgil Dupras gentoo org> AuthorDate: Sun Apr 21 19:17:24 2019 +0000 Commit: Virgil Dupras gentoo org> CommitDate: Sun Apr 21 19:18:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98de6f32 dev-libs/libutf8proc: don't access internet during tests Patch the test data makefile to use app-i18n/unicode-data instead of fetching unicode data from the internet. Closes: https://bugs.gentoo.org/682812 Signed-off-by: Virgil Dupras gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 .../files/libutf8proc-2.3.0-tests-nofetch.patch | 33 ++++++++++++++++++++++ dev-libs/libutf8proc/libutf8proc-2.3.0.ebuild | 6 +++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dev-libs/libutf8proc/files/libutf8proc-2.3.0-tests-nofetch.patch b/dev-libs/libutf8proc/files/libutf8proc-2.3.0-tests-nofetch.patch new file mode 100644 index 00000000000..5750b43ad5f --- /dev/null +++ b/dev-libs/libutf8proc/files/libutf8proc-2.3.0-tests-nofetch.patch @@ -0,0 +1,33 @@ +diff --git a/data/Makefile b/data/Makefile +index f5d1dd9..60c09e3 100644 +--- a/data/Makefile ++++ b/data/Makefile +@@ -10,6 +10,7 @@ PERL=perl + MAKE=make + JULIA=julia + CURLFLAGS = --retry 5 --location ++UDATA=/usr/share/unicode-data + + .PHONY: clean + +@@ -25,6 +26,7 @@ CharWidths.txt: charwidths.jl EastAsianWidth.txt + UNICODE_VERSION=12.0.0 + + UnicodeData.txt: ++ cp $(UDATA)/$@ $@ + $(CURL) $(CURLFLAGS) -o $@ -O http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt + + EastAsianWidth.txt: +@@ -43,10 +45,10 @@ CaseFolding.txt: + $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/CaseFolding.txt + + NormalizationTest.txt: +- $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/NormalizationTest.txt ++ cp $(UDATA)/$@ $@ + + GraphemeBreakTest.txt: +- $(CURL) $(CURLFLAGS) $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/auxiliary/GraphemeBreakTest.txt | $(PERL) -pe 's,÷,/,g;s,×,+,g' > $@ ++ cat $(UDATA)/auxiliary/$@ | $(PERL) -pe 's,÷,/,g;s,×,+,g' > $@ + + emoji-data.txt: + $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://unicode.org/Public/emoji/`echo $(UNICODE_VERSION) | cut -d. -f1-2`/emoji-data.txt diff --git a/dev-libs/libutf8proc/libutf8proc-2.3.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.3.0.ebuild index ea48c910201..3b3b3a53203 100644 --- a/dev-libs/libutf8proc/libutf8proc-2.3.0.ebuild +++ b/dev-libs/libutf8proc/libutf8proc-2.3.0.ebuild @@ -13,13 +13,17 @@ SRC_URI="https://github.com/JuliaStrings/utf8proc/archive/v${PV}.tar.gz -> ${P}. LICENSE="MIT" SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" +IUSE="test" S="${WORKDIR}/${MY_P}" +BDEPEND="test? ( =app-i18n/unicode-data-12.0* )" + PATCHES=( # Don't build or install static libs "${FILESDIR}/${PN}-2.3.0-no-static.patch" + # use app-i18n/unicode-data for test data instead of curl + "${FILESDIR}/${PN}-2.3.0-tests-nofetch.patch" ) src_install() {