Add ELIBC=musl and mask it as it can break systems

5 files changed, 19 insertions, 7 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index e5e813ba509b..8cfd821e0674 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7941 2013/06/15 20:34:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7942 2013/06/16 00:04:10 blueness Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  16 Jun 2013; Anthony G. Basile <blueness@gentoo.org> base/make.defaults,
+  base/package.mask, base/use.mask, desc/elibc.desc:
+  Add ELIBC=musl and mask it as it can break systems
+
   15 Jun 2013; Pacho Ramos <pacho@gentoo.org> package.mask:
   Mask some packages for removal
 
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 4f5c9f6411e9..9090689a1ed0 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.99 2013/05/30 11:20:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.100 2013/06/16 00:04:10 blueness Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -10,7 +10,7 @@ IUSE_IMPLICIT="prefix"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
 USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt"
-USE_EXPAND_VALUES_ELIBC="AIX Cygwin Darwin FreeBSD glibc HPUX Interix mintlib NetBSD OpenBSD SunOS uclibc Winnt"
+USE_EXPAND_VALUES_ELIBC="AIX Cygwin Darwin FreeBSD glibc HPUX Interix mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
 USE_EXPAND_VALUES_KERNEL="AIX Cygwin Darwin FreeBSD freemint HPUX Interix linux NetBSD OpenBSD SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index df462461e86d..9a0468b4291c 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.56 2013/04/06 13:20:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.57 2013/06/16 00:04:10 blueness Exp $
 
 # Diego Elio Pettenò <flameeyes@gentoo.org> (8 Feb 2011)
 #  on behalf of QA team <qa@gentoo.org
@@ -10,6 +10,12 @@
 # still available on default profiles to be used with crossdev.
 sys-libs/uclibc
 
+# Anthony G. Basile <blueness@gentoo.org> (15 Jun 2013)
+# Make sure sys-libs/musl is only available for musl profiles or
+# where the user explicitly unmasks it as using it incorrectly
+# can break a system.  It is still available with crossdev.
+sys-libs/musl
+
 # Diego E. Pettenò <flameeyes@gentoo.org> (25 Apr 2010)
 #  on behalf of QA team <qa@gentoo.org
 #
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 1a37792c3a52..36b96109312c 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.172 2013/06/13 18:24:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.173 2013/06/16 00:04:10 blueness Exp $
 
 # masking here and unmasking in default/linux/
 kmod
@@ -157,6 +157,7 @@ elibc_FreeBSD
 elibc_HPUX
 elibc_Interix
 elibc_mintlib
+elibc_musl
 elibc_NetBSD
 elibc_OpenBSD
 elibc_SunOS
diff --git a/profiles/desc/elibc.desc b/profiles/desc/elibc.desc
index 0a4674cbb2de..902108fe91c2 100644
--- a/profiles/desc/elibc.desc
+++ b/profiles/desc/elibc.desc
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/elibc.desc,v 1.5 2011/12/18 09:04:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/elibc.desc,v 1.6 2013/06/16 00:04:10 blueness Exp $
 
 # This file contains descriptions of ELIBC USE_EXPAND flags.
 
@@ -14,6 +14,7 @@ glibc - ELIBC setting for systems that use the GNU C library
 HPUX - ELIBC setting for systems that use the HP-UX C library
 Interix - ELIBC setting for systems that use the Interix C library
 mintlib - ELIBC setting for systems that use the FreeMiNT C library
+musl - ELIBC setting for systems that use the musl C library
 NetBSD - ELIBC setting for systems that use the NetBSD C library
 OpenBSD - ELIBC setting for systems that use the OpenBSD C library
 SunOS - ELIBC setting for systems that use the Sun Solaris C library