From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 6 Oct 2005 22:39:21 +0000 (+0000)
Subject: cleanup virtual/os-header and unify into top linux dir
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=09e8866726a0fe1c8d2789a9148ddf21483c2130;p=gentoo.git

cleanup virtual/os-header and unify into top linux dir
---

diff --git a/profiles/default-linux/amd64/2005.0/virtuals b/profiles/default-linux/amd64/2005.0/virtuals
index ac988d9cd81f..0025d9ff724e 100644
--- a/profiles/default-linux/amd64/2005.0/virtuals
+++ b/profiles/default-linux/amd64/2005.0/virtuals
@@ -1,7 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/virtuals,v 1.3 2005/10/06 03:25:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/virtuals,v 1.4 2005/10/06 22:39:21 vapier Exp $
 
 virtual/alsa				media-sound/alsa-drivers
-virtual/os-headers                      sys-kernel/linux-headers
 virtual/linux-sources                   sys-kernel/gentoo-sources
diff --git a/profiles/default-linux/amd64/2005.1/virtuals b/profiles/default-linux/amd64/2005.1/virtuals
index de182ff1f991..03e46aea6e5c 100644
--- a/profiles/default-linux/amd64/2005.1/virtuals
+++ b/profiles/default-linux/amd64/2005.1/virtuals
@@ -1,7 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/virtuals,v 1.2 2005/10/06 03:25:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/virtuals,v 1.3 2005/10/06 22:39:21 vapier Exp $
 
 virtual/alsa				media-sound/alsa-drivers
-virtual/os-headers                      sys-kernel/linux-headers
 virtual/linux-sources                   sys-kernel/gentoo-sources
diff --git a/profiles/default-linux/amd64/virtuals b/profiles/default-linux/amd64/virtuals
index e165530d4590..5efd45ad6d61 100644
--- a/profiles/default-linux/amd64/virtuals
+++ b/profiles/default-linux/amd64/virtuals
@@ -1,9 +1,8 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/virtuals,v 1.17 2005/10/06 03:25:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/virtuals,v 1.18 2005/10/06 22:39:21 vapier Exp $
 
 virtual/os-headers			sys-kernel/linux-headers
 virtual/alsa				sys-kernel/gentoo-sources
 virtual/linux-sources		sys-kernel/gentoo-sources
 virtual/bootloader			sys-boot/grub
-virtual/os-headers			sys-kernel/linux-headers
diff --git a/profiles/default-linux/arm/virtuals b/profiles/default-linux/arm/virtuals
index 6cb7cee23350..cc1b68448f40 100644
--- a/profiles/default-linux/arm/virtuals
+++ b/profiles/default-linux/arm/virtuals
@@ -1,7 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/arm/virtuals,v 1.7 2005/07/20 00:16:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/arm/virtuals,v 1.8 2005/10/06 22:39:21 vapier Exp $
 
 virtual/bootloader			sys-boot/nettrom
 virtual/linux-sources		sys-kernel/vanilla-sources
-virtual/os-headers			sys-kernel/linux-headers
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/virtuals b/profiles/default-linux/ppc/2005.1/ppc64/virtuals
index b7916609c387..52256299efdd 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/virtuals
+++ b/profiles/default-linux/ppc/2005.1/ppc64/virtuals
@@ -1,9 +1,8 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/virtuals,v 1.2 2005/10/06 03:25:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/virtuals,v 1.3 2005/10/06 22:39:21 vapier Exp $
 
 virtual/bootloader     sys-boot/yaboot-static
 virtual/jdk            dev-java/ibm-jdk-bin
 virtual/jre            dev-java/ibm-jre-bin
 virtual/linux-sources  sys-kernel/gentoo-sources
