From: Luca Barbato <lu_zero@gentoo.org>
Date: Sat, 4 Apr 2020 15:21:41 +0000 (+0200)
Subject: Improve the name-version regex
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=72d409554b246451c3ebed06416e7680df2076e7;p=gentoo.git

Improve the name-version regex

See:
https://doc.rust-lang.org/cargo/reference/manifest.html#the-name-field

Unbreaks crates using `curl-sys` version `0.4.30+curl-7.69.1` and such.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
---

diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 6776a4b03ac6..6f7ffdb626b4 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -39,7 +39,7 @@ ECARGO_VENDOR="${ECARGO_HOME}/gentoo"
 # @DESCRIPTION:
 # Generates the URIs to put in SRC_URI to help fetch dependencies.
 cargo_crate_uris() {
-	local -r regex='^(.*)-([0-9]+\.[0-9]+\.[0-9]+.*)$'
+	local -r regex='^([a-zA-Z0-9_\-]+)-([0-9]+\.[0-9]+\.[0-9]+.*)$'
 	local crate
 	for crate in "$@"; do
 		local name version url