| 1 |
commit: 623e1a6218b9c0f57617e21795a271499ed466c8 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 8 23:08:24 2019 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 8 23:40:29 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=623e1a62 |
| 7 |
|
| 8 |
sys-apps/ripgrep: switch to cargo.eclass func args |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
| 11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild | 17 ++++------------- |
| 14 |
1 file changed, 4 insertions(+), 13 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild b/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild |
| 17 |
index f5c384a3c89..f7eda9ddd13 100644 |
| 18 |
--- a/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild |
| 19 |
+++ b/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2018 Gentoo Authors |
| 22 |
+# Copyright 1999-2019 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=6 |
| 26 |
@@ -116,25 +116,16 @@ src_test() { |
| 27 |
} |
| 28 |
|
| 29 |
src_compile() { |
| 30 |
- export CARGO_HOME="${ECARGO_HOME}" |
| 31 |
- cargo build -j $(makeopts_jobs) \ |
| 32 |
- $(usex debug "" --release) \ |
| 33 |
- $(usex pcre "--features pcre2" "") \ |
| 34 |
- || die "cargo build failed" |
| 35 |
+ cargo_src_compile $(usex pcre "--features pcre2" "") |
| 36 |
} |
| 37 |
|
| 38 |
src_install() { |
| 39 |
- cargo install -j $(makeopts_jobs) --root="${D}/usr" \ |
| 40 |
- $(usex debug --debug "") \ |
| 41 |
- $(usex pcre "--features pcre2" "") \ |
| 42 |
- || die "cargo install failed" |
| 43 |
- |
| 44 |
- rm -f "${D}/usr/.crates.toml" || die |
| 45 |
+ cargo_src_install $(usex pcre "--features pcre2" "") |
| 46 |
|
| 47 |
# hack to find/install generated files |
| 48 |
# stamp file can be present in multiple dirs if we build additional features |
| 49 |
# so grab fist match only |
| 50 |
- local BUILD_DIR=$(dirname $(find target/release -name ripgrep-stamp -print -quit)) |
| 51 |
+ local BUILD_DIR="$(dirname $(find target/release -name ripgrep-stamp -print -quit))" |
| 52 |
|
| 53 |
if use man ; then |
| 54 |
doman "${BUILD_DIR}"/rg.1 |
Archives