-virtual/os-headers     sys-kernel/linux-headers
diff --git a/profiles/default-linux/ppc64/virtuals b/profiles/default-linux/ppc64/virtuals
index 4d03b88c629b..a6656eb4b434 100644
--- a/profiles/default-linux/ppc64/virtuals
+++ b/profiles/default-linux/ppc64/virtuals
@@ -1,9 +1,8 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/virtuals,v 1.3 2005/10/06 03:25:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/virtuals,v 1.4 2005/10/06 22:39:21 vapier Exp $
 
 virtual/bootloader     sys-boot/yaboot-static
 virtual/jdk            dev-java/ibm-jdk-bin
 virtual/jre            dev-java/ibm-jre-bin
 virtual/linux-sources  sys-kernel/gentoo-sources
-virtual/os-headers     sys-kernel/linux-headers
diff --git a/profiles/default-linux/s390/virtuals b/profiles/default-linux/s390/virtuals
index 858a69eab1aa..eda2ab868193 100644
--- a/profiles/default-linux/s390/virtuals
+++ b/profiles/default-linux/s390/virtuals
@@ -1,7 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/virtuals,v 1.4 2005/07/20 00:16:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/virtuals,v 1.5 2005/10/06 22:39:21 vapier Exp $
 
 virtual/bootloader		sys-apps/s390-tools
 virtual/linux-sources	sys-kernel/vanilla-sources
-virtual/os-headers		sys-kernel/linux-headers
diff --git a/profiles/default-linux/sparc/sparc32/2004.3/virtuals b/profiles/default-linux/sparc/sparc32/2004.3/virtuals
index 67a9253356d0..46e84c91d50a 100644
--- a/profiles/default-linux/sparc/sparc32/2004.3/virtuals
+++ b/profiles/default-linux/sparc/sparc32/2004.3/virtuals
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2004.3/virtuals,v 1.5 2005/10/06 03:25:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2004.3/virtuals,v 1.6 2005/10/06 22:39:21 vapier Exp $
 
 virtual/bootloader		sys-boot/silo
 virtual/cron			sys-process/dcron
@@ -9,4 +9,3 @@ virtual/jre			dev-java/blackdown-jre
 virtual/linux-sources		sys-kernel/sparc-sources
 virtual/logger			app-admin/sysklogd
 virtual/mta			mail-mta/ssmtp
-virtual/os-headers		sys-kernel/linux-headers
diff --git a/profiles/default-linux/sparc/sparc32/2005.0/packages b/profiles/default-linux/sparc/sparc32/2005.0/packages
index aedbd467055b..9a4bf51526cb 100644
--- a/profiles/default-linux/sparc/sparc32/2005.0/packages
+++ b/profiles/default-linux/sparc/sparc32/2005.0/packages
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.0/packages,v 1.2 2005/06/14 14:13:15 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.0/packages,v 1.3 2005/10/06 22:39:21 vapier Exp $
 
 *>=sys-libs/glibc-2.3.1-r2
 *net-misc/dhcpcd
@@ -17,6 +17,5 @@
 *<sys-devel/gcc-3.4.1
 
 # Use 2.4 linux-headers by default
--*virtual/os-headers
 *<sys-kernel/linux-headers-2.5
 
diff --git a/profiles/default-linux/sparc/sparc32/2005.0/virtuals b/profiles/default-linux/sparc/sparc32/2005.0/virtuals
index 85ff100297be..bb1c47a15842 100644
--- a/profiles/default-linux/sparc/sparc32/2005.0/virtuals
+++ b/profiles/default-linux/sparc/sparc32/2005.0/virtuals
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.0/virtuals,v 1.4 2005/10/06 03:25:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.0/virtuals,v 1.5 2005/10/06 22:39:21 vapier Exp $
 
 virtual/bootloader		sys-boot/silo
 virtual/cron			sys-process/dcron
@@ -9,4 +9,3 @@ virtual/jre			dev-java/blackdown-jre
 virtual/linux-sources		sys-kernel/sparc-sources
 virtual/logger			app-admin/sysklogd
 virtual/mta			mail-mta/ssmtp
