profiles now have sys-boot/ instead of sys-apps/

43 files changed, 54 insertions, 54 deletions

diff --git a/profiles/cdimage-ppc/packages b/profiles/cdimage-ppc/packages
index 93c086532cdf..576a68f207e4 100644
--- a/profiles/cdimage-ppc/packages
+++ b/profiles/cdimage-ppc/packages
@@ -18,12 +18,12 @@ sys-apps/fileutils
 sys-apps/findutils
 sys-apps/gawk
 sys-apps/grep
-sys-apps/grub
+sys-boot/grub
 app-arch/gzip
 sys-apps/hdparm
 sys-apps/isapnptools
 sys-apps/less
-sys-apps/lilo
+sys-boot/lilo
 sys-apps/modutils
 sys-apps/net-tools
 sys-apps/xinetd
diff --git a/profiles/cdimage-sparc/packages b/profiles/cdimage-sparc/packages
index 3c39fafc0e16..4fd4b2e8f244 100644
--- a/profiles/cdimage-sparc/packages
+++ b/profiles/cdimage-sparc/packages
@@ -24,7 +24,7 @@ app-arch/gzip
 sys-apps/hdparm
 sys-apps/less
 sys-apps/lvm-user
-sys-apps/silo
+sys-boot/silo
 sys-apps/modutils
 sys-apps/net-tools
 sys-apps/xinetd
diff --git a/profiles/cdimage/packages b/profiles/cdimage/packages
index 93c086532cdf..576a68f207e4 100644
--- a/profiles/cdimage/packages
+++ b/profiles/cdimage/packages
@@ -18,12 +18,12 @@ sys-apps/fileutils
 sys-apps/findutils
 sys-apps/gawk
 sys-apps/grep
-sys-apps/grub
+sys-boot/grub
 app-arch/gzip
 sys-apps/hdparm
 sys-apps/isapnptools
 sys-apps/less
-sys-apps/lilo
+sys-boot/lilo
 sys-apps/modutils
 sys-apps/net-tools
 sys-apps/xinetd
diff --git a/profiles/default-1.0-gcc3/virtuals b/profiles/default-1.0-gcc3/virtuals
index 6685ad62bd58..28d86faaea21 100644
--- a/profiles/default-1.0-gcc3/virtuals
+++ b/profiles/default-1.0-gcc3/virtuals
@@ -27,7 +27,7 @@ virtual/mda				net-mail/procmail
 virtual/krb5			app-crypt/heimdal
 virtual/motif           x11-libs/openmotif
 virtual/xft				x11-base/xfree
-virtual/bootloader		sys-apps/grub
+virtual/bootloader		sys-boot/grub
 virtual/editor			app-editors/nano
 virtual/jack			media-sound/jack-audio-connection-kit
 virtual/os-headers		sys-kernel/linux-headers
diff --git a/profiles/default-1.0/virtuals b/profiles/default-1.0/virtuals
index a3a5e75eb3e0..8b8b777e8fa2 100644
--- a/profiles/default-1.0/virtuals
+++ b/profiles/default-1.0/virtuals
@@ -25,7 +25,7 @@ virtual/mda				net-mail/procmail
 virtual/xft				x11-base/xfree
 virtual/krb5			app-crypt/heimdal
 virtual/motif			x11-libs/openmotif
-virtual/bootloader		sys-apps/grub
+virtual/bootloader		sys-boot/grub
 virtual/editor			app-editors/nano
 virtual/jack			media-sound/jack-audio-connection-kit
 virtual/quicktime		media-libs/libquicktime
diff --git a/profiles/default-alpha-1.4/packages.cdimage b/profiles/default-alpha-1.4/packages.cdimage
index 6b391f3249f5..3b5ee0bbfb39 100644
--- a/profiles/default-alpha-1.4/packages.cdimage
+++ b/profiles/default-alpha-1.4/packages.cdimage
@@ -19,7 +19,7 @@ sys-apps/findutils
 sys-apps/gawk
 sys-apps/grep
 sys-fs/hfsutils
-sys-apps/yaboot
+sys-boot/yaboot
 app-arch/gzip
 sys-apps/hdparm
 sys-apps/less
diff --git a/profiles/default-alpha-1.4/virtuals b/profiles/default-alpha-1.4/virtuals
index e3801be72f1b..e84874179ed1 100644
--- a/profiles/default-alpha-1.4/virtuals
+++ b/profiles/default-alpha-1.4/virtuals
@@ -25,7 +25,7 @@ virtual/mda				net-mail/procmail
 virtual/xft				x11-base/xfree
 virtual/krb5			app-crypt/heimdal
 virtual/motif			x11-libs/openmotif
