Profile updates for udev going default and linux26-headers -> linux-headers and *-dev-sources -> *-sources moves.

24 files changed, 41 insertions, 94 deletions

diff --git a/profiles/default-linux/amd64/virtuals b/profiles/default-linux/amd64/virtuals
index eb62c22fa361..fd62b8eb438d 100644
--- a/profiles/default-linux/amd64/virtuals
+++ b/profiles/default-linux/amd64/virtuals
@@ -1,10 +1,10 @@
 # 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.15 2005/01/12 04:47:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/virtuals,v 1.16 2005/03/28 01:39:06 wolf31o2 Exp $
 
-virtual/os-headers			sys-kernel/linux26-headers
-virtual/alsa				sys-kernel/gentoo-dev-sources
-virtual/kernel				sys-kernel/linux26-headers
-virtual/linux-sources			sys-kernel/gentoo-dev-sources
-virtual/bootloader			sys-boot/grub-static
-virtual/os-headers			sys-kernel/linux26-headers
+virtual/os-headers			sys-kernel/linux-headers
+virtual/alsa				sys-kernel/gentoo-sources
+virtual/kernel				sys-kernel/linux-headers
+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 850a43e4f716..e2bace424f41 100644
--- a/profiles/default-linux/arm/virtuals
+++ b/profiles/default-linux/arm/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/arm/virtuals,v 1.5 2004/11/03 00:23:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/arm/virtuals,v 1.6 2005/03/28 01:39:06 wolf31o2 Exp $
 
 virtual/bootloader			sys-boot/nettrom
-virtual/dev-manager			sys-fs/udev
-virtual/linux-sources		sys-kernel/development-sources
-virtual/kernel				sys-kernel/development-sources
-virtual/os-headers			sys-kernel/linux26-headers
+virtual/linux-sources		sys-kernel/vanilla-sources
+virtual/kernel				sys-kernel/vanilla-sources
+virtual/os-headers			sys-kernel/linux-headers
diff --git a/profiles/default-linux/hppa/2005.0/virtuals b/profiles/default-linux/hppa/2005.0/virtuals
deleted file mode 100644
index 2a143d84d475..000000000000
--- a/profiles/default-linux/hppa/2005.0/virtuals
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/2005.0/virtuals,v 1.2 2005/01/21 20:01:11 wolf31o2 Exp $
-
-# This file is used to either override or extend the parent profile's
-# virtuals mappings.   In this case, this is for ARCHITECTURE SPECIFIC
-# mappings
-
-virtual/dev-manager		sys-fs/udev
diff --git a/profiles/default-linux/ia64/2005.0/virtuals b/profiles/default-linux/ia64/2005.0/virtuals
deleted file mode 100644
index a05a7e19eb6e..000000000000
--- a/profiles/default-linux/ia64/2005.0/virtuals
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2005.0/virtuals,v 1.2 2005/01/21 21:49:14 wolf31o2 Exp $
-
-# This file is used to either override or extend the parent profile's
-# virtuals mappings.   In this case, this is for ARCHITECTURE SPECIFIC
-# mappings
-
-virtual/dev-manager		sys-fs/udev
diff --git a/profiles/default-linux/ia64/virtuals b/profiles/default-linux/ia64/virtuals
index 6e1580100039..1ecd5332275d 100644
--- a/profiles/default-linux/ia64/virtuals
+++ b/profiles/default-linux/ia64/virtuals
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/virtuals,v 1.3 2005/02/13 02:48:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/virtuals,v 1.4 2005/03/28 01:39:06 wolf31o2 Exp $
 
 virtual/bootloader			sys-boot/elilo
-virtual/linux-sources		sys-kernel/development-sources
+virtual/linux-sources		sys-kernel/vanilla-sources
 virtual/jre					dev-java/jrockit-jdk-bin
 virtual/jdk					dev-java/jrockit-jdk-bin
diff --git a/profiles/default-linux/m68k/virtuals b/profiles/default-linux/m68k/virtuals
deleted file mode 100644
index 211c061ecaca..000000000000
--- a/profiles/default-linux/m68k/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/m68k/virtuals,v 1.2 2005/03/04 04:52:49 vapier Exp $
-
-virtual/dev-manager			sys-fs/udev
diff --git a/profiles/default-linux/ppc/2004.3/virtuals b/profiles/default-linux/ppc/2004.3/virtuals
deleted file mode 100644
index 084c7f1ba4be..000000000000
--- a/profiles/default-linux/ppc/2004.3/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/dev-manager	sys-fs/udev
diff --git a/profiles/default-linux/ppc/2005.0/virtuals b/profiles/default-linux/ppc/2005.0/virtuals
deleted file mode 100644
index 084c7f1ba4be..000000000000
--- a/profiles/default-linux/ppc/2005.0/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/dev-manager	sys-fs/udev
diff --git a/profiles/default-linux/ppc/virtuals b/profiles/default-linux/ppc/virtuals
index 0a441582b44a..5932f1b8f276 100644
--- a/profiles/default-linux/ppc/virtuals
+++ b/profiles/default-linux/ppc/virtuals
@@ -1,10 +1,10 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/virtuals,v 1.12 2005/03/05 23:00:49 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/virtuals,v 1.13 2005/03/28 01:39:06 wolf31o2 Exp $
 
 virtual/bootloader		sys-boot/yaboot
