[gentoo-commits] repo/proj/rust:master commit in: eclass/

[gentoo-commits] repo/proj/rust:master commit in: eclass/

[Mikhail Pukhlikov]

commit:     5716d60c4cedaf6c13757ee4742f74b92c8ded06
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Wed Mar  4 15:17:45 2020 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Thu Mar  5 06:17:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/rust.git/commit/?id=5716d60c

cargo eclass: backport patch to use regex for name/version extraction

taken from https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2835a612827749228ca89fbd982df2bb4f072742

original bug: https://bugs.gentoo.org/705044

Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com>
Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>

 eclass/cargo.eclass | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 4e874f0..eacad3e 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -36,17 +36,14 @@ ECARGO_VENDOR="${ECARGO_HOME}/gentoo"
 # @DESCRIPTION:
 # Generates the URIs to put in SRC_URI to help fetch dependencies.
 cargo_crate_uris() {
+	readonly regex='^(.*)-([0-9]+\.[0-9]+\.[0-9]+.*)$'
 	local crate
 	for crate in "$@"; do
-		local name version url pretag
-		name="${crate%-*}"
-		version="${crate##*-}"
-		pretag="[a-zA-Z]+"
-		if [[ $version =~ $pretag ]]; then
-			version="${name##*-}-${version}"
-			name="${name%-*}"
-		fi
 		if [[ "${CARGO_FETCH_CRATES}" == "not" ]]; then
+		local name version url
+		[[ $crate =~ $regex ]] || die "Could not parse name and version from crate: $crate"
+		name="${BASH_REMATCH[1]}"
+		version="${BASH_REMATCH[2]}"
 			url="https://crates.io/api/v1/crates/${name}/${version}/download -> ${crate}.crate"
 		else
 			url=""

[gentoo-commits] repo/proj/rust:master commit in: eclass/

[Mikhail Pukhlikov]

commit:     ed2692fa1b6711cd80460fe823c3c9dd7ceceee1
Author:     gentoo90 <gentoo90 <AT> gmail <DOT> com>
AuthorDate: Sat Jul 18 20:55:55 2020 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Mon Aug  3 06:27:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/rust.git/commit/?id=ed2692fa

cargo eclass: fix install

cargo install now requires --path parameter
Closes: https://github.com/gentoo/gentoo-rust/pull/493

Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>

 eclass/cargo.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 5207d2a..a4808ae 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -150,7 +150,7 @@ cargo_src_compile() {
 cargo_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	cargo install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") "$@" \
+	cargo install -j $(makeopts_jobs) --root="${D}/usr" --path . $(usex debug --debug "") "$@" \
 		|| die "cargo install failed"
 	rm -f "${D}/usr/.crates.toml"
 

[gentoo-commits] repo/proj/rust:master commit in: eclass/

[Mikhail Pukhlikov]

commit:     5be97775f4ec8fdb8ece5956e47da5a5b4a69490
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Wed Mar  4 15:22:55 2020 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Thu Mar  5 06:17:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/rust.git/commit/?id=5be97775

cargo eclass: fix if then statement

Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com>
Closes: https://github.com/gentoo/gentoo-rust/pull/480
Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>

 eclass/cargo.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index eacad3e..5207d2a 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -39,11 +39,11 @@ cargo_crate_uris() {
 	readonly regex='^(.*)-([0-9]+\.[0-9]+\.[0-9]+.*)$'
 	local crate
 	for crate in "$@"; do
-		if [[ "${CARGO_FETCH_CRATES}" == "not" ]]; then
 		local name version url
 		[[ $crate =~ $regex ]] || die "Could not parse name and version from crate: $crate"
 		name="${BASH_REMATCH[1]}"
 		version="${BASH_REMATCH[2]}"
+		if [[ "${CARGO_FETCH_CRATES}" == "not" ]]; then
 			url="https://crates.io/api/v1/crates/${name}/${version}/download -> ${crate}.crate"
 		else
 			url=""

[gentoo-commits] repo/proj/rust:master commit in: eclass/

[Mikhail Pukhlikov]

commit:     d6542fb4b30dba00148048bdee40482f0492c3b7
Author:     Daniel Barry <dbarry <AT> stevens <DOT> edu>
AuthorDate: Sat Dec 21 05:13:42 2019 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 06:54:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/rust.git/commit/?id=d6542fb4

cargo.eclass: add args to cargo_src_install()

media-sound/spotifyd and media-sound/spotify-tui were tested with
the cargo eclass in the main package repo, they currently fail
to install as they try to pass arguments into cargo_src_install()
Closes: https://github.com/gentoo/gentoo-rust/pull/472

Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>

 eclass/cargo.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index b6c6dde..b1f2071 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -153,7 +153,7 @@ cargo_src_compile() {
 cargo_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	cargo install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") \
+	cargo install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") "$@" \
 		|| die "cargo install failed"
 	rm -f "${D}/usr/.crates.toml"