-virtual/bootloader		sys-apps/aboot
+virtual/bootloader		sys-boot/aboot
 virtual/editor			app-editors/nano
 virtual/jack			media-sound/jack-audio-connection-kit
 virtual/quicktime		media-libs/libquicktime
diff --git a/profiles/default-amd64-1.4/virtuals b/profiles/default-amd64-1.4/virtuals
index 808296b3e837..5c9db2f023ee 100644
--- a/profiles/default-amd64-1.4/virtuals
+++ b/profiles/default-amd64-1.4/virtuals
@@ -31,7 +31,7 @@ virtual/mda				net-mail/procmail
 virtual/xft				x11-base/xfree
 virtual/krb5			app-crypt/heimdal
 virtual/motif			x11-libs/openmotif
-virtual/bootloader		sys-apps/grub-static
+virtual/bootloader		sys-boot/grub-static
 virtual/editor			app-editors/nano
 virtual/jack			media-sound/jack-audio-connection-kit
 virtual/quicktime		media-libs/libquicktime
diff --git a/profiles/default-arm-1.4/virtuals b/profiles/default-arm-1.4/virtuals
index caf29e98eaeb..e7547275212a 100644
--- a/profiles/default-arm-1.4/virtuals
+++ b/profiles/default-arm-1.4/virtuals
@@ -27,7 +27,7 @@ virtual/mda				net-mail/procmail
 virtual/xft				x11-base/xfree
 virtual/krb5			app-crypt/heimdal
 virtual/motif			x11-libs/openmotif
-virtual/bootloader		sys-apps/nettrom
+virtual/bootloader		sys-boot/nettrom
 virtual/editor			app-editors/vi
 virtual/jack			media-sound/jack-audio-connection-kit
 virtual/quicktime		media-libs/libquicktime
diff --git a/profiles/default-hppa-1.4/virtuals b/profiles/default-hppa-1.4/virtuals
index 869019baeb73..d22c18a8dd61 100644
--- a/profiles/default-hppa-1.4/virtuals
+++ b/profiles/default-hppa-1.4/virtuals
@@ -26,7 +26,7 @@ virtual/mda		net-mail/procmail
 virtual/xft             x11-base/xfree
 virtual/krb5		app-crypt/heimdal
 virtual/motif           x11-libs/openmotif
-virtual/bootloader	sys-apps/palo
+virtual/bootloader	sys-boot/palo
 virtual/editor		app-editors/nano
 virtual/os-headers	sys-kernel/hppa-headers
 virtual/modutils 	sys-apps/modutils
diff --git a/profiles/default-mips-1.4/packages.cdimage b/profiles/default-mips-1.4/packages.cdimage
index 6b391f3249f5..3b5ee0bbfb39 100644
--- a/profiles/default-mips-1.4/packages.cdimage
+++ b/profiles/default-mips-1.4/packages.cdimage
@@ -19,7 +19,7 @@ sys-apps/findutils
 sys-apps/gawk
 sys-apps/grep
 sys-fs/hfsutils
-sys-apps/yaboot
+sys-boot/yaboot
 app-arch/gzip
 sys-apps/hdparm
 sys-apps/less
diff --git a/profiles/default-mips-1.4/virtuals b/profiles/default-mips-1.4/virtuals
index efee75069f17..b162c47b418a 100644
--- a/profiles/default-mips-1.4/virtuals
+++ b/profiles/default-mips-1.4/virtuals
@@ -28,7 +28,7 @@ virtual/xft				x11-base/xfree
 virtual/krb5			app-crypt/heimdal
 virtual/motif           x11-libs/openmotif
 virtual/editor			app-editors/nano
-virtual/bootloader      sys-apps/dvhtool
+virtual/bootloader      sys-boot/dvhtool
 virtual/os-headers		sys-kernel/mips-headers
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
diff --git a/profiles/default-mips64-1.4/packages.cdimage b/profiles/default-mips64-1.4/packages.cdimage
index 6b391f3249f5..3b5ee0bbfb39 100644
--- a/profiles/default-mips64-1.4/packages.cdimage
+++ b/profiles/default-mips64-1.4/packages.cdimage
@@ -19,7 +19,7 @@ sys-apps/findutils
 sys-apps/gawk
 sys-apps/grep
 sys-fs/hfsutils
