profiles/base,prefix/windows: Cygwin,Interix are pure ELIBC values, KERNEL is Winnt (bug#544518)

8 files changed, 23 insertions, 20 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index d32349436de0..bacc7d01befe 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.10019 2015/05/28 18:04:43 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.10020 2015/05/29 09:08:51 haubi 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 May 2015; Michael Haubenwallner <haubi@gentoo.org> base/make.defaults,
+  base/use.mask, prefix/windows/cygwin/make.defaults,
+  prefix/windows/interix/make.defaults, prefix/windows/use.force,
+  prefix/windows/use.mask, prefix/windows/winnt/make.defaults:
+  Cygwin,Interix are pure ELIBC values, KERNEL is Winnt (bug#544518)
+
   28 May 2015; Andreas K. Hüttel <dilfridge@gentoo.org> package.mask:
   Improve lcms:0 mask message
 
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 255cb72ec38f..119a7bc9f102 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.125 2015/04/18 23:35:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.126 2015/05/29 09:08:51 haubi Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -11,7 +11,7 @@ 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 nios2 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 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_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt"
 USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 4105e80bbdeb..d5e4b68625d8 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.221 2015/04/27 16:34:50 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.222 2015/05/29 09:08:51 haubi Exp $
 
 # cilk has been ported only to x86 systems
 cilk
@@ -213,10 +213,10 @@ kernel_Darwin
 kernel_FreeBSD
 kernel_freemint
 kernel_HPUX
-kernel_Interix
 kernel_NetBSD
 kernel_OpenBSD
 kernel_SunOS
+kernel_Winnt
 
 # Diego Pettenò <flameeyes@gentoo.org> (6 Dec 2006)
 # Mask specific Apple drivers
diff --git a/profiles/prefix/windows/cygwin/make.defaults b/profiles/prefix/windows/cygwin/make.defaults
index ac24dae74a6a..2dd61a3ced8b 100644
--- a/profiles/prefix/windows/cygwin/make.defaults
+++ b/profiles/prefix/windows/cygwin/make.defaults
@@ -1,13 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/cygwin/make.defaults,v 1.1 2010/08/31 06:55:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/cygwin/make.defaults,v 1.2 2015/05/29 09:08:51 haubi Exp $
 
 # System-wide defaults for all Cygwin profiles
 # This file should rarely need to be changed
 
 # 'Sane' defaults
 ELIBC="Cygwin"
-KERNEL="Cygwin"
 
 # no scanelf
 FEATURES="nostrip"
diff --git a/profiles/prefix/windows/interix/make.defaults b/profiles/prefix/windows/interix/make.defaults
index 1105eec68999..ca5384afccef 100644
--- a/profiles/prefix/windows/interix/make.defaults
+++ b/profiles/prefix/windows/interix/make.defaults
@@ -1,13 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/make.defaults,v 1.2 2009/06/30 16:35:03 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/make.defaults,v 1.3 2015/05/29 09:08:51 haubi Exp $
 
 # System-wide defaults for all Interix profiles
 # This file should rarely need to be changed
 
 # 'Sane' defaults
 ELIBC="Interix"
-KERNEL="Interix"
 
 # no scanelf
 FEATURES="nostrip"
diff --git a/profiles/prefix/windows/use.force b/profiles/prefix/windows/use.force
index 30f02fc870ac..412056785e1d 100644
--- a/profiles/prefix/windows/use.force
+++ b/profiles/prefix/windows/use.force
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/use.force,v 1.1 2014/04/30 22:30:20 redlizard Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/use.force,v 1.2 2015/05/29 09:08:51 haubi Exp $
 
 # Re-add Windows kernel
-kernel_Interix
+kernel_Winnt
diff --git a/profiles/prefix/windows/use.mask b/profiles/prefix/windows/use.mask
index 81cd3ed38f58..2e14db8e6f45 100644
--- a/profiles/prefix/windows/use.mask
+++ b/profiles/prefix/windows/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/use.mask,v 1.1 2014/04/30 22:30:20 redlizard Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/use.mask,v 1.2 2015/05/29 09:08:51 haubi Exp $
 
 # Re-add Windows kernel
--kernel_Interix
+-kernel_Winnt
diff --git a/profiles/prefix/windows/winnt/make.defaults b/profiles/prefix/windows/winnt/make.defaults
index b574c3bd6b2c..be48e59e850d 100644
--- a/profiles/prefix/windows/winnt/make.defaults
+++ b/profiles/prefix/windows/winnt/make.defaults
@@ -1,12 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/make.defaults,v 1.2 2009/06/30 16:35:04 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/make.defaults,v 1.3 2015/05/29 09:08:51 haubi Exp $
 
 # System-wide defaults for all Windows profiles
 # This file should rarely need to be changed
 
 # 'Sane' defaults
 ELIBC="Winnt"
-KERNEL="Winnt"
 
 FEATURES="nostrip"