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

5 files changed, 12 insertions, 15 deletions

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"