22 files changed, 38 insertions, 80 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index ecbff77c84a5..0e24e36f4a56 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5340 2011/04/29 20:50:40 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5341 2011/04/30 17:18:17 ulm 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!
 
+  30 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -hardened/linux/virtuals,
+  -hardened/virtuals, -uclibc/mips/virtuals, -uclibc/ppc/hardened/virtuals,
+  -uclibc/virtuals, -uclibc/x86/hardened/virtuals, selinux/packages:
+  Remove old-style virtual/linux-sources, bug 118442.
+
   29 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org> package.mask:
   Mask notification-daemon-0.7, GTK3 version
 
diff --git a/profiles/arch/arm/ChangeLog b/profiles/arch/arm/ChangeLog
index fb9507ec8090..97426333d479 100644
--- a/profiles/arch/arm/ChangeLog
+++ b/profiles/arch/arm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/ARM profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.123 2011/04/23 18:47:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/ChangeLog,v 1.124 2011/04/30 17:18:18 ulm Exp $
+
+  30 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -virtuals:
+  Remove old-style virtual/linux-sources, bug 118442.
 
   23 Apr 2011; Raúl Porcel <armin76@gentoo.org> use.mask:
   Add video_cards_nouveau to use.mask
diff --git a/profiles/arch/arm/virtuals b/profiles/arch/arm/virtuals
deleted file mode 100644
index d045cc36fdc0..000000000000
--- a/profiles/arch/arm/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/virtuals,v 1.3 2011/04/02 12:50:28 ulm Exp $
-
-virtual/linux-sources		sys-kernel/vanilla-sources
diff --git a/profiles/arch/mips/ChangeLog b/profiles/arch/mips/ChangeLog
index b11642d09bd8..4f7de5419661 100644
--- a/profiles/arch/mips/ChangeLog
+++ b/profiles/arch/mips/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/MIPS profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.53 2011/04/14 05:57:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.54 2011/04/30 17:18:18 ulm Exp $
+
+  30 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -virtuals:
+  Remove old-style virtual/linux-sources, bug 118442.
 
   14 Apr 2011; Ulrich Mueller <ulm@gentoo.org> virtuals:
   Remove old-style virtual/os-headers, bug 358999.
diff --git a/profiles/arch/mips/virtuals b/profiles/arch/mips/virtuals
deleted file mode 100644
index 15474713e4cc..000000000000
--- a/profiles/arch/mips/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/virtuals,v 1.6 2011/04/14 05:57:29 ulm Exp $
-
-virtual/linux-sources		sys-kernel/mips-sources
diff --git a/profiles/arch/s390/ChangeLog b/profiles/arch/s390/ChangeLog
index 5c8d8bf77255..96de7c226c99 100644
--- a/profiles/arch/s390/ChangeLog
+++ b/profiles/arch/s390/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/s390 profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/ChangeLog,v 1.38 2011/04/02 12:50:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/ChangeLog,v 1.39 2011/04/30 17:18:18 ulm Exp $
+
+  30 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -virtuals:
+  Remove old-style virtual/linux-sources, bug 118442.
 
   02 Apr 2011; Ulrich Mueller <ulm@gentoo.org> virtuals:
   Remove old-style virtual/bootloader, bug 359971.
diff --git a/profiles/arch/s390/virtuals b/profiles/arch/s390/virtuals
deleted file mode 100644
index 44c8f801496e..000000000000
--- a/profiles/arch/s390/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/s390/virtuals,v 1.3 2011/04/02 12:50:28 ulm Exp $
-
-virtual/linux-sources		sys-kernel/vanilla-sources
diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog
index 74c2cacd5a27..8f21b321d5be 100644
--- a/profiles/arch/x86/ChangeLog
+++ b/profiles/arch/x86/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.65 2011/04/28 21:02:01 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.66 2011/04/30 17:18:18 ulm Exp $
+
+  30 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -xbox/virtuals:
+  Remove old-style virtual/linux-sources, bug 118442.
 
   28 Apr 2011; Andrey Grozin <grozin@gentoo.org> package.use.mask:
   Unmask cmucl USE flag on sci-mathematics/fricas
diff --git a/profiles/arch/x86/xbox/virtuals b/profiles/arch/x86/xbox/virtuals
deleted file mode 100644
index 7aa2b5db7008..000000000000
--- a/profiles/arch/x86/xbox/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/xbox/virtuals,v 1.2 2011/04/10 14:50:11 ulm Exp $
-
-virtual/linux-sources	sys-kernel/xbox-sources
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 1c17a2514ab4..7ab12476d264 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.265 2011/04/30 10:16:35 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.266 2011/04/30 17:18:18 ulm Exp $
+
+  30 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -virtuals:
+  Remove old-style virtual/linux-sources, bug 118442.
 
   30 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org> package.use.mask:
   Unmask introspection on vte, gtk+-2.24, and mask glade on vte
diff --git a/profiles/base/virtuals b/profiles/base/virtuals
deleted file mode 100644
index 6da974ee8e1e..000000000000
--- a/profiles/base/virtuals
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/virtuals,v 1.157 2011/04/24 21:23:13 ulm Exp $
-
-# This file describes the packages that by default satisfy a certain virtual
-# That this file exists in the base profile implies that these packages will
-# work on any architecture that needs that virtual
-
-# NOTE: Old-style virtuals are considered deprecated, bug 350792 is tracking
-# their removal. Consider using new-style (GLEP 37) virtuals instead.
-# http://archives.gentoo.org/gentoo-dev/msg_9078a2f41ba2fa8120805dc96aab16a0.xml
-
-# PLEASE DON'T ADD ANY NEW ENTRIES!
-
-virtual/linux-sources			sys-kernel/gentoo-sources
diff --git a/profiles/embedded/ChangeLog b/profiles/embedded/ChangeLog
index f0c125e4811e..02bff6666bc1 100644
--- a/profiles/embedded/ChangeLog
+++ b/profiles/embedded/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/embedded/ChangeLog,v 1.33 2011/04/24 21:23:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/embedded/ChangeLog,v 1.34 2011/04/30 17:18:18 ulm Exp $
+
+  30 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -virtuals:
+  Remove old-style virtual/linux-sources, bug 118442.
 
   24 Apr 2011; Ulrich Mueller <ulm@gentoo.org> virtuals:
   Remove old-style virtual/modutils, bug 358891.
diff --git a/profiles/embedded/virtuals b/profiles/embedded/virtuals
deleted file mode 100644
index f012f1cf9cb7..000000000000
--- a/profiles/embedded/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/linux-sources		sys-kernel/gentoo-sources
diff --git a/profiles/hardened/linux/virtuals b/profiles/hardened/linux/virtuals
deleted file mode 100644
index 11528a73caf2..000000000000
--- a/profiles/hardened/linux/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/hardened/linux/virtuals,v 1.2 2011/03/19 18:17:22 ssuominen Exp $
-
-virtual/linux-sources	sys-kernel/hardened-sources
diff --git a/profiles/hardened/virtuals b/profiles/hardened/virtuals
deleted file mode 100644
index 11eeed2b471e..000000000000
--- a/profiles/hardened/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/virtuals,v 1.23 2011/04/15 22:11:47 ulm Exp $
-
-virtual/linux-sources	sys-kernel/hardened-sources
diff --git a/profiles/selinux/ChangeLog b/profiles/selinux/ChangeLog
index 2a828324dce7..f42d745a00d5 100644
--- a/profiles/selinux/ChangeLog
+++ b/profiles/selinux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/sparc-fbsd profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/ChangeLog,v 1.19 2011/04/14 05:57:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/ChangeLog,v 1.20 2011/04/30 17:18:18 ulm Exp $
+
+  30 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -virtuals, packages:
+  Remove old-style virtual/linux-sources, bug 118442. Fix repoman warning for
+  new-style virtual.
 
   14 Apr 2011; Ulrich Mueller <ulm@gentoo.org> virtuals:
   Remove old-style virtual/os-headers, bug 358999.
diff --git a/profiles/selinux/packages b/profiles/selinux/packages
index 189b69a57a1e..cf4bd62ab90a 100644
--- a/profiles/selinux/packages
+++ b/profiles/selinux/packages
@@ -1,6 +1,6 @@
-# Copyright 2002-2006 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/packages,v 1.24 2009/08/08 02:19:11 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/packages,v 1.25 2011/04/30 17:18:18 ulm Exp $
 
 # This file extends the base packages file for the default profile that all
 # architectures will enjoy.  Please note that default is what most architectures
@@ -48,6 +48,7 @@
 
 # SELinux is integrated in 2.6
 >=sys-kernel/vanilla-sources-2.6.0
+>=virtual/linux-sources-2.6
 
 # Critical xattr fixes:
 >=sys-boot/grub-0.94
diff --git a/profiles/selinux/virtuals b/profiles/selinux/virtuals
deleted file mode 100644
index 3236890cdc66..000000000000
--- a/profiles/selinux/virtuals
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/virtuals,v 1.11 2011/04/14 05:57:31 ulm Exp $
-
-# Use this virtuals file to either overload the base profile's defined
-# virtuals, or add virtuals that are specific to this family of profiles
-
-virtual/linux-sources		sys-kernel/gentoo-sources
diff --git a/profiles/uclibc/mips/virtuals b/profiles/uclibc/mips/virtuals
deleted file mode 100644
index 43bdf8b5e63f..000000000000
--- a/profiles/uclibc/mips/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/linux-sources		sys-kernel/mips-sources
diff --git a/profiles/uclibc/ppc/hardened/virtuals b/profiles/uclibc/ppc/hardened/virtuals
deleted file mode 100644
index ec4c6a877f29..000000000000
--- a/profiles/uclibc/ppc/hardened/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2005 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/ppc/hardened/virtuals,v 1.1 2005/05/12 22:30:45 solar Exp $
-
-virtual/linux-sources	sys-kernel/hardened-sources
diff --git a/profiles/uclibc/virtuals b/profiles/uclibc/virtuals
deleted file mode 100644
index a91e842c9719..000000000000
--- a/profiles/uclibc/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/virtuals,v 1.24 2011/04/20 18:28:53 ulm Exp $
-
-virtual/linux-sources		sys-kernel/vanilla-sources
diff --git a/profiles/uclibc/x86/hardened/virtuals b/profiles/uclibc/x86/hardened/virtuals
deleted file mode 100644
index 2e5e2300db53..000000000000
--- a/profiles/uclibc/x86/hardened/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2005 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/x86/hardened/virtuals,v 1.1 2005/05/12 22:28:32 solar Exp $
-
-virtual/linux-sources	sys-kernel/hardened-sources