commit: 4e68999b34c72aab62570290874265c8d22968c1
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 04:58:43 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 05:00:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e68999b
dev-vcs/mercurial: make cargo optional
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-vcs/mercurial/mercurial-5.6.ebuild | 4 +++-
dev-vcs/mercurial/mercurial-9999.ebuild | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dev-vcs/mercurial/mercurial-5.6.ebuild
b/dev-vcs/mercurial/mercurial-5.6.ebuild
index a4470220529..20bb67f7f3f 100644
--- a/dev-vcs/mercurial/mercurial-5.6.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.6.ebuild
@@ -6,6 +6,8 @@ EAPI=7
PYTHON_COMPAT=( python3_{6..8} )
PYTHON_REQ_USE="threads(+)"
DISTUTILS_USE_SETUPTOOLS=no
+CARGO_OPTIONAL=1
+
CRATES="
adler-0.2.3
aho-corasick-0.7.13
@@ -105,7 +107,7 @@ zstd-safe-2.0.5+zstd.1.4.5
zstd-sys-1.4.17+zstd.1.4.5
"
-inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic cargo
+inherit bash-completion-r1 cargo elisp-common eutils distutils-r1 flag-o-matic
DESCRIPTION="Scalable distributed SCM"
HOMEPAGE="https://www.mercurial-scm.org/"
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild
b/dev-vcs/mercurial/mercurial-9999.ebuild
index 8ec439342af..1a93cf4212c 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -6,8 +6,9 @@ EAPI=7
PYTHON_COMPAT=( python3_{6..8} )
PYTHON_REQ_USE="threads(+)"
DISTUTILS_USE_SETUPTOOLS=no
+CARGO_OPTIONAL=1
-inherit bash-completion-r1 elisp-common eutils distutils-r1 mercurial
flag-o-matic cargo
+inherit bash-completion-r1 cargo elisp-common eutils distutils-r1 mercurial
flag-o-matic
DESCRIPTION="Scalable distributed SCM"
HOMEPAGE="https://www.mercurial-scm.org/"