Gentoo Archives: gentoo-commits

From: Virgil Dupras <vdupras@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libutf8proc/files/, dev-libs/libutf8proc/
Date: Tue, 07 May 2019 13:59:17
Message-Id: 1557237520.42a0f06960a3e1c51c6b3a8841c20118d5c2753c.vdupras@gentoo
1 commit: 42a0f06960a3e1c51c6b3a8841c20118d5c2753c
2 Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 7 13:58:40 2019 +0000
4 Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
5 CommitDate: Tue May 7 13:58:40 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42a0f069
7
8 dev-libs/libutf8proc: fix build on Prefix
9
10 Closes: https://bugs.gentoo.org/685266
11 Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
12 Package-Manager: Portage-2.3.62, Repoman-2.3.11
13
14 dev-libs/libutf8proc/files/libutf8proc-2.3.0-tests-nofetch.patch | 2 +-
15 .../{libutf8proc-2.3.0.ebuild => libutf8proc-2.3.0-r1.ebuild} | 9 ++++++++-
16 2 files changed, 9 insertions(+), 2 deletions(-)
17
18 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
19 index 5750b43ad5f..f438fdd9779 100644
20 --- a/dev-libs/libutf8proc/files/libutf8proc-2.3.0-tests-nofetch.patch
21 +++ b/dev-libs/libutf8proc/files/libutf8proc-2.3.0-tests-nofetch.patch
22 @@ -6,7 +6,7 @@ index f5d1dd9..60c09e3 100644
23 MAKE=make
24 JULIA=julia
25 CURLFLAGS = --retry 5 --location
26 -+UDATA=/usr/share/unicode-data
27 ++UDATA=${EPREFIX}/usr/share/unicode-data
28
29 .PHONY: clean
30
31
32 diff --git a/dev-libs/libutf8proc/libutf8proc-2.3.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.3.0-r1.ebuild
33 similarity index 88%
34 rename from dev-libs/libutf8proc/libutf8proc-2.3.0.ebuild
35 rename to dev-libs/libutf8proc/libutf8proc-2.3.0-r1.ebuild
36 index 3b3b3a53203..3d5231b82df 100644
37 --- a/dev-libs/libutf8proc/libutf8proc-2.3.0.ebuild
38 +++ b/dev-libs/libutf8proc/libutf8proc-2.3.0-r1.ebuild
39 @@ -26,8 +26,15 @@ PATCHES=(
40 "${FILESDIR}/${PN}-2.3.0-tests-nofetch.patch"
41 )
42
43 +src_compile() {
44 + emake CC=$(tc-getCC) AR=$(tc-getAR)
45 +}
46 +
47 src_install() {
48 - emake DESTDIR="${D}" prefix=/usr libdir=/usr/$(get_libdir) install
49 + emake DESTDIR="${D}" \
50 + prefix="${EPREFIX}/usr" \
51 + libdir="${EPREFIX}/usr/$(get_libdir)" \
52 + install
53 # This package used to use netsurf's version as an upstream, which lives in
54 # its own little world. Unlike julia's version, it puts its header file
55 # in libutf8proc/utf8proc.h instead of utf8proc.h. The problem is that