-sys-apps/yaboot
+sys-boot/yaboot
 app-arch/gzip
 sys-apps/hdparm
 sys-apps/less
diff --git a/profiles/default-mips64-1.4/virtuals b/profiles/default-mips64-1.4/virtuals
index efee75069f17..b162c47b418a 100644
--- a/profiles/default-mips64-1.4/virtuals
+++ b/profiles/default-mips64-1.4/virtuals
@@ -28,7 +28,7 @@ virtual/xft				x11-base/xfree
 virtual/krb5			app-crypt/heimdal
 virtual/motif           x11-libs/openmotif
 virtual/editor			app-editors/nano
-virtual/bootloader      sys-apps/dvhtool
+virtual/bootloader      sys-boot/dvhtool
 virtual/os-headers		sys-kernel/mips-headers
 virtual/modutils 		sys-apps/modutils
 virtual/inetd			sys-apps/xinetd
diff --git a/profiles/default-ppc-1.0/packages b/profiles/default-ppc-1.0/packages
index 2f158070cbd7..c4897fae03f8 100644
--- a/profiles/default-ppc-1.0/packages
+++ b/profiles/default-ppc-1.0/packages
@@ -232,8 +232,8 @@ net-misc/rsync
 ~media-video/realplayer
 
 # makes no sense on ppc
-~sys-apps/lilo
-~sys-apps/grub 
+~sys-boot/lilo
+~sys-boot/grub 
 
 # x86 and sparc only kernels (gerk)
 ~sys-kernel/gentoo-sources
diff --git a/profiles/default-ppc-1.0/packages.cdimage b/profiles/default-ppc-1.0/packages.cdimage
index 4f3a65c1e22e..70d19b2b14c4 100644
--- a/profiles/default-ppc-1.0/packages.cdimage
+++ b/profiles/default-ppc-1.0/packages.cdimage
@@ -19,7 +19,7 @@ sys-apps/findutils
 sys-apps/gawk
 sys-apps/grep
 sys-fs/hfsutils
-sys-apps/yaboot
+sys-boot/yaboot
 app-arch/gzip
 sys-apps/hdparm
 sys-apps/less
diff --git a/profiles/default-ppc-1.0/virtuals b/profiles/default-ppc-1.0/virtuals
index 0a4fb8ee839d..50b21fcde10a 100644
--- a/profiles/default-ppc-1.0/virtuals
+++ b/profiles/default-ppc-1.0/virtuals
@@ -26,7 +26,7 @@ virtual/mda				net-mail/procmail
 virtual/xft	     x11-base/xfree
 virtual/krb5			app-crypt/heimdal
 virtual/motif	   x11-libs/openmotif
-virtual/bootloader		sys-apps/yaboot
+virtual/bootloader		sys-boot/yaboot
 virtual/editor			app-editors/nano
 virtual/os-headers		sys-kernel/linux-headers
 virtual/modutils 		sys-apps/modutils
diff --git a/profiles/default-ppc-1.4/packages.cdimage b/profiles/default-ppc-1.4/packages.cdimage
index 6b391f3249f5..3b5ee0bbfb39 100644
--- a/profiles/default-ppc-1.4/packages.cdimage
+++ b/profiles/default-ppc-1.4/packages.cdimage
@@ -19,7 +19,7 @@ sys-apps/findutils
 sys-apps/gawk
 sys-apps/grep
 sys-fs/hfsutils
-sys-apps/yaboot
+sys-boot/yaboot
 app-arch/gzip
 sys-apps/hdparm
 sys-apps/less
diff --git a/profiles/default-ppc-1.4/virtuals b/profiles/default-ppc-1.4/virtuals
index 252f1c9af1bb..e21fa3456a11 100644
--- a/profiles/default-ppc-1.4/virtuals
+++ b/profiles/default-ppc-1.4/virtuals
@@ -26,7 +26,7 @@ virtual/mda		net-mail/procmail
 virtual/xft	     x11-base/xfree
 virtual/krb5		app-crypt/heimdal
 virtual/motif	   x11-libs/openmotif
-virtual/bootloader	sys-apps/yaboot
+virtual/bootloader	sys-boot/yaboot
 virtual/editor		app-editors/nano
 virtual/os-headers	sys-kernel/linux-headers
 virtual/modutils 	sys-apps/modutils
