Properly sync various ELIBCs between base/make.defaults and desc/elibc.desc

3 files changed, 11 insertions, 5 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index a94dc7027a31..a2eb4ae997c1 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8895 2014/04/29 07:11:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8896 2014/04/29 13:19:28 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!
 
+  29 Apr 2014; Anthony G. Basile <blueness@gentoo.org> base/make.defaults,
+  desc/elibc.desc:
+  Properly sync various ELIBCs between base/make.defaults and desc/elibc.desc
+
   29 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> package.mask:
   Adjusted mask for net-libs/ptlib and net-libs/opal so newer versions get
   covered as well.
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index ed766dc4934d..a5d8ff97e808 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.115 2014/04/22 01:22:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.116 2014/04/29 13:19:29 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 arm64 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 musl NetBSD OpenBSD SunOS uclibc Winnt"
+USE_EXPAND_VALUES_ELIBC="AIX Cygwin Darwin DragonFly 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/desc/elibc.desc b/profiles/desc/elibc.desc
index 902108fe91c2..19b34499001f 100644
--- a/profiles/desc/elibc.desc
+++ b/profiles/desc/elibc.desc
@@ -1,12 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/elibc.desc,v 1.6 2013/06/16 00:04:10 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/elibc.desc,v 1.7 2014/04/29 13:19:29 blueness Exp $
 
 # This file contains descriptions of ELIBC USE_EXPAND flags.
 
 # Keep it sorted.
 
 AIX - ELIBC setting for systems that use the AIX C library
+Cygwin - ELIBC setting for systems that use Cygwin
 Darwin - ELIBC setting for systems that use the Darwin C library
 DragonFly - ELIBC setting for systems that use the DragonFly C library
 FreeBSD - ELIBC setting for systems that use the FreeBSD C library
@@ -19,3 +20,4 @@ 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
 uclibc - ELIBC setting for systems that use the uClibc C library
+Winnt - ELIBC setting for systems that use Winnt