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 9899F158021 for ; Wed, 16 Nov 2022 12:52:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5A2CE08C8; Wed, 16 Nov 2022 12:52:11 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CBBCCE08C8 for ; Wed, 16 Nov 2022 12:52:11 +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 BF556340ED4 for ; Wed, 16 Nov 2022 12:52:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1EDB738 for ; Wed, 16 Nov 2022 12:52:07 +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: <1668603091.effdb8f9e9b543481fe69f471719ee794b26c470.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libutf8proc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild X-VCS-Directories: dev-libs/libutf8proc/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: effdb8f9e9b543481fe69f471719ee794b26c470 X-VCS-Branch: master Date: Wed, 16 Nov 2022 12:52:07 +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: 306ca146-1775-4d09-9ca7-51817d548da2 X-Archives-Hash: c354fc945f83c9afa979f06b23b6bc5b commit: effdb8f9e9b543481fe69f471719ee794b26c470 Author: Akinori Hattori gentoo org> AuthorDate: Wed Nov 16 12:45:16 2022 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Wed Nov 16 12:51:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=effdb8f9 dev-libs/libutf8proc: tidy Signed-off-by: Akinori Hattori gentoo.org> dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild index eac516b92568..9341fa9d0187 100644 --- a/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild +++ b/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild @@ -31,6 +31,7 @@ src_prepare() { cp "${WORKDIR}"/${PN}-EastAsianWidth-14.0.0 ${PN#lib}_data.c || die fi + sed -i "/^libdir/s:/lib:/$(get_libdir):" Makefile default } @@ -38,21 +39,19 @@ src_compile() { emake \ AR="$(tc-getAR)" \ CC="$(tc-getCC)" \ - prefix="/usr" \ - libdir="${EPREFIX}/usr/$(get_libdir)" + prefix="${EPREFIX}/usr" +} + +src_test() { + cp "${BROOT}"/usr/share/unicode-data/{DerivedCoreProperties,{Normalization,auxiliary/GraphemeBreak}Test}.txt data || die + + emake CC="$(tc-getCC)" check } src_install() { emake \ - DESTDIR="${ED}" \ - prefix="/usr" \ - libdir="/usr/$(get_libdir)" \ + DESTDIR="${D}" \ + prefix="${EPREFIX}/usr" \ install use static-libs || find "${ED}" -name '*.a' -delete || die } - -src_test() { - cp "${EPREFIX}"/usr/share/unicode-data/{DerivedCoreProperties,{Normalization,auxiliary/GraphemeBreak}Test}.txt data || die - - emake CC="$(tc-getCC)" check -}