gentoo resync : 30.09.2018

3 files changed, 53 insertions, 17 deletions

diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 20587801b91c..d4247934a5a5 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -133,7 +133,7 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
 DIST wincolor-1.0.0.crate 4777 BLAKE2B 843d2b3f9d56b332504de707879a490169a790ccb515311d32114c43122f0b13dc8c360f9610361f810b2e23424da35b2918fd30480b7daeeb2a9b2689b5ecbb SHA512 c5a6c6c01fd4cadbd0967d95f69e28b5f6aeac38a7e5297f843be4ebdbed2253db3d5d38f58a91eb2cc7055bad5884a199350a52ae17b06ef11232167f610b04
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
-EBUILD ripgrep-0.10.0.ebuild 2281 BLAKE2B c08302050586784c84899a9498534ea87da3f6f955421afc9945d11e10f5b57add90a0c3ae7bd2bf3f88b7eae6b9ba3ccaf5f81765348cc62ff17cfcb6d4cfe8 SHA512 05561dd5ab6f8f3d91458d71d54ea5c124f02e5e0482d71973d177861733fa8801ded3634206b6e0b5e6fab1eb0e557f7db89f73f8d527bda37b624e8aed12a4
+EBUILD ripgrep-0.10.0-r1.ebuild 2938 BLAKE2B b48ae829f9d6f583733c7f47e3c3f15228c9d57c0ac58da4075876710e72db484c6dd9f46b1ae68937a05bbc3e000c9b0eaa1cf44e571c1ba2f7d7e29f3108d0 SHA512 169d62058a02aaf86406fae0d8417bf65cb19e92b8bb6add518a35e2c7b2f6575360cc33621cef97553e4e0eeaabef035d422f75e5f530658be3bf30204fd91b
 EBUILD ripgrep-0.8.1-r2.ebuild 1532 BLAKE2B 1b5dec09d8a0ad05d570534daa72dfd4cff896a20e79b6c26daf151c79234042eaa02a44afa1652c16881b2787e0612d46649fbccbf52fa8008feafd7196ef60 SHA512 d4d4be24db631878e260c1d43b4b2d73bad4a8002cdf2fc404457f587b52b975e836ded7d17a9e9b9343b8dc54941dc06debf717d4532453a67ca8d5b9f525bb
 EBUILD ripgrep-0.9.0.ebuild 1621 BLAKE2B bb7082046a7c58bdc8925cda09b742a0edb6eef23b8f8bea7967d21a275c0090a69b7d90388955cb4182c12d1b2c439197c535b01a23084e0ca65d18aff0bc10 SHA512 c0746daf908533a60254bb6d59308ece831073e7fbe1f4464ae022a7370244e1bab9fb33aa739e089a18c66656dc6b78eb5bb7be49ee7c39091d2cdcd3d50e27
-MISC metadata.xml 339 BLAKE2B 814975935c3042512ae2d83d3964bc94bef9b6b19181adc8c07f538e095983d503af6f6683c61109f4c3515175f02879f07d352845966c04bc774ee47d65db97 SHA512 4501066b64cc47d58915b452027ea603d319b0eae3d9bcd45642f16bcca3e5bbba3fc998fe8501ce63c4717ccf5f404392b98b54d53b93c648e8c8de116141ef
+MISC metadata.xml 837 BLAKE2B c7f5f0c13fdb6d695a24724c84105b873fb2674212896bf2184a9ceef2efe2fe98a17a6f98284eaa0776457ca18729a184eeb22d31214f0f77e30bca99f26352 SHA512 b45056a97c83bd9ddd5d49f94d5f5b1d3c00c53fe14263be8eff908b14a5635f9ff5151344ac7d8b656d9c62937b0d63f3a3a228ad3256da14fc7bae8981a934
diff --git a/sys-apps/ripgrep/metadata.xml b/sys-apps/ripgrep/metadata.xml
index 7cecc57b17f3..fe6ddd961327 100644
--- a/sys-apps/ripgrep/metadata.xml
+++ b/sys-apps/ripgrep/metadata.xml
@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">BurntSushi/ripgrep</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		Line-oriented search tool that recursively searches your current directory for a regex pattern while respecting your gitignore rules.
+		ripgrep is similar to other popular search tools like The Silver Searcher, ack and grep.
+	</longdescription>
+	<use>
+		<flag name="man" restrict="&gt;=sys-apps/ripgrep-0.10.0-r1">
+			Build and install man pages.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">BurntSushi/ripgrep</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/ripgrep/ripgrep-0.10.0.ebuild b/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild
index f9b287ae30ae..fba0e1d8e24c 100644
--- a/sys-apps/ripgrep/ripgrep-0.10.0.ebuild
+++ b/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild
@@ -101,10 +101,13 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="|| ( MIT Unlicense )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="+man pcre"
 
-DEPEND=">=virtual/rust-1.20
-	doc? ( app-text/asciidoc )"
+RDEPEND="pcre? ( dev-libs/libpcre2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=virtual/rust-1.20
+	man? ( app-text/asciidoc )"
 
 QA_FLAGS_IGNORED="usr/bin/rg"
 
@@ -112,18 +115,38 @@ src_test() {
 	cargo test || die "tests failed"
 }
 
+src_compile() {
+	export CARGO_HOME="${ECARGO_HOME}"
+	cargo build -j $(makeopts_jobs) \
+		$(usex debug "" --release) \
+		$(usex pcre "--features pcre2" "") \
+		|| die "cargo build failed"
+}
+
 src_install() {
-	cargo_src_install
+	cargo install -j $(makeopts_jobs) --root="${D}/usr" \
+		$(usex debug --debug "") \
+		$(usex pcre "--features pcre2" "") \
+		|| die "cargo install failed"
+
+	rm -f "${D}/usr/.crates.toml"
 
-	# hacks to find/install generated files
-	BUILD_DIR=$(dirname $(find target/release -name rg.bash))
-	if use doc ; then
+	# hack to find/install generated files
+	# stamp file can be present in multiple dirs if we build additional features
+	# so grab fist match only
+	local BUILD_DIR=$(dirname $(find target/release -name ripgrep-stamp -print -quit))
+
+	if use man ; then
 	    doman "${BUILD_DIR}"/rg.1
 	fi
+
 	newbashcomp "${BUILD_DIR}"/rg.bash rg
 
-	dodoc CHANGELOG.md README.md
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${BUILD_DIR}"/rg.fish
 
 	insinto /usr/share/zsh/site-functions
 	doins complete/_rg
+
+	dodoc CHANGELOG.md FAQ.md GUIDE.md README.md
 }