Remove old-style virtual/ssh, bug 361121.

9 files changed, 17 insertions, 10 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 00b7178ce91b..2c20879e8918 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.5294 2011/04/16 13:21:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5295 2011/04/16 19:38:23 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!
 
+  16 Apr 2011; Ulrich Mueller <ulm@gentoo.org> +uclibc/package.use,
+  -hardened/linux/x86/minimal/virtuals, uclibc/virtuals:
+  Remove old-style virtual/ssh. Add USE=minimal for new-style virtual/ssh in
+  uclibc profile. Bug 361121.
+
   16 Apr 2011; Anthony G. Basile <blueness@gentoo.org> base/package.mask,
   selinux/package.mask, selinux/v2refpolicy/package.mask:
   Removed maskings and unmaskings for sec-policy/selinux-hal.
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index a36ded451dc0..f45b32798ee8 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,10 +1,11 @@
 # 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.253 2011/04/16 19:21:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.254 2011/04/16 19:38:23 ulm Exp $
 
   16 Apr 2011; Ulrich Mueller <ulm@gentoo.org> virtuals:
   Remove old-style virtual/blackbox, bug 358825.
   Remove old-style virtual/inetd, bug 358831.
+  Remove old-style virtual/ssh, bug 361121.
 
   15 Apr 2011; Ulrich Mueller <ulm@gentoo.org> virtuals:
   Remove dev-manager and dhcp old-style virtuals, bugs 361133 and 358827.
diff --git a/profiles/base/virtuals b/profiles/base/virtuals
index a6ffaec58ccc..f8061cfacc27 100644
--- a/profiles/base/virtuals
+++ b/profiles/base/virtuals
@@ -1,6 +1,6 @@
 # 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.153 2011/04/16 19:21:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/virtuals,v 1.154 2011/04/16 19:38:23 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
@@ -17,4 +17,3 @@ virtual/cron				sys-process/vixie-cron
 virtual/libc				sys-libs/glibc
 virtual/linux-sources			sys-kernel/gentoo-sources
 virtual/modutils			sys-apps/module-init-tools
-virtual/ssh				net-misc/openssh
diff --git a/profiles/embedded/ChangeLog b/profiles/embedded/ChangeLog
index f9c0412fa118..324dafde49f1 100644
--- a/profiles/embedded/ChangeLog
+++ b/profiles/embedded/ChangeLog
@@ -1,10 +1,11 @@
 # 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.29 2011/04/16 19:21:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/embedded/ChangeLog,v 1.30 2011/04/16 19:38:23 ulm Exp $
 
   16 Apr 2011; Ulrich Mueller <ulm@gentoo.org> virtuals:
   Remove old-style virtual/blackbox, bug 358825.
   Remove old-style virtual/inetd, bug 358831.
+  Remove old-style virtual/ssh, bug 361121.
 
   15 Apr 2011; Ulrich Mueller <ulm@gentoo.org> virtuals:
   Remove old-style virtual/dev-manager, bug 361133.
diff --git a/profiles/embedded/virtuals b/profiles/embedded/virtuals
index 4df8ccb8fbc0..1bc2a3a0e805 100644
--- a/profiles/embedded/virtuals
+++ b/profiles/embedded/virtuals
@@ -3,4 +3,3 @@ virtual/cron			sys-apps/busybox
 virtual/libc			sys-libs/glibc
 virtual/linux-sources		sys-kernel/gentoo-sources
 virtual/modutils		sys-apps/busybox
-virtual/ssh			net-misc/dropbear
diff --git a/profiles/hardened/linux/x86/minimal/virtuals b/profiles/hardened/linux/x86/minimal/virtuals
deleted file mode 100644
index 590fb8492d5a..000000000000
--- a/profiles/hardened/linux/x86/minimal/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/ssh	net-misc/dropbear
diff --git a/profiles/hardened/x86/minimal/virtuals b/profiles/hardened/x86/minimal/virtuals
deleted file mode 100644
index 590fb8492d5a..000000000000
--- a/profiles/hardened/x86/minimal/virtuals
+++ /dev/null
@@ -1 +0,0 @@
-virtual/ssh	net-misc/dropbear
diff --git a/profiles/uclibc/package.use b/profiles/uclibc/package.use
new file mode 100644
index 000000000000..eebbed204665
--- /dev/null
+++ b/profiles/uclibc/package.use
@@ -0,0 +1,5 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/package.use,v 1.1 2011/04/16 19:38:23 ulm Exp $
+
+virtual/ssh minimal
diff --git a/profiles/uclibc/virtuals b/profiles/uclibc/virtuals
index 5c3f2836dd4a..bf2171a81195 100644
--- a/profiles/uclibc/virtuals
+++ b/profiles/uclibc/virtuals
@@ -1,7 +1,6 @@
 # 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.22 2011/04/14 05:57:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/virtuals,v 1.23 2011/04/16 19:38:23 ulm Exp $
 
 virtual/libc			sys-libs/uclibc -sys-libs/glibc
 virtual/linux-sources		sys-kernel/vanilla-sources
-virtual/ssh			net-misc/dropbear