-virtual/jdk			dev-java/ibm-jdk-bin
-virtual/jre			dev-java/ibm-jre-bin
-virtual/linux-sources		sys-kernel/gentoo-dev-sources
-virtual/ghc			dev-lang/ghc
-virtual/ooo			app-office/openoffice
+virtual/jdk				dev-java/ibm-jdk-bin
+virtual/jre				dev-java/ibm-jre-bin
+virtual/linux-sources	sys-kernel/gentoo-sources
+virtual/ghc				dev-lang/ghc
+virtual/ooo				app-office/openoffice
diff --git a/profiles/default-linux/ppc64/2005.0/virtuals b/profiles/default-linux/ppc64/2005.0/virtuals
deleted file mode 100644
index 2828303407ec..000000000000
--- a/profiles/default-linux/ppc64/2005.0/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/dev-manager    sys-fs/udev
diff --git a/profiles/default-linux/ppc64/970/virtuals b/profiles/default-linux/ppc64/970/virtuals
deleted file mode 100644
index 2828303407ec..000000000000
--- a/profiles/default-linux/ppc64/970/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/dev-manager    sys-fs/udev
diff --git a/profiles/default-linux/ppc64/power3/virtuals b/profiles/default-linux/ppc64/power3/virtuals
deleted file mode 100644
index 2828303407ec..000000000000
--- a/profiles/default-linux/ppc64/power3/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/dev-manager    sys-fs/udev
diff --git a/profiles/default-linux/ppc64/power4/virtuals b/profiles/default-linux/ppc64/power4/virtuals
deleted file mode 100644
index 2828303407ec..000000000000
--- a/profiles/default-linux/ppc64/power4/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/dev-manager    sys-fs/udev
diff --git a/profiles/default-linux/ppc64/power5/virtuals b/profiles/default-linux/ppc64/power5/virtuals
deleted file mode 100644
index 2828303407ec..000000000000
--- a/profiles/default-linux/ppc64/power5/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/dev-manager    sys-fs/udev
diff --git a/profiles/default-linux/ppc64/virtuals b/profiles/default-linux/ppc64/virtuals
index 3a7d4a8b69e2..736e8213b2cb 100644
--- a/profiles/default-linux/ppc64/virtuals
+++ b/profiles/default-linux/ppc64/virtuals
@@ -1,11 +1,10 @@
 # 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.1 2005/01/03 17:58:25 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/virtuals,v 1.2 2005/03/28 01:39:07 wolf31o2 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-dev-sources
-virtual/kernel         sys-kernel/linux26-headers
-virtual/os-headers     sys-kernel/linux26-headers
-virtual/dev-manager    sys-fs/udev
+virtual/linux-sources  sys-kernel/gentoo-sources
+virtual/kernel         sys-kernel/linux-headers
+virtual/os-headers     sys-kernel/linux-headers
diff --git a/profiles/default-linux/s390/virtuals b/profiles/default-linux/s390/virtuals
index 5afb9389f721..a62bc9cc4b70 100644
--- a/profiles/default-linux/s390/virtuals
+++ b/profiles/default-linux/s390/virtuals
@@ -1,8 +1,8 @@
 # Copyright 2001-2004 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.2 2004/10/01 12:51:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/virtuals,v 1.3 2005/03/28 01:39:07 wolf31o2 Exp $
 
 virtual/bootloader		sys-apps/s390-tools
-virtual/kernel			sys-kernel/development-sources
-virtual/linux-sources	sys-kernel/development-sources
+virtual/kernel			sys-kernel/vanilla-sources
+virtual/linux-sources	sys-kernel/vanilla-sources
 virtual/os-headers		sys-kernel/linux-headers
