[gentoo-commits] repo/gentoo:master commit in: dev-util/cargo/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Doug Goldstein" <cardoe@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cargo/
Date: Wed, 30 Nov 2016 17:19:03 +0000 (UTC)	[thread overview]
Message-ID: <1480526271.89f261de268b9b381b8e7593e270287ff281728c.cardoe@gentoo> (raw)

commit:     89f261de268b9b381b8e7593e270287ff281728c
Author:     Doug Goldstein <cardoe <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 15:22:13 2016 +0000
Commit:     Doug Goldstein <cardoe <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 17:17:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f261de

dev-util/cargo: preserve older build method

Cargo bootstraps itself with a 0.10.0 version of Cargo that does not
support the newer features we're rolling into the eclass. As a result
this lifts out bits from the eclass and moves it into the Cargo ebuilds
so that the eclass can be updated.

Signed-off-by: Doug Goldstein <cardoe <AT> gentoo.org>

 dev-util/cargo/cargo-0.12.0.ebuild    | 46 +++++++++++++++++++++++++++++++++++
 dev-util/cargo/cargo-0.13.0-r1.ebuild | 46 +++++++++++++++++++++++++++++++++++
 dev-util/cargo/cargo-0.13.0.ebuild    | 46 +++++++++++++++++++++++++++++++++++
 dev-util/cargo/cargo-0.14.0.ebuild    | 46 +++++++++++++++++++++++++++++++++++
 4 files changed, 184 insertions(+)

diff --git a/dev-util/cargo/cargo-0.12.0.ebuild b/dev-util/cargo/cargo-0.12.0.ebuild
index 68140cd..3ab9f11 100644
--- a/dev-util/cargo/cargo-0.12.0.ebuild
+++ b/dev-util/cargo/cargo-0.12.0.ebuild
@@ -103,6 +103,52 @@ DEPEND="${COMMON_DEPEND}
 	sys-apps/findutils
 	sys-apps/sed"
 
