From: Dirkjan Ochtman <djc@gentoo.org>
Date: Sat, 9 Sep 2017 13:26:59 +0000 (+0200)
Subject: eclass: improve cargo.eclass to better handle pre-release versions (fixes bug 630428)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=22e6f49add5eb11715f230a50790c0eecf4f5f1f;p=gentoo.git

eclass: improve cargo.eclass to better handle pre-release versions (fixes bug 630428)
---

diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index b08aa9e28aae..f805deba70c3 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -31,9 +31,14 @@ ECARGO_VENDOR="${ECARGO_HOME}/gentoo"
 cargo_crate_uris() {
 	local crate
 	for crate in "$@"; do
-		local name version url
+		local name version url pretag
 		name="${crate%-*}"
 		version="${crate##*-}"
+		pretag="[a-zA-Z]+"
+		if [[ $version =~ $pretag ]]; then
+			version="${name##*-}-${version}"
+			name="${name%-*}"
+		fi
 		url="https://crates.io/api/v1/crates/${name}/${version}/download -> ${crate}.crate"
 		echo "${url}"
 	done