diff --git a/profiles/default-linux/sh/virtuals b/profiles/default-linux/sh/virtuals
deleted file mode 100644
index 6e63b5ada82d..000000000000
--- a/profiles/default-linux/sh/virtuals
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sh/virtuals,v 1.1 2004/10/22 21:45:00 vapier Exp $
-
-virtual/dev-manager			sys-fs/udev
-virtual/kernel				sys-kernel/development-sources
-virtual/os-headers			sys-kernel/linux26-headers
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/26headers/virtuals b/profiles/default-linux/sparc/sparc64/2004.3/26headers/virtuals
index bbc51d0696a0..2ea965791ac8 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/26headers/virtuals
+++ b/profiles/default-linux/sparc/sparc64/2004.3/26headers/virtuals
@@ -1,3 +1,3 @@
-virtual/kernel		sys-kernel/gentoo-dev-sources
-virtual/linux-sources	sys-kernel/gentoo-dev-sources
-virtual/os-headers	sys-kernel/linux26-headers
+virtual/kernel			sys-kernel/gentoo-sources
+virtual/linux-sources	sys-kernel/gentoo-sources
+virtual/os-headers		sys-kernel/linux-headers
diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals b/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals
index 5e9441f5aa52..9104b354949f 100644
--- a/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals
+++ b/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals
@@ -1,5 +1,5 @@
 # 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/dev/multilib/virtuals,v 1.1 2005/03/07 00:05:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals,v 1.2 2005/03/28 01:39:07 wolf31o2 Exp $
 
-virtual/linux-sources			sys-kernel/gentoo-dev-sources
+virtual/linux-sources			sys-kernel/gentoo-sources
diff --git a/profiles/default-linux/x86/2004.2/gcc34/2.6/packages b/profiles/default-linux/x86/2004.2/gcc34/2.6/packages
index e0bb7f85c8c7..a80f50a656b8 100644
--- a/profiles/default-linux/x86/2004.2/gcc34/2.6/packages
+++ b/profiles/default-linux/x86/2004.2/gcc34/2.6/packages
@@ -1 +1,2 @@
 >=sys-kernel/linux26-headers-2.6.6-r1
+>=sys-kernel/linux-headers-2.6.6-r1
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 9a9f0522f641..e145edf04ff9 100644
--- a/profiles/default-linux/x86/2004.2/gcc34/2.6/virtuals
+++ b/profiles/default-linux/x86/2004.2/gcc34/2.6/virtuals
@@ -1,3 +1,3 @@
-virtual/kernel			sys-kernel/linux26-headers
-virtual/os-headers              sys-kernel/linux26-headers
-virtual/linux-sources		sys-kernel/gentoo-dev-sources
+virtual/kernel			sys-kernel/linux-headers
+virtual/os-headers              sys-kernel/linux-headers
+virtual/linux-sources		sys-kernel/gentoo-sources
diff --git a/profiles/default-linux/x86/2005.0/virtuals b/profiles/default-linux/x86/2005.0/virtuals
deleted file mode 100644
index c052995acbf5..000000000000
--- a/profiles/default-linux/x86/2005.0/virtuals
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/virtuals,v 1.2 2005/01/21 18:11:28 wolf31o2 Exp $
-
-# This file is used to either override or extend the parent profile's
-# virtuals mappings.   In this case, this is for ARCHITECTURE SPECIFIC
-# mappings
-
-virtual/dev-manager		sys-fs/udev
diff --git a/profiles/package.mask b/profiles/package.mask
index 9632d7db26d0..a4befcd53ea1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 #####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.3769 2005/03/27 09:39:07 usata Exp $#
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.3770 2005/03/28 01:39:06 wolf31o2 Exp $#
 # When you add an entry to this file, add your name, the date, and an
 # explanation of why something is getting masked
 #
@@ -907,17 +907,6 @@ app-portage/ebuilder
 # Masking for security reasons, see bug #68712
 <sci-calculators/tilp-6.76
 
-# <johnm@gentoo.org> (1/12/2004)
-# Masking all 2.6 versions of kernel packages which were originally
-# 2.4 only so that we can merge 2.6 with 2.4 without forcing a 
-# mass upgrade.
->=sys-kernel/gentoo-sources-2.6
->=sys-kernel/hardened-sources-2.6
->=sys-kernel/rsbac-sources-2.6
->=sys-kernel/vanilla-sources-2.6
-# this includes the headers too
->=sys-kernel/linux-headers-2.6
-
 # <nakano@gentoo.org> (28 Nov 2004)
 # bincima-1.3* are beta versions for testing purposes, 
 # probably very unstable.
diff --git a/profiles/updates/1Q-2005 b/profiles/updates/1Q-2005
index a0fb0542ae00..e90eb1bcdcfc 100644
--- a/profiles/updates/1Q-2005
+++ b/profiles/updates/1Q-2005
@@ -248,3 +248,8 @@ move net-www/rawdog net-news/rawdog
 move net-www/mozilla www-client/mozilla
 move net-www/epiphany www-client/epiphany
 move net-www/mozilla-launcher www-client/mozilla-launcher
+move sys-kernel/gentoo-dev-sources sys-kernel/gentoo-sources
+move sys-kernel/hardened-dev-sources sys-kernel/hardened-sources
+move sys-kernel/rsbac-dev-sources sys-kernel/rsbac-sources
+move sys-kernel/development-sources sys-kernel/vanilla-sources
+move sys-kernel/linux26-headers sys-kernel/linux-headers