diff --git a/profiles/default-ppc/packages b/profiles/default-ppc/packages
index 3d6de8be8886..1553b0217281 100644
--- a/profiles/default-ppc/packages
+++ b/profiles/default-ppc/packages
@@ -34,8 +34,8 @@
 # PPC PROFILE
 
 # makes no sense on ppc
-sys-apps/lilo
-sys-apps/grub 
+sys-boot/lilo
+sys-boot/grub 
 
 #does not build with gcc-2.x
 <media-gfx/graphviz-1.9
diff --git a/profiles/default-ppc/packages.cdimage b/profiles/default-ppc/packages.cdimage
index 6537ebc7e107..eda49e29c470 100644
--- a/profiles/default-ppc/packages.cdimage
+++ b/profiles/default-ppc/packages.cdimage
@@ -19,7 +19,7 @@ sys-apps/findutils
 sys-apps/gawk
 sys-apps/grep
 sys-fs/hfsutils
-sys-apps/yaboot
+sys-boot/yaboot
 app-arch/gzip
 sys-apps/hdparm
 sys-apps/less
diff --git a/profiles/default-ppc/virtuals b/profiles/default-ppc/virtuals
index 11491b4df044..6dc9b049baec 100644
--- a/profiles/default-ppc/virtuals
+++ b/profiles/default-ppc/virtuals
@@ -25,7 +25,7 @@ virtual/textbrowser		 net-www/links
 virtual/mda			 net-mail/procmail
 virtual/krb5			 app-crypt/heimdal
 virtual/motif	    x11-libs/openmotif
-virtual/bootloader		 sys-apps/yaboot
+virtual/bootloader		 sys-boot/yaboot
 virtual/editor			 app-editors/nano
 virtual/os-headers	     sys-kernel/linux-headers
 virtual/modutils	 sys-apps/modutils
diff --git a/profiles/default-sparc-1.0/packages.sparc b/profiles/default-sparc-1.0/packages.sparc
index 807df251465e..e552d8d79d22 100644
--- a/profiles/default-sparc-1.0/packages.sparc
+++ b/profiles/default-sparc-1.0/packages.sparc
@@ -3,7 +3,7 @@
 #
 # SPARC specific packages
 *sys-apps/sparc-utils
-*sys-apps/silo
+*sys-boot/silo
 
 # Sed replacement
 *sys-apps/supersed
diff --git a/profiles/default-sparc-1.0/scripts/generate-packages.sh b/profiles/default-sparc-1.0/scripts/generate-packages.sh
index ee62d5478d61..9bdb2a141de8 100644
--- a/profiles/default-sparc-1.0/scripts/generate-packages.sh
+++ b/profiles/default-sparc-1.0/scripts/generate-packages.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/scripts/generate-packages.sh,v 1.9 2002/07/04 13:40:53 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/scripts/generate-packages.sh,v 1.10 2003/12/09 08:40:00 seemant Exp $
 #
 # New packages file
 NEWPACKAGESBUILD=packages.build
@@ -32,9 +32,9 @@ cp -p $NEWPACKAGES $KEEPPACKAGES
 echo "# This file created automagically by $0 on `date`" > $NEWPACKAGES
 echo "" >> $NEWPACKAGES
 	#-e 's:[^#]*x11-base/xfree.*:<x11-base/xfree-4.2.0:' \
-sed -e 's:.*sys-apps/grub:#*sys-apps/grub:' \
+sed -e 's:.*sys-boot/grub:#*sys-boot/grub:' \
 	-e 's:.*sys-devel/bin86:#*sys-devel/bin86:' \
-	-e 's:.*sys-apps/lilo:#*sys-apps/lilo:' \
+	-e 's:.*sys-boot/lilo:#*sys-boot/lilo:' \
 	-e 's:[^#]*sys-kernel/linux-headers.*:~sys-kernel/linux-headers-2.4.18:' \
 	${from_dir}/packages >> $NEWPACKAGES
 cat >> $NEWPACKAGES <<_EOF_
diff --git a/profiles/default-sparc-1.0/virtuals b/profiles/default-sparc-1.0/virtuals
index 81a42cde3923..83c254cb5063 100644
--- a/profiles/default-sparc-1.0/virtuals
+++ b/profiles/default-sparc-1.0/virtuals
@@ -25,7 +25,7 @@ virtual/textbrowser		net-www/links
 virtual/mda				net-mail/procmail
 virtual/krb5			app-crypt/heimdal
 virtual/motif	   x11-libs/openmotif
