| 1 |
commit: 5640fe7f3dd581cb33d57eda6b4eb932b201d15e |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 5 16:34:56 2020 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 5 16:35:49 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5640fe7f |
| 7 |
|
| 8 |
dev-libs/libutf8proc: tidy |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 11 |
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> |
| 12 |
|
| 13 |
.../libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild | 4 ++-- |
| 14 |
dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild | 27 ++++++++++------------ |
| 15 |
2 files changed, 14 insertions(+), 17 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild |
| 18 |
index 0f94bc97db0..17e995142ad 100644 |
| 19 |
--- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild |
| 20 |
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild |
| 21 |
@@ -1,7 +1,7 @@ |
| 22 |
# Copyright 1999-2020 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=7 |
| 26 |
+EAPI="7" |
| 27 |
|
| 28 |
inherit toolchain-funcs |
| 29 |
|
| 30 |
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}" |
| 31 |
_emake() { |
| 32 |
source "${EPREFIX}"/usr/share/netsurf-buildsystem/gentoo-helpers.sh |
| 33 |
netsurf_define_makeconf |
| 34 |
- emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@ |
| 35 |
+ emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared "${@}" |
| 36 |
} |
| 37 |
|
| 38 |
src_compile() { |
| 39 |
|
| 40 |
diff --git a/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild |
| 41 |
index 23ca084b62a..65b7342ae30 100644 |
| 42 |
--- a/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild |
| 43 |
+++ b/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild |
| 44 |
@@ -1,15 +1,13 @@ |
| 45 |
# Copyright 1999-2020 Gentoo Authors |
| 46 |
# Distributed under the terms of the GNU General Public License v2 |
| 47 |
|
| 48 |
-EAPI=7 |
| 49 |
+EAPI="7" |
| 50 |
|
| 51 |
inherit toolchain-funcs |
| 52 |
|
| 53 |
-MY_P="${P#lib}" |
| 54 |
- |
| 55 |
DESCRIPTION="A clean C Library for processing UTF-8 Unicode data" |
| 56 |
HOMEPAGE="https://github.com/JuliaStrings/utf8proc" |
| 57 |
-SRC_URI="https://github.com/JuliaStrings/utf8proc/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 58 |
+SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 59 |
|
| 60 |
LICENSE="MIT" |
| 61 |
SLOT="0/${PV}" |
| 62 |
@@ -17,10 +15,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cyg |
| 63 |
IUSE="test" |
| 64 |
RESTRICT="!test? ( test )" |
| 65 |
|
| 66 |
-S="${WORKDIR}/${MY_P}" |
| 67 |
- |
| 68 |
BDEPEND="test? ( =app-i18n/unicode-data-12.0* )" |
| 69 |
|
| 70 |
+S="${WORKDIR}/${P#lib}" |
| 71 |
+ |
| 72 |
PATCHES=( |
| 73 |
# Don't build or install static libs |
| 74 |
"${FILESDIR}/${PN}-2.3.0-no-static.patch" |
| 75 |
@@ -28,18 +26,17 @@ PATCHES=( |
| 76 |
"${FILESDIR}/${PN}-2.3.0-tests-nofetch.patch" |
| 77 |
) |
| 78 |
|
| 79 |
-_emake() { |
| 80 |
- emake CC=$(tc-getCC) AR=$(tc-getAR) "$@" |
| 81 |
-} |
| 82 |
- |
| 83 |
src_compile() { |
| 84 |
- _emake |
| 85 |
+ emake \ |
| 86 |
+ AR="$(tc-getAR)" \ |
| 87 |
+ CC="$(tc-getCC)" |
| 88 |
} |
| 89 |
|
| 90 |
src_install() { |
| 91 |
- _emake DESTDIR="${D}" \ |
| 92 |
- prefix="${EPREFIX}/usr" \ |
| 93 |
- libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 94 |
+ emake \ |
| 95 |
+ DESTDIR="${ED}" \ |
| 96 |
+ prefix="/usr" \ |
| 97 |
+ libdir="/usr/$(get_libdir)" \ |
| 98 |
install |
| 99 |
# This package used to use netsurf's version as an upstream, which lives in |
| 100 |
# its own little world. Unlike julia's version, it puts its header file |
| 101 |
@@ -51,5 +48,5 @@ src_install() { |
| 102 |
} |
| 103 |
|
| 104 |
src_test() { |
| 105 |
- _emake check |
| 106 |
+ emake CC="$(tc-getCC)" check |
| 107 |
} |
Archives