From: Mart Raudsepp <leio@gentoo.org>
Date: Sun, 1 Apr 2018 11:30:33 +0000 (+0300)
Subject: profiles: p.use.mask rust[extended] due to unsolved file collisions for months
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=03005eca7f8563a4964c7f9990e6654152aa0319;p=gentoo.git

profiles: p.use.mask rust[extended] due to unsolved file collisions for months

Acked-by: Dirkjan Ochtman <djc@gentoo.org>
Bug: https://bugs.gentoo.org/645498
Bug: https://bugs.gentoo.org/645562
---

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 9faa2ef0cd01..b051919d7bfb 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Mart Raudsepp <leio@gentoo.org> (1 Apr 2018)
+# rust[extended] file collides with dev-util/cargo, while everything
+# in tree uses the latter at the moment (#645562)
+dev-lang/rust extended
+
 # Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
 # app-backup/holland-lib-mysql will be removed (#643502)
 app-backup/holland mysql