-virtual/os-headers		sys-kernel/linux-headers
diff --git a/profiles/default-linux/sparc/sparc32/2005.1/packages b/profiles/default-linux/sparc/sparc32/2005.1/packages
index b95344879207..d760fef782f6 100644
--- a/profiles/default-linux/sparc/sparc32/2005.1/packages
+++ b/profiles/default-linux/sparc/sparc32/2005.1/packages
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.1/packages,v 1.1 2005/06/14 14:12:45 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.1/packages,v 1.2 2005/10/06 22:39:21 vapier Exp $
 
 *>=sys-libs/glibc-2.3.1-r2
 *net-misc/dhcpcd
@@ -17,6 +17,5 @@
 *<sys-devel/gcc-3.4.1
 
 # Use 2.4 linux-headers by default
--*virtual/os-headers
 *<sys-kernel/linux-headers-2.5
 
diff --git a/profiles/default-linux/sparc/sparc32/2005.1/virtuals b/profiles/default-linux/sparc/sparc32/2005.1/virtuals
index ff45216b4d6f..2ba84790e060 100644
--- a/profiles/default-linux/sparc/sparc32/2005.1/virtuals
+++ b/profiles/default-linux/sparc/sparc32/2005.1/virtuals
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.1/virtuals,v 1.3 2005/10/06 03:25:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.1/virtuals,v 1.4 2005/10/06 22:39:21 vapier Exp $
 
 virtual/bootloader		sys-boot/silo
 virtual/cron			sys-process/dcron
@@ -9,4 +9,3 @@ virtual/jre			dev-java/blackdown-jre
 virtual/linux-sources		sys-kernel/sparc-sources
 virtual/logger			app-admin/sysklogd
 virtual/mta			mail-mta/ssmtp
-virtual/os-headers		sys-kernel/linux-headers
diff --git a/profiles/default-linux/sparc/sparc32/dev/24headers/packages b/profiles/default-linux/sparc/sparc32/dev/24headers/packages
index d00799b00ca4..a9428632bc8a 100644
--- a/profiles/default-linux/sparc/sparc32/dev/24headers/packages
+++ b/profiles/default-linux/sparc/sparc32/dev/24headers/packages
@@ -1,8 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/dev/24headers/packages,v 1.1 2005/05/24 03:39:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/dev/24headers/packages,v 1.2 2005/10/06 22:39:21 vapier Exp $
 
 # Use 2.4 linux-headers by default
--*virtual/os-headers
 *<sys-kernel/linux-headers-2.5
 *<=sys-libs/glibc-2.3.3.20040420-r2
diff --git a/profiles/default-linux/sparc/sparc32/dev/gcc33/24headers/packages b/profiles/default-linux/sparc/sparc32/dev/gcc33/24headers/packages
index 368e1e9e1832..2f5e6e23f601 100644
--- a/profiles/default-linux/sparc/sparc32/dev/gcc33/24headers/packages
+++ b/profiles/default-linux/sparc/sparc32/dev/gcc33/24headers/packages
@@ -1,7 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/dev/gcc33/24headers/packages,v 1.1 2005/05/24 03:39:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/dev/gcc33/24headers/packages,v 1.2 2005/10/06 22:39:21 vapier Exp $
 
 # Use 2.4 linux-headers by default
--*virtual/os-headers
 *<sys-kernel/linux-headers-2.5
diff --git a/profiles/default-linux/sparc/sparc64/2004.2/packages b/profiles/default-linux/sparc/sparc64/2004.2/packages
index 5e8f1535d8f1..61a91e787ae3 100644
--- a/profiles/default-linux/sparc/sparc64/2004.2/packages
+++ b/profiles/default-linux/sparc/sparc64/2004.2/packages
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/packages,v 1.4 2005/03/07 00:09:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/packages,v 1.5 2005/10/06 22:39:21 vapier Exp $
 
 # sparc64 v9 32-bit userland packages
 
@@ -13,6 +13,5 @@
 *<sys-devel/gcc-3.4.1
 
 # Use 2.4 linux-headers by default