-virtual/bootloader		sys-apps/silo
+virtual/bootloader		sys-boot/silo
 virtual/editor			app-editors/nano
 virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc	     dev-lang/ghc-bin
diff --git a/profiles/default-sparc-1.4/packages b/profiles/default-sparc-1.4/packages
index e5f9f9a60113..82455cfcb5d7 100644
--- a/profiles/default-sparc-1.4/packages
+++ b/profiles/default-sparc-1.4/packages
@@ -33,8 +33,8 @@
 
 # These don't make sense on sparc 
 !sys-devel/bin86
-!sys-apps/lilo
-!sys-apps/grub
+!sys-boot/lilo
+!sys-boot/grub
 
 # sparc specfic pkgs
 *sys-apps/sparc-utils
diff --git a/profiles/default-sparc-1.4/virtuals b/profiles/default-sparc-1.4/virtuals
index 72e3015ee3ad..6c15d18df64e 100644
--- a/profiles/default-sparc-1.4/virtuals
+++ b/profiles/default-sparc-1.4/virtuals
@@ -25,7 +25,7 @@ virtual/textbrowser		net-www/links
 virtual/mda				net-mail/procmail
 virtual/krb5			app-crypt/heimdal
 virtual/motif	   x11-libs/openmotif
-virtual/bootloader		sys-apps/silo
+virtual/bootloader		sys-boot/silo
 virtual/editor			app-editors/nano
 virtual/xft				x11-base/xfree
 virtual/os-headers		sys-kernel/linux-headers
diff --git a/profiles/default-sparc64-1.0/packages b/profiles/default-sparc64-1.0/packages
index b486d8f1e5d2..babb95c1e879 100644
--- a/profiles/default-sparc64-1.0/packages
+++ b/profiles/default-sparc64-1.0/packages
@@ -41,7 +41,7 @@
 *sys-apps/gawk
 *sys-apps/grep
 *sys-apps/groff
-#*sys-apps/grub
+#*sys-boot/grub
 *app-arch/gzip
 *sys-apps/hdparm
 *sys-apps/less
@@ -140,7 +140,7 @@
 <=sys-apps/tcp-wrappers-7.6-r3
 
 # These lines added by ../default-sparc-1.0/scripts/generate-packages.sh
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.0/packages,v 1.45 2003/11/15 03:24:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.0/packages,v 1.46 2003/12/09 08:40:00 seemant Exp $
 #
 # Please edit the file packages.sparc, it will be included in
 # packages the next time you run generate-packages.sh
diff --git a/profiles/default-sparc64-1.0/packages.sparc b/profiles/default-sparc64-1.0/packages.sparc
index a7310ed66b3f..5ad4f97e819e 100644
--- a/profiles/default-sparc64-1.0/packages.sparc
+++ b/profiles/default-sparc64-1.0/packages.sparc
@@ -1,11 +1,11 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.0/packages.sparc,v 1.7 2002/08/29 19:00:49 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.0/packages.sparc,v 1.8 2003/12/09 08:40:00 seemant Exp $
 #
 # Please edit the file packages.sparc, it will be included in
 # packages the next time you run generate-packages.sh
 #
 # SPARC specific packages
 *sys-apps/sparc-utils
-*sys-apps/silo
+*sys-boot/silo
 
 # Kernel compiler
 *sys-devel/egcs64-sparc
diff --git a/profiles/default-sparc64-1.0/virtuals b/profiles/default-sparc64-1.0/virtuals
index ccf6e6707406..91db15917844 100644
--- a/profiles/default-sparc64-1.0/virtuals
+++ b/profiles/default-sparc64-1.0/virtuals
@@ -28,7 +28,7 @@ virtual/textbrowser		net-www/links
 virtual/mda				net-mail/procmail
 virtual/krb5			app-crypt/heimdal
 virtual/motif	   x11-libs/openmotif
-virtual/bootloader		sys-apps/silo
+virtual/bootloader		sys-boot/silo
 virtual/editor			app-editors/nano
 virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc	     dev-lang/ghc-bin
diff --git a/profiles/default-sparc64-1.4/packages b/profiles/default-sparc64-1.4/packages
index cb447e2c4185..a10fdcebe145 100644
--- a/profiles/default-sparc64-1.4/packages
+++ b/profiles/default-sparc64-1.4/packages
@@ -47,8 +47,8 @@
 
 # These don't make sense on sparc 
 !sys-devel/bin86
-!sys-apps/lilo
-!sys-apps/grub
+!sys-boot/lilo
+!sys-boot/grub
 
 # Get a decent editor - BROKEN
 !app-editors/levee
diff --git a/profiles/default-sparc64-1.4/virtuals b/profiles/default-sparc64-1.4/virtuals
index 40a140303397..f257d82b436b 100644
--- a/profiles/default-sparc64-1.4/virtuals
+++ b/profiles/default-sparc64-1.4/virtuals
@@ -25,7 +25,7 @@ virtual/textbrowser		net-www/links
 virtual/mda				net-mail/procmail
 virtual/krb5			app-crypt/heimdal
 virtual/motif	   x11-libs/openmotif
-virtual/bootloader		sys-apps/silo
+virtual/bootloader		sys-boot/silo
 virtual/editor			app-editors/nano
 virtual/xft	     x11-base/xfree
 virtual/os-headers		sys-kernel/linux-headers
diff --git a/profiles/default-x86-1.4/virtuals b/profiles/default-x86-1.4/virtuals
index b3d40cf3a70b..67bf2f0c4bc6 100644
--- a/profiles/default-x86-1.4/virtuals
+++ b/profiles/default-x86-1.4/virtuals
@@ -25,7 +25,7 @@ virtual/mda				net-mail/procmail
 virtual/xft				x11-base/xfree
 virtual/krb5			app-crypt/heimdal
 virtual/motif			x11-libs/openmotif
-virtual/bootloader		sys-apps/grub
+virtual/bootloader		sys-boot/grub
 virtual/editor			app-editors/nano
 virtual/jack			media-sound/jack-audio-connection-kit
 virtual/quicktime		media-libs/libquicktime
diff --git a/profiles/default-x86obsd-1.4/virtuals b/profiles/default-x86obsd-1.4/virtuals
index b3d40cf3a70b..67bf2f0c4bc6 100644
--- a/profiles/default-x86obsd-1.4/virtuals
+++ b/profiles/default-x86obsd-1.4/virtuals
@@ -25,7 +25,7 @@ virtual/mda				net-mail/procmail
 virtual/xft				x11-base/xfree
 virtual/krb5			app-crypt/heimdal
 virtual/motif			x11-libs/openmotif
-virtual/bootloader		sys-apps/grub
+virtual/bootloader		sys-boot/grub
 virtual/editor			app-editors/nano
 virtual/jack			media-sound/jack-audio-connection-kit
 virtual/quicktime		media-libs/libquicktime
diff --git a/profiles/default/virtuals b/profiles/default/virtuals
index 3165c46b939f..796d67059edb 100644
--- a/profiles/default/virtuals
+++ b/profiles/default/virtuals
@@ -20,7 +20,7 @@ virtual/mda				net-mail/procmail
 virtual/xft				x11-base/xfree
 virtual/krb5			app-crypt/heimdal
 virtual/motif			x11-libs/lesstif
-virtual/bootloader		sys-apps/grub
+virtual/bootloader		sys-boot/grub
 virtual/editor			app-editors/nano
 virtual/os-headers		sys-kernel/linux-headers
 virtual/ghc				dev-lang/ghc-bin
diff --git a/profiles/embedded/uclibc-x86-1.4/virtuals b/profiles/embedded/uclibc-x86-1.4/virtuals
index 513a1210b2e4..240527772474 100644
--- a/profiles/embedded/uclibc-x86-1.4/virtuals
+++ b/profiles/embedded/uclibc-x86-1.4/virtuals
@@ -25,7 +25,7 @@ virtual/mda			net-mail/procmail
 virtual/xft			x11-base/xfree
 virtual/krb5			app-crypt/heimdal
 virtual/motif			x11-libs/openmotif
-virtual/bootloader		sys-apps/grub
+virtual/bootloader		sys-boot/grub
 virtual/editor			app-editors/nano
 virtual/jack			media-sound/jack-audio-connection-kit
 virtual/quicktime		media-libs/libquicktime
diff --git a/profiles/gcc33-sparc64-1.4/packages b/profiles/gcc33-sparc64-1.4/packages
index c2b39949942c..5d1591bbe06c 100644
--- a/profiles/gcc33-sparc64-1.4/packages
+++ b/profiles/gcc33-sparc64-1.4/packages
@@ -47,8 +47,8 @@
 
 # These don't make sense on sparc 
 !sys-devel/bin86
-!sys-apps/lilo
-!sys-apps/grub
+!sys-boot/lilo
+!sys-boot/grub
 
 # Get a decent editor - BROKEN
 !app-editors/levee
diff --git a/profiles/gcc33-sparc64-1.4/virtuals b/profiles/gcc33-sparc64-1.4/virtuals
index 8ae9892b3940..0496ad02243e 100644
--- a/profiles/gcc33-sparc64-1.4/virtuals
+++ b/profiles/gcc33-sparc64-1.4/virtuals
@@ -25,7 +25,7 @@ virtual/textbrowser		net-www/links
 virtual/mda				net-mail/procmail
 virtual/krb5			app-crypt/heimdal
 virtual/motif	   x11-libs/openmotif
-virtual/bootloader		sys-apps/silo
+virtual/bootloader		sys-boot/silo
 virtual/editor			app-editors/nano
 virtual/xft	     x11-base/xfree
 virtual/os-headers		sys-kernel/linux-headers
diff --git a/profiles/grp-x86-1.4/packages b/profiles/grp-x86-1.4/packages
index 61e35f9adf5d..0ff9a07b8688 100644
--- a/profiles/grp-x86-1.4/packages
+++ b/profiles/grp-x86-1.4/packages
@@ -67,7 +67,7 @@
 *sys-apps/gawk
 *sys-apps/grep
 *sys-apps/groff
-*sys-apps/grub
+*sys-boot/grub
 *app-arch/gzip
 *sys-apps/hdparm
 *sys-apps/less
diff --git a/profiles/hardened-x86-1.4/virtuals b/profiles/hardened-x86-1.4/virtuals
index d1a572ccd021..aae005bf6c41 100644
--- a/profiles/hardened-x86-1.4/virtuals
+++ b/profiles/hardened-x86-1.4/virtuals
@@ -25,7 +25,7 @@ virtual/mda				net-mail/procmail
 virtual/xft				x11-base/xfree
 virtual/krb5			app-crypt/heimdal
 virtual/motif			x11-libs/openmotif
-virtual/bootloader		sys-apps/grub
+virtual/bootloader		sys-boot/grub
 virtual/editor			app-editors/nano
 virtual/jack			media-sound/jack-audio-connection-kit
 virtual/quicktime		media-libs/libquicktime
diff --git a/profiles/selinux-ppc-1.4/packages.cdimage b/profiles/selinux-ppc-1.4/packages.cdimage
index 6b391f3249f5..3b5ee0bbfb39 100644
--- a/profiles/selinux-ppc-1.4/packages.cdimage
+++ b/profiles/selinux-ppc-1.4/packages.cdimage
@@ -19,7 +19,7 @@ sys-apps/findutils
 sys-apps/gawk
 sys-apps/grep
 sys-fs/hfsutils
-sys-apps/yaboot
+sys-boot/yaboot
 app-arch/gzip
 sys-apps/hdparm
 sys-apps/less
diff --git a/profiles/selinux-ppc-1.4/virtuals b/profiles/selinux-ppc-1.4/virtuals
index ae55e6801e36..5f2d657becda 100644
--- a/profiles/selinux-ppc-1.4/virtuals
+++ b/profiles/selinux-ppc-1.4/virtuals
@@ -5,7 +5,7 @@ virtual/antivirus	net-mail/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/bittorrent	net-p2p/bittorrent
 virtual/blackbox	x11-wm/blackbox
-virtual/bootloader	sys-apps/yaboot
+virtual/bootloader	sys-boot/yaboot
 virtual/cron	    sys-apps/vcron
 virtual/editor		app-editors/nano
 virtual/emacs	   app-editors/emacs
diff --git a/profiles/selinux-x86-1.4/virtuals b/profiles/selinux-x86-1.4/virtuals
index b011a741128f..ea21c1953acc 100644
--- a/profiles/selinux-x86-1.4/virtuals
+++ b/profiles/selinux-x86-1.4/virtuals
@@ -5,7 +5,7 @@ virtual/antivirus	net-mail/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/bittorrent	net-p2p/bittorrent
 virtual/blackbox	x11-wm/blackbox
-virtual/bootloader	sys-apps/grub
+virtual/bootloader	sys-boot/grub
 virtual/cron	    sys-apps/vcron
 virtual/editor		app-editors/nano
 virtual/emacs	   app-editors/emacs