+# Until cargo bootstraps itself with a version based on 0.13.0, this needs
+# to stay (these variables and src_unpack)
+ECARGO_HOME="${WORKDIR}/cargo_home"
+ECARGO_REPO="github.com-88ac128001ac3a9a"
+ECARGO_INDEX="${ECARGO_HOME}/registry/index/${ECARGO_REPO}"
+ECARGO_SRC="${ECARGO_HOME}/registry/src/${ECARGO_REPO}"
+ECARGO_CACHE="${ECARGO_HOME}/registry/cache/${ECARGO_REPO}"
+
+src_unpack() {
+	mkdir -p "${ECARGO_INDEX}" || die
+	mkdir -p "${ECARGO_CACHE}" || die
+	mkdir -p "${ECARGO_SRC}" || die
+	mkdir -p "${S}" || die
+
+	local archive
+	for archive in ${A}; do
+		case "${archive}" in
+			*.crate)
+				ebegin "Unpacking ${archive}"
+				cp "${DISTDIR}"/${archive} "${ECARGO_CACHE}/" || die
+				tar -xf "${DISTDIR}"/${archive} -C "${ECARGO_SRC}/" || die
+				eend $?
+				;;
+			cargo-snapshot*)
+				ebegin "Unpacking ${archive}"
+				mkdir -p "${S}"/target/snapshot
+				tar -xzf "${DISTDIR}"/${archive} -C "${S}"/target/snapshot --strip-components 2 || die
+				# cargo's makefile needs this otherwise it will try to
+				# download it
+				touch "${S}"/target/snapshot/bin/cargo || die
+				eend $?
+				;;
+			cargo-registry*)
+				ebegin "Unpacking ${archive}"
+				tar -xzf "${DISTDIR}"/${archive} -C "${ECARGO_INDEX}" --strip-components 1 || die
+				# prevent cargo from attempting to download this again
+				touch "${ECARGO_INDEX}"/.cargo-index-lock || die
+				eend $?
+				;;
+			*)
+				unpack ${archive}
+				;;
+		esac
+	done
+}
+
 src_configure() {
 	# Cargo only supports these GNU triples:
 	# - Linux: <arch>-unknown-linux-gnu

diff --git a/dev-util/cargo/cargo-0.13.0-r1.ebuild b/dev-util/cargo/cargo-0.13.0-r1.ebuild
index c6a5f05..12d1dd2 100644
--- a/dev-util/cargo/cargo-0.13.0-r1.ebuild
+++ b/dev-util/cargo/cargo-0.13.0-r1.ebuild
@@ -115,6 +115,52 @@ DEPEND="${COMMON_DEPEND}
 	sys-apps/findutils
 	sys-apps/sed"
 
+# Until cargo bootstraps itself with a version based on 0.13.0, this needs
+# to stay (these variables and src_unpack)
+ECARGO_HOME="${WORKDIR}/cargo_home"
+ECARGO_REPO="github.com-88ac128001ac3a9a"
+ECARGO_INDEX="${ECARGO_HOME}/registry/index/${ECARGO_REPO}"
+ECARGO_SRC="${ECARGO_HOME}/registry/src/${ECARGO_REPO}"
+ECARGO_CACHE="${ECARGO_HOME}/registry/cache/${ECARGO_REPO}"
+
+src_unpack() {
+	mkdir -p "${ECARGO_INDEX}" || die
+	mkdir -p "${ECARGO_CACHE}" || die
+	mkdir -p "${ECARGO_SRC}" || die
+	mkdir -p "${S}" || die
+
+	local archive
+	for archive in ${A}; do
+		case "${archive}" in
+			*.crate)
+				ebegin "Unpacking ${archive}"
+				cp "${DISTDIR}"/${archive} "${ECARGO_CACHE}/" || die
+				tar -xf "${DISTDIR}"/${archive} -C "${ECARGO_SRC}/" || die
+				eend $?
+				;;
+			cargo-snapshot*)
+				ebegin "Unpacking ${archive}"
+				mkdir -p "${S}"/target/snapshot
+				tar -xzf "${DISTDIR}"/${archive} -C "${S}"/target/snapshot --strip-components 2 || die
+				# cargo's makefile needs this otherwise it will try to
+				# download it
+				touch "${S}"/target/snapshot/bin/cargo || die
+				eend $?
+				;;
+			cargo-registry*)
+				ebegin "Unpacking ${archive}"
+				tar -xzf "${DISTDIR}"/${archive} -C "${ECARGO_INDEX}" --strip-components 1 || die
+				# prevent cargo from attempting to download this again
+				touch "${ECARGO_INDEX}"/.cargo-index-lock || die
+				eend $?
+				;;
+			*)
+				unpack ${archive}
+				;;
+		esac
+	done
+}
+
 src_configure() {
 	# Cargo only supports these GNU triples:
 	# - Linux: <arch>-unknown-linux-gnu

diff --git a/dev-util/cargo/cargo-0.13.0.ebuild b/dev-util/cargo/cargo-0.13.0.ebuild
index 3f74ad6..56c7772 100644
--- a/dev-util/cargo/cargo-0.13.0.ebuild
+++ b/dev-util/cargo/cargo-0.13.0.ebuild
@@ -114,6 +114,52 @@ DEPEND="${COMMON_DEPEND}
 	sys-apps/findutils
 	sys-apps/sed"
 
+# Until cargo bootstraps itself with a version based on 0.13.0, this needs
+# to stay (these variables and src_unpack)
+ECARGO_HOME="${WORKDIR}/cargo_home"
+ECARGO_REPO="github.com-88ac128001ac3a9a"
+ECARGO_INDEX="${ECARGO_HOME}/registry/index/${ECARGO_REPO}"
+ECARGO_SRC="${ECARGO_HOME}/registry/src/${ECARGO_REPO}"
+ECARGO_CACHE="${ECARGO_HOME}/registry/cache/${ECARGO_REPO}"
+
+src_unpack() {
+	mkdir -p "${ECARGO_INDEX}" || die
+	mkdir -p "${ECARGO_CACHE}" || die
+	mkdir -p "${ECARGO_SRC}" || die
+	mkdir -p "${S}" || die
+
+	local archive
+	for archive in ${A}; do
+		case "${archive}" in
+			*.crate)
+				ebegin "Unpacking ${archive}"
+				cp "${DISTDIR}"/${archive} "${ECARGO_CACHE}/" || die
+				tar -xf "${DISTDIR}"/${archive} -C "${ECARGO_SRC}/" || die
+				eend $?
+				;;
+			cargo-snapshot*)
+				ebegin "Unpacking ${archive}"
+				mkdir -p "${S}"/target/snapshot
+				tar -xzf "${DISTDIR}"/${archive} -C "${S}"/target/snapshot --strip-components 2 || die
+				# cargo's makefile needs this otherwise it will try to
+				# download it
+				touch "${S}"/target/snapshot/bin/cargo || die
+				eend $?
+				;;
+			cargo-registry*)
+				ebegin "Unpacking ${archive}"
+				tar -xzf "${DISTDIR}"/${archive} -C "${ECARGO_INDEX}" --strip-components 1 || die
+				# prevent cargo from attempting to download this again
+				touch "${ECARGO_INDEX}"/.cargo-index-lock || die
+				eend $?
+				;;
+			*)
+				unpack ${archive}
+				;;
+		esac
+	done
+}
+
 src_configure() {
 	# Cargo only supports these GNU triples:
 	# - Linux: <arch>-unknown-linux-gnu

diff --git a/dev-util/cargo/cargo-0.14.0.ebuild b/dev-util/cargo/cargo-0.14.0.ebuild
index b78e205..1b8d661 100644
--- a/dev-util/cargo/cargo-0.14.0.ebuild
+++ b/dev-util/cargo/cargo-0.14.0.ebuild
@@ -116,6 +116,52 @@ DEPEND="${COMMON_DEPEND}
 	sys-apps/findutils
 	sys-apps/sed"
 
+# Until cargo bootstraps itself with a version based on 0.13.0, this needs
+# to stay (these variables and src_unpack)
+ECARGO_HOME="${WORKDIR}/cargo_home"
+ECARGO_REPO="github.com-88ac128001ac3a9a"
+ECARGO_INDEX="${ECARGO_HOME}/registry/index/${ECARGO_REPO}"
+ECARGO_SRC="${ECARGO_HOME}/registry/src/${ECARGO_REPO}"
+ECARGO_CACHE="${ECARGO_HOME}/registry/cache/${ECARGO_REPO}"
+
+src_unpack() {
+	mkdir -p "${ECARGO_INDEX}" || die
+	mkdir -p "${ECARGO_CACHE}" || die
+	mkdir -p "${ECARGO_SRC}" || die
+	mkdir -p "${S}" || die
+
+	local archive
+	for archive in ${A}; do
+		case "${archive}" in
+			*.crate)
+				ebegin "Unpacking ${archive}"
+				cp "${DISTDIR}"/${archive} "${ECARGO_CACHE}/" || die
+				tar -xf "${DISTDIR}"/${archive} -C "${ECARGO_SRC}/" || die
+				eend $?
+				;;
+			cargo-snapshot*)
+				ebegin "Unpacking ${archive}"
+				mkdir -p "${S}"/target/snapshot
+				tar -xzf "${DISTDIR}"/${archive} -C "${S}"/target/snapshot --strip-components 2 || die
+				# cargo's makefile needs this otherwise it will try to
+				# download it
+				touch "${S}"/target/snapshot/bin/cargo || die
+				eend $?
+				;;
+			cargo-registry*)
+				ebegin "Unpacking ${archive}"
+				tar -xzf "${DISTDIR}"/${archive} -C "${ECARGO_INDEX}" --strip-components 1 || die
+				# prevent cargo from attempting to download this again
+				touch "${ECARGO_INDEX}"/.cargo-index-lock || die
+				eend $?
+				;;
+			*)
+				unpack ${archive}
+				;;
+		esac
+	done
+}
+
 src_configure() {
 	# Cargo only supports these GNU triples:
 	# - Linux: <arch>-unknown-linux-gnu

next             reply	other threads:[~2016-11-30 17:19 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-30 17:19 Doug Goldstein [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-06-19  0:35 [gentoo-commits] repo/gentoo:master commit in: dev-util/cargo/ Georgy Yakovlev
2019-03-11  6:29 Thomas Deutschmann
2018-10-28 21:30 Dirkjan Ochtman
2018-10-05 13:11 Dirkjan Ochtman
2018-10-04  7:59 Mikle Kolyada
2018-09-29 19:15 Dirkjan Ochtman
2018-09-29 13:22 Dirkjan Ochtman
2018-09-12 20:29 Thomas Deutschmann
2018-09-11  7:19 Dirkjan Ochtman
2018-09-10  7:35 Dirkjan Ochtman
2018-09-09  7:59 Mikle Kolyada
2018-08-04 12:16 Dirkjan Ochtman
2018-06-27 19:16 Dirkjan Ochtman
2018-05-29  6:36 Dirkjan Ochtman
2018-05-16 12:22 Agostino Sarubbo
2018-05-15  1:46 Thomas Deutschmann
2018-05-14 14:41 Dirkjan Ochtman
2018-04-11 13:05 Dirkjan Ochtman
2018-02-18 17:20 Patrice Clement
2018-02-18 17:20 Patrice Clement
2018-01-22 16:36 Dirkjan Ochtman
2017-12-10  9:27 Ulrich Müller
2017-07-24 13:36 Dirkjan Ochtman
2017-03-18 10:42 Dirkjan Ochtman
2017-02-02 20:42 Dirkjan Ochtman
2017-02-02 20:42 Dirkjan Ochtman
2017-02-02 20:04 Doug Goldstein
2016-12-27 15:45 Dirkjan Ochtman
2016-12-18  3:37 Doug Goldstein
2016-12-18  3:37 Doug Goldstein
2016-11-19 20:39 Dirkjan Ochtman
2016-11-01 20:17 Dirkjan Ochtman
2016-09-30 18:53 Dirkjan Ochtman
2016-09-30  9:32 Dirkjan Ochtman
2016-09-30  9:30 Dirkjan Ochtman
2016-09-11 17:53 Doug Goldstein
2016-08-22 20:17 Dirkjan Ochtman

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:68140cd dfblob:3ab9f11 dfblob:c6a5f05 dfblob:12d1dd2
dfblob:3f74ad6 dfblob:56c7772 dfblob:b78e205 dfblob:1b8d661 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-util/cargo/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1480526271.89f261de268b9b381b8e7593e270287ff281728c.cardoe@gentoo \
    --to=cardoe@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox