Remove old-style virtual/bootloader, bug 359971.

26 files changed, 38 insertions, 79 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 12b2da8565b5..c4b6ba8b2781 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,18 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5271 2011/04/10 10:28:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5272 2011/04/10 14:50:10 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!
 
+  10 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -hardened/amd64/virtuals,
+  -hardened/linux/powerpc/ppc64/64bit-userland/virtuals,
+  -hardened/linux/powerpc/ppc64/virtuals, -hardened/ppc/virtuals,
+  -hardened/ppc64/virtuals, -uclibc/amd64/virtuals, -uclibc/ppc/virtuals,
+  -uclibc/x86/virtuals, hardened/virtuals, uclibc/mips/virtuals:
+  Remove old-style virtual/bootloader, bug 359971.
+
   10 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> package.mask:
   Remove mask from sudo 1.8.1.
 
diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index 7c15349f9123..cf1aacafeffc 100644
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.122 2011/03/31 08:31:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.123 2011/04/10 14:50:10 ulm Exp $
+
+  10 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -virtuals:
+  Remove old-style virtual/bootloader, bug 359971.
 
   31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> package.use.mask:
   xmame is no longer in portage
diff --git a/profiles/arch/amd64/virtuals b/profiles/arch/amd64/virtuals
deleted file mode 100644
index a6069e4b648d..000000000000
--- a/profiles/arch/amd64/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/virtuals,v 1.1 2008/04/01 17:39:53 wolf31o2 Exp $
-
-virtual/bootloader			sys-boot/grub
diff --git a/profiles/arch/mips/ChangeLog b/profiles/arch/mips/ChangeLog
index 0f1428af7021..55caf833bd37 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.51 2011/04/07 23:13:52 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.52 2011/04/10 14:50:11 ulm Exp $
+
+  10 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -sys/cobalt/virtuals:
+  Remove old-style virtual/bootloader, bug 359971.
 
   07 Apr 2011; Mart Raudsepp <leio@gentoo.org> use.mask:
   Mask policykit global USE flag on mips for now, to get other keywording going
diff --git a/profiles/arch/mips/sys/cobalt/virtuals b/profiles/arch/mips/sys/cobalt/virtuals
deleted file mode 100644
index 801473047370..000000000000
--- a/profiles/arch/mips/sys/cobalt/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2006-2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/sys/cobalt/virtuals,v 1.1 2010/01/09 09:43:11 redhatter Exp $
-
-virtual/bootloader		sys-boot/colo
diff --git a/profiles/arch/powerpc/ChangeLog b/profiles/arch/powerpc/ChangeLog
index 4e3802007233..707975f12a3a 100644
--- a/profiles/arch/powerpc/ChangeLog
+++ b/profiles/arch/powerpc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/PPC profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ChangeLog,v 1.117 2011/03/31 14:44:38 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ChangeLog,v 1.118 2011/04/10 14:50:11 ulm Exp $
+
+  10 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -ppc32/pegasos/virtuals,
+  -ppc64/64ul/virtuals, -virtuals:
+  Remove old-style virtual/bootloader, bug 359971.
 
   31 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   package.use.mask:
diff --git a/profiles/arch/powerpc/ppc32/pegasos/virtuals b/profiles/arch/powerpc/ppc32/pegasos/virtuals
deleted file mode 100644
index 68e553e5b79b..000000000000
--- a/profiles/arch/powerpc/ppc32/pegasos/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc32/pegasos/virtuals,v 1.1 2008/04/01 17:40:00 wolf31o2 Exp $
-
-virtual/bootloader			sys-boot/bootcreator
diff --git a/profiles/arch/powerpc/ppc64/64ul/virtuals b/profiles/arch/powerpc/ppc64/64ul/virtuals
deleted file mode 100644
index ca038a7cbdb1..000000000000
--- a/profiles/arch/powerpc/ppc64/64ul/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2004-2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc64/64ul/virtuals,v 1.1 2008/04/30 23:35:00 wolf31o2 Exp $
-
-virtual/bootloader     sys-boot/yaboot-static
diff --git a/profiles/arch/powerpc/virtuals b/profiles/arch/powerpc/virtuals
deleted file mode 100644
index 686d5bbe94bf..000000000000
--- a/profiles/arch/powerpc/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2004-2008 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/virtuals,v 1.2 2011/03/16 22:12:43 suka Exp $
-
-virtual/bootloader			sys-boot/yaboot
diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog
index 946e8c288bd4..1074e76c704b 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.62 2011/03/31 08:31:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.63 2011/04/10 14:50:11 ulm Exp $
+
+  10 Apr 2011; Ulrich Mueller <ulm@gentoo.org> -virtuals, xbox/virtuals:
+  Remove old-style virtual/bootloader, bug 359971.
 
   31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> package.use.mask:
   snort with prelude useflag is stable
diff --git a/profiles/arch/x86/virtuals b/profiles/arch/x86/virtuals
deleted file mode 100644
index 455c9cbdfa04..000000000000
--- a/profiles/arch/x86/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/arch/x86/virtuals,v 1.1 2008/04/01 17:40:04 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/bootloader		sys-boot/grub
diff --git a/profiles/arch/x86/xbox/virtuals b/profiles/arch/x86/xbox/virtuals
index ac93ff24fb50..7aa2b5db7008 100644
--- a/profiles/arch/x86/xbox/virtuals
+++ b/profiles/arch/x86/xbox/virtuals
@@ -1,6 +1,5 @@
-# Copyright 2004-2008 Gentoo Foundation.
+# 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.1 2008/04/01 17:40:05 wolf31o2 Exp $
+# $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
-virtual/bootloader		sys-boot/cromwell
diff --git a/profiles/default/bsd/ChangeLog b/profiles/default/bsd/ChangeLog
index 8f40864ca827..0f996605d6a1 100644
--- a/profiles/default/bsd/ChangeLog
+++ b/profiles/default/bsd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.47 2011/04/07 08:15:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.48 2011/04/10 14:50:11 ulm Exp $
+
+  10 Apr 2011; Ulrich Mueller <ulm@gentoo.org> fbsd/virtuals:
+  Remove old-style virtual/bootloader, bug 359971.
 
   07 Apr 2011; Ulrich Mueller <ulm@gentoo.org> fbsd/virtuals:
   Remove old-style virtual/pam, bug 358903.
diff --git a/profiles/default/bsd/fbsd/virtuals b/profiles/default/bsd/fbsd/virtuals
index 365c8daed039..67966bb2b59d 100644
--- a/profiles/default/bsd/fbsd/virtuals
+++ b/profiles/default/bsd/fbsd/virtuals
@@ -1,13 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/virtuals,v 1.4 2011/04/07 08:15:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/virtuals,v 1.5 2011/04/10 14:50:11 ulm Exp $
 
 # This file defines the virtuals that Gentoo/FreeBSD needs to modify respect
 # the base profile
 
 # KEEP THIS FILE SORTED ALPHABETICALLY OR RISK WRATH
 
-virtual/bootloader		sys-freebsd/boot0
 virtual/inetd			sys-freebsd/freebsd-usbin
 virtual/libc			sys-freebsd/freebsd-lib
 virtual/os-headers		sys-freebsd/freebsd-lib
diff --git a/profiles/embedded/ChangeLog b/profiles/embedded/ChangeLog
index 9acaf0b12395..d4b1100be76c 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.23 2011/04/07 08:15:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/embedded/ChangeLog,v 1.24 2011/04/10 14:50:11 ulm Exp $
+
+  10 Apr 2011; Ulrich Mueller <ulm@gentoo.org> virtuals:
+  Remove old-style virtual/bootloader, bug 359971.
 
   07 Apr 2011; Ulrich Mueller <ulm@gentoo.org> virtuals:
   Remove old-style virtual/logger, bug 358881.
diff --git a/profiles/embedded/virtuals b/profiles/embedded/virtuals
index 69d808b5ce32..1278e8c37829 100644
--- a/profiles/embedded/virtuals
+++ b/profiles/embedded/virtuals
@@ -1,6 +1,5 @@
 virtual/aspell-dict		app-dicts/aspell-en
 virtual/blackbox		x11-wm/blackbox
-virtual/bootloader		sys-boot/grub
 virtual/cron			sys-apps/busybox
 virtual/libc			sys-libs/glibc
 virtual/inetd			sys-apps/busybox
diff --git a/profiles/hardened/amd64/virtuals b/profiles/hardened/amd64/virtuals
deleted file mode 100644
index 1bdd6315b4a6..000000000000
--- a/profiles/hardened/amd64/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/amd64/virtuals,v 1.13 2007/12/26 21:35:44 phreak Exp $
-
-virtual/bootloader		sys-boot/grub-static
diff --git a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/virtuals b/profiles/hardened/linux/powerpc/ppc64/64bit-userland/virtuals
deleted file mode 100644
index 7ebd1c2cd918..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/64bit-userland/virtuals
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/powerpc/ppc64/64bit-userland/virtuals,v 1.1 2010/11/14 15:44:27 blueness Exp $
-
-virtual/bootloader	sys-boot/yaboot-static
diff --git a/profiles/hardened/linux/powerpc/ppc64/virtuals b/profiles/hardened/linux/powerpc/ppc64/virtuals
deleted file mode 100644
index 0bd052c5a3dd..000000000000
--- a/profiles/hardened/linux/powerpc/ppc64/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/hardened/linux/powerpc/ppc64/virtuals,v 1.1 2008/04/01 17:41:22 wolf31o2 Exp $
-
-virtual/bootloader     sys-boot/yaboot-static
diff --git a/profiles/hardened/ppc/virtuals b/profiles/hardened/ppc/virtuals
deleted file mode 100644
index cb642e9ceb66..000000000000
--- a/profiles/hardened/ppc/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/hardened/ppc/virtuals,v 1.5 2007/01/10 11:13:40 phreak Exp $
-
-virtual/bootloader      sys-boot/yaboot
diff --git a/profiles/hardened/ppc64/virtuals b/profiles/hardened/ppc64/virtuals
deleted file mode 100644
index 03751a3442dc..000000000000
--- a/profiles/hardened/ppc64/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/hardened/ppc64/virtuals,v 1.6 2007/12/26 21:35:45 phreak Exp $
-
-virtual/bootloader     sys-boot/yaboot-static
diff --git a/profiles/hardened/virtuals b/profiles/hardened/virtuals
index f77374f8bf2b..1aa8fb7bad14 100644
--- a/profiles/hardened/virtuals
+++ b/profiles/hardened/virtuals
@@ -1,8 +1,7 @@
-# Copyright 1999-2005 Gentoo Foundation.
+# 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.20 2011/03/19 18:17:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/virtuals,v 1.21 2011/04/10 14:50:11 ulm Exp $
 
-virtual/bootloader		sys-boot/grub
 virtual/dev-manager		sys-fs/udev
 virtual/linux-sources	sys-kernel/hardened-sources
 virtual/os-headers		sys-kernel/linux-headers
diff --git a/profiles/uclibc/amd64/virtuals b/profiles/uclibc/amd64/virtuals
deleted file mode 100644
index 278a0dbbf18b..000000000000
--- a/profiles/uclibc/amd64/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/bootloader			sys-boot/grub
diff --git a/profiles/uclibc/mips/virtuals b/profiles/uclibc/mips/virtuals
index 97ad031c2467..b86d0a17a40d 100644
--- a/profiles/uclibc/mips/virtuals
+++ b/profiles/uclibc/mips/virtuals
@@ -1,3 +1,2 @@
-virtual/bootloader		sys-boot/arcload
 virtual/linux-sources		sys-kernel/mips-sources
 virtual/os-headers		sys-kernel/linux-headers
diff --git a/profiles/uclibc/ppc/virtuals b/profiles/uclibc/ppc/virtuals
deleted file mode 100644
index f55befe57b8b..000000000000
--- a/profiles/uclibc/ppc/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/bootloader		sys-boot/yaboot
diff --git a/profiles/uclibc/x86/virtuals b/profiles/uclibc/x86/virtuals
deleted file mode 100644
index 278a0dbbf18b..000000000000
--- a/profiles/uclibc/x86/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/bootloader			sys-boot/grub