--*virtual/os-headers
 *<sys-kernel/linux-headers-2.5
 
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/26headers/packages b/profiles/default-linux/sparc/sparc64/2004.3/26headers/packages
index 64e84f6089e1..1093f555ae2c 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/26headers/packages
+++ b/profiles/default-linux/sparc/sparc64/2004.3/26headers/packages
@@ -1,8 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/26headers/packages,v 1.1 2005/01/04 12:06:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/26headers/packages,v 1.2 2005/10/06 22:39:21 vapier Exp $
 
 # We use 2.6 headers           
 -*<sys-kernel/linux-headers-2.5
 #*<sys-kernel/linux-headers-2.7
-*virtual/os-headers
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/26headers/virtuals b/profiles/default-linux/sparc/sparc64/2004.3/26headers/virtuals
index 1ee471891037..c5436546887e 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/26headers/virtuals
+++ b/profiles/default-linux/sparc/sparc64/2004.3/26headers/virtuals
@@ -1,2 +1 @@
 virtual/linux-sources	sys-kernel/gentoo-sources
-virtual/os-headers		sys-kernel/linux-headers
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/packages b/profiles/default-linux/sparc/sparc64/2004.3/packages
index 4bdc5c86384b..26db8c2cf2eb 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/packages
+++ b/profiles/default-linux/sparc/sparc64/2004.3/packages
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/packages,v 1.4 2005/03/07 00:09:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/packages,v 1.5 2005/10/06 22:39:21 vapier Exp $
 
 # Since we're running a sparc64 kernel w/ 32bit (v9) userland,
 # we need gcc-sparc64 for kernels.
@@ -11,6 +11,5 @@
 *<sys-devel/gcc-3.4.1
 
 # Use 2.4 linux-headers by default
--*virtual/os-headers
 *<sys-kernel/linux-headers-2.5
 
diff --git a/profiles/default-linux/sparc/sparc64/2005.0/packages b/profiles/default-linux/sparc/sparc64/2005.0/packages
index 64491ef2797b..94d183ed276b 100644
--- a/profiles/default-linux/sparc/sparc64/2005.0/packages
+++ b/profiles/default-linux/sparc/sparc64/2005.0/packages
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/packages,v 1.2 2005/03/07 00:09:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/packages,v 1.3 2005/10/06 22:39:21 vapier Exp $
 
 # Since we're running a sparc64 kernel w/ 32bit (v9) userland,
 # we need gcc-sparc64 for kernels.
@@ -11,6 +11,5 @@
 *<sys-devel/gcc-3.4.1
 
 # Use 2.4 linux-headers by default
--*virtual/os-headers
 *<sys-kernel/linux-headers-2.5
 
diff --git a/profiles/default-linux/sparc/sparc64/2005.1/packages b/profiles/default-linux/sparc/sparc64/2005.1/packages
index 7d032ec035cc..c4e3d00ff433 100644
--- a/profiles/default-linux/sparc/sparc64/2005.1/packages
+++ b/profiles/default-linux/sparc/sparc64/2005.1/packages
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.1/packages,v 1.1 2005/06/14 14:08:46 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.1/packages,v 1.2 2005/10/06 22:39:21 vapier Exp $
 
 # Since we're running a sparc64 kernel w/ 32bit (v9) userland,
 # we need gcc-sparc64 for kernels.
@@ -11,6 +11,5 @@
 *<sys-devel/gcc-3.4.1
 
 # Use 2.4 linux-headers by default
--*virtual/os-headers
 *<sys-kernel/linux-headers-2.5
 
diff --git a/profiles/default-linux/sparc/sparc64/dev/24headers/packages b/profiles/default-linux/sparc/sparc64/dev/24headers/packages
index 64a920660f29..ad93c79be8ef 100644
--- a/profiles/default-linux/sparc/sparc64/dev/24headers/packages
+++ b/profiles/default-linux/sparc/sparc64/dev/24headers/packages
@@ -1,8 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/24headers/packages,v 1.3 2005/03/30 04:56:11 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/24headers/packages,v 1.4 2005/10/06 22:39:21 vapier Exp $
 
 # Use 2.4 linux-headers by default
--*virtual/os-headers
 *<sys-kernel/linux-headers-2.5
 *<=sys-libs/glibc-2.3.3.20040420-r2
diff --git a/profiles/default-linux/sparc/sparc64/dev/java/24headers/packages b/profiles/default-linux/sparc/sparc64/dev/java/24headers/packages
index ad06049d617d..18412ed9cac4 100644
--- a/profiles/default-linux/sparc/sparc64/dev/java/24headers/packages
+++ b/profiles/default-linux/sparc/sparc64/dev/java/24headers/packages
@@ -1,7 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/java/24headers/packages,v 1.1 2005/08/23 23:01:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/java/24headers/packages,v 1.2 2005/10/06 22:39:21 vapier Exp $
 
 # Use 2.4 linux-headers by default
--*virtual/os-headers
 *<sys-kernel/linux-headers-2.5
diff --git a/profiles/default-linux/sparc/sparc64/server/packages b/profiles/default-linux/sparc/sparc64/server/packages
index e6896877b87f..bc49e9544292 100644
--- a/profiles/default-linux/sparc/sparc64/server/packages
+++ b/profiles/default-linux/sparc/sparc64/server/packages
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/server/packages,v 1.1 2005/03/30 19:38:57 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/server/packages,v 1.2 2005/10/06 22:39:21 vapier Exp $
 
 # Since we're running a sparc64 kernel w/ 32bit (v9) userland,
 # we need gcc-sparc64 for kernels.
@@ -11,6 +11,5 @@
 *<sys-devel/gcc-3.4.1
 
 # Use 2.4 linux-headers by default
--*virtual/os-headers
 *<sys-kernel/linux-headers-2.5
 
diff --git a/profiles/default-linux/x86/2004.2/gcc34/2.6/virtuals b/profiles/default-linux/x86/2004.2/gcc34/2.6/virtuals
index 0e013feb90d1..f012f1cf9cb7 100644
--- a/profiles/default-linux/x86/2004.2/gcc34/2.6/virtuals
+++ b/profiles/default-linux/x86/2004.2/gcc34/2.6/virtuals
@@ -1,2 +1 @@
-virtual/os-headers              sys-kernel/linux-headers
 virtual/linux-sources		sys-kernel/gentoo-sources
diff --git a/profiles/default-linux/x86/2005.0/2.4/virtuals b/profiles/default-linux/x86/2005.0/2.4/virtuals
index 5d48d3352993..927feec5a5b4 100644
--- a/profiles/default-linux/x86/2005.0/2.4/virtuals
+++ b/profiles/default-linux/x86/2005.0/2.4/virtuals
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/2.4/virtuals,v 1.1 2004/12/03 14:36:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/2.4/virtuals,v 1.2 2005/10/06 22:39:21 vapier Exp $
 
 # This file is used to either override or extend the parent profile's
 # virtuals mappings.   In this case, this is for ARCHITECTURE SPECIFIC
@@ -9,5 +9,4 @@
 virtual/dev-manager		sys-fs/devfsd
 
 # These will be removed once the headers and sources are merged
-virtual/os-headers		sys-kernel/linux-headers
 virtual/linux-sources	sys-kernel/gentoo-sources
diff --git a/profiles/default-linux/x86/dev/2005.0/2.4/virtuals b/profiles/default-linux/x86/dev/2005.0/2.4/virtuals
index 7d580d5a5c00..11e5d34316be 100644
--- a/profiles/default-linux/x86/dev/2005.0/2.4/virtuals
+++ b/profiles/default-linux/x86/dev/2005.0/2.4/virtuals
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2005.0/2.4/virtuals,v 1.1 2005/10/03 12:42:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2005.0/2.4/virtuals,v 1.2 2005/10/06 22:39:21 vapier Exp $
 
 # This file is used to either override or extend the parent profile's
 # virtuals mappings.   In this case, this is for ARCHITECTURE SPECIFIC
@@ -9,5 +9,4 @@
 virtual/dev-manager		sys-fs/devfsd
 
 # These will be removed once the headers and sources are merged
-virtual/os-headers		sys-kernel/linux-headers
 virtual/linux-sources	sys-kernel/gentoo-sources