Remove old-style virtual/gzip, bug 358829.

13 files changed, 41 insertions, 27 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index f6af33128081..b20927d3a1a7 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5251 2011/04/03 10:07:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5252 2011/04/03 11:29:58 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!
 
+  03 Apr 2011; Ulrich Mueller <ulm@gentoo.org> default/linux/packages.build,
+  hardened/packages.build, targets/vserver/packages.build:
+  Remove old-style virtual/gzip, bug 358829.
+
   03 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> package.mask:
   Mask media-video/libav and media-video/mplayer2.
 
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 0a45d7b61010..c172fc5e0c08 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.240 2011/04/02 12:57:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.241 2011/04/03 11:29:58 ulm Exp $
+
+  03 Apr 2011; Ulrich Mueller <ulm@gentoo.org> packages, virtuals:
+  Remove old-style virtual/gzip, bug 358829.
 
   02 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> virtuals:
   Remove virtual/libpcap wrt #358835.
diff --git a/profiles/base/packages b/profiles/base/packages
index a338e0c80d53..39f699593eee 100644
--- a/profiles/base/packages
+++ b/profiles/base/packages
@@ -1,6 +1,6 @@
-# Copyright 2004-2011 Gentoo Foundation.
+# Copyright 1999-2011 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/packages,v 1.46 2011/03/02 13:23:24 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/packages,v 1.47 2011/04/03 11:29:58 ulm Exp $
 
 # Gentoo Base Profile
 
@@ -27,6 +27,7 @@
 *sys-apps/baselayout
 *app-arch/bzip2
 *app-arch/cpio
+*app-arch/gzip
 *app-arch/tar
 *app-arch/xz-utils
 *app-shells/bash
@@ -68,7 +69,6 @@
 *sys-libs/zlib
 *virtual/dev-manager
 *virtual/editor
-*virtual/gzip
 *virtual/libc
 *virtual/man
 *virtual/modutils
diff --git a/profiles/base/virtuals b/profiles/base/virtuals
index fdb903523bca..bf1173a49457 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.140 2011/04/02 12:57:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/virtuals,v 1.141 2011/04/03 11:29:58 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
@@ -13,7 +13,6 @@ virtual/blackbox			x11-wm/blackbox
 virtual/cron				sys-process/vixie-cron
 virtual/dev-manager			sys-fs/udev
 virtual/dhcpc				net-misc/dhcpcd
-virtual/gzip				app-arch/gzip
 virtual/inetd				sys-apps/xinetd
 virtual/libc				sys-libs/glibc
 virtual/linux-sources			sys-kernel/gentoo-sources
diff --git a/profiles/default/bsd/ChangeLog b/profiles/default/bsd/ChangeLog
index 7d2c0c93aa69..bafc8dd51764 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.43 2011/03/31 08:31:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.44 2011/04/03 11:29:58 ulm Exp $
+
+  03 Apr 2011; Ulrich Mueller <ulm@gentoo.org> fbsd/packages.build:
+  Remove old-style virtual/gzip, bug 358829.
 
   31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> fbsd/package.use.mask:
   Drop obsolete pgsql masks on threads useflag
diff --git a/profiles/default/bsd/fbsd/packages.build b/profiles/default/bsd/fbsd/packages.build
index ef569bb79bce..31a9ee581c29 100644
--- a/profiles/default/bsd/fbsd/packages.build
+++ b/profiles/default/bsd/fbsd/packages.build
@@ -1,6 +1,6 @@
-# Copyright 2004-2009 Gentoo Foundation.
+# 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/packages.build,v 1.2 2009/07/21 13:07:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/packages.build,v 1.3 2011/04/03 11:29:58 ulm Exp $
 
 # This file describes the packages needed to build a stage 1 based on this
 # profile.  Packages in this file are built in order.
@@ -9,6 +9,7 @@
 # symlinks on systems that use them.
 
 app-arch/bzip2
+app-arch/gzip
 dev-libs/openssl
 app-arch/libarchive
 app-shells/bash
@@ -37,7 +38,6 @@ dev-lang/perl
 dev-lang/python
 app-editors/nano
 virtual/editor
-virtual/gzip
 virtual/libc
 virtual/os-headers
 sys-freebsd/freebsd-lib
diff --git a/profiles/default/linux/packages.build b/profiles/default/linux/packages.build
index 48dd72aedfbb..dd0c67ba5830 100644
--- a/profiles/default/linux/packages.build
+++ b/profiles/default/linux/packages.build
@@ -1,6 +1,6 @@
-# Copyright 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/default/linux/packages.build,v 1.2 2008/04/06 15:40:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/packages.build,v 1.3 2011/04/03 11:29:58 ulm Exp $
 
 # This file describes the packages needed to build a stage1 based on this
 # profile.  Packages in this file are built in order.
@@ -9,6 +9,7 @@
 # releases.  PLEASE DO NOT ENABLE THIS UNLESS YOU HAVE THOROUGHLY TESTED IT!
 
 app-arch/bzip2
+app-arch/gzip
 app-arch/tar
 app-shells/bash
 net-misc/rsync
@@ -36,7 +37,6 @@ sys-devel/gnuconfig
 sys-devel/make
 sys-devel/patch
 virtual/editor
-virtual/gzip
 virtual/libc
 virtual/os-headers
 virtual/portage
diff --git a/profiles/embedded/ChangeLog b/profiles/embedded/ChangeLog
index 3776b648fbf5..cbad597a672c 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.19 2011/03/28 10:37:32 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/embedded/ChangeLog,v 1.20 2011/04/03 11:29:59 ulm Exp $
+
+  03 Apr 2011; Ulrich Mueller <ulm@gentoo.org> virtuals:
+  Remove old-style virtual/gzip, bug 358829.
 
   28 Mar 2011; Eray Aslan <eras@gentoo.org> virtuals:
   remove old style virtual/mta - bug 360305
diff --git a/profiles/embedded/virtuals b/profiles/embedded/virtuals
index a836bbf994ca..fff3bce20499 100644
--- a/profiles/embedded/virtuals
+++ b/profiles/embedded/virtuals
@@ -3,7 +3,6 @@ virtual/blackbox		x11-wm/blackbox
 virtual/bootloader		sys-boot/grub
 virtual/cron			sys-apps/busybox
 virtual/libc			sys-libs/glibc
-virtual/gzip			sys-apps/busybox
 virtual/inetd			sys-apps/busybox
 virtual/linux-sources		sys-kernel/gentoo-sources
 virtual/logger			sys-apps/busybox
diff --git a/profiles/hardened/packages.build b/profiles/hardened/packages.build
index 7e584da5beae..bcd68b25ab31 100644
--- a/profiles/hardened/packages.build
+++ b/profiles/hardened/packages.build
@@ -1,8 +1,9 @@
-# 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/packages.build,v 1.4 2007/02/11 17:08:53 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/packages.build,v 1.5 2011/04/03 11:29:59 ulm Exp $
 
 app-arch/bzip2
+app-arch/gzip
 app-arch/tar
 app-shells/bash
 net-misc/rsync
@@ -34,6 +35,5 @@ sys-devel/patch
 dev-lang/perl
 dev-lang/python
 virtual/editor
-virtual/gzip
 virtual/libc
 virtual/os-headers
diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index 561264bf6e71..823cb8b6f039 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for profiles/prefix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.256 2011/03/30 08:33:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.257 2011/04/03 11:29:59 ulm Exp $
+
+  03 Apr 2011; Ulrich Mueller <ulm@gentoo.org> windows/winnt/packages:
+  Remove old-style virtual/gzip, bug 358829.
 
   30 Mar 2011; Fabian Groffen <grobian@gentoo.org>
   +sunos/solaris/5.11/package.use.mask:
diff --git a/profiles/prefix/windows/winnt/packages b/profiles/prefix/windows/winnt/packages
index 1c4c438a175b..ef579826c851 100644
--- a/profiles/prefix/windows/winnt/packages
+++ b/profiles/prefix/windows/winnt/packages
@@ -1,13 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/packages,v 1.2 2009/09/29 09:04:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/packages,v 1.3 2011/04/03 11:29:59 ulm Exp $
 
 # those are packages not available/required on winnt, since
 # winnt can be a child EPREFIX only, which tears it's DEPENDS
 # from a parent (e.g. x86-interix) prefix.
 
 -*sys-apps/grep
--*virtual/gzip
+-*app-arch/gzip
 -*sys-devel/libtool
 -*virtual/man
 -*sys-devel/patch
diff --git a/profiles/targets/vserver/packages.build b/profiles/targets/vserver/packages.build
index 66cbdf54ab83..653880d41f8e 100644
--- a/profiles/targets/vserver/packages.build
+++ b/profiles/targets/vserver/packages.build
@@ -1,6 +1,6 @@
-# Copyright 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/targets/vserver/packages.build,v 1.1 2008/04/06 15:40:56 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/vserver/packages.build,v 1.2 2011/04/03 11:29:59 ulm Exp $
 
 # This file describes the packages needed to build a stage 1 based on this
 # profile.  Packages in this file are built in order.
@@ -16,6 +16,7 @@
 # symlinks due to baselayout-vserver getting injected in the end
 
 -app-arch/bzip2
+-app-arch/gzip
 -app-arch/tar
 -app-shells/bash
 -net-misc/rsync
@@ -43,12 +44,12 @@
 -dev-lang/perl
 -dev-lang/python
 -virtual/editor
--virtual/gzip
 -virtual/libc
 -virtual/os-headers
 -virtual/portage
 
 app-arch/bzip2
+app-arch/gzip
 app-arch/tar
 app-shells/bash
 net-misc/rsync
@@ -73,7 +74,6 @@ sys-devel/gnuconfig
 sys-devel/make
 sys-devel/patch
 virtual/editor
-virtual/gzip
 virtual/libc
 virtual/os-headers
 virtual/portage