summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2007-01-07 03:58:34 +0000
committerSimon Stelling <blubb@gentoo.org>2007-01-07 03:58:34 +0000
commitc3a001851bd2eca00f9be6a2c020b8b353714b9d (patch)
tree0da636e7e1a6522088b6311f4ebccf9079b52b23
parentVersion bump to fix python-2.5 compatibility, bug 148728. (diff)
downloadgentoo-2-c3a001851bd2eca00f9be6a2c020b8b353714b9d.tar.gz
gentoo-2-c3a001851bd2eca00f9be6a2c020b8b353714b9d.tar.bz2
gentoo-2-c3a001851bd2eca00f9be6a2c020b8b353714b9d.zip
remove deprecated 2005.x profiles
-rw-r--r--profiles/default-linux/amd64/2005.0/README8
-rw-r--r--profiles/default-linux/amd64/2005.0/deprecated15
-rw-r--r--profiles/default-linux/amd64/2005.0/make.defaults14
-rw-r--r--profiles/default-linux/amd64/2005.0/no-multilib/make.defaults5
-rw-r--r--profiles/default-linux/amd64/2005.0/no-multilib/package.mask186
-rw-r--r--profiles/default-linux/amd64/2005.0/no-multilib/package.use.mask3
-rw-r--r--profiles/default-linux/amd64/2005.0/no-multilib/parent1
-rw-r--r--profiles/default-linux/amd64/2005.0/no-multilib/use.mask9
-rw-r--r--profiles/default-linux/amd64/2005.0/package.mask39
-rw-r--r--profiles/default-linux/amd64/2005.0/packages14
-rw-r--r--profiles/default-linux/amd64/2005.0/parent1
-rw-r--r--profiles/default-linux/amd64/2005.0/profile.bashrc22
-rw-r--r--profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh229
-rw-r--r--profiles/default-linux/amd64/2005.0/use.mask5
-rw-r--r--profiles/default-linux/amd64/2005.1/deprecated15
-rw-r--r--profiles/default-linux/amd64/2005.1/make.defaults14
-rw-r--r--profiles/default-linux/amd64/2005.1/no-multilib/make.defaults5
-rw-r--r--profiles/default-linux/amd64/2005.1/no-multilib/package.mask186
-rw-r--r--profiles/default-linux/amd64/2005.1/no-multilib/package.use.mask3
-rw-r--r--profiles/default-linux/amd64/2005.1/no-multilib/parent1
-rw-r--r--profiles/default-linux/amd64/2005.1/no-multilib/use.mask9
-rw-r--r--profiles/default-linux/amd64/2005.1/package.mask17
-rw-r--r--profiles/default-linux/amd64/2005.1/packages18
-rw-r--r--profiles/default-linux/amd64/2005.1/parent1
-rw-r--r--profiles/default-linux/amd64/2005.1/profile.bashrc22
-rw-r--r--profiles/default-linux/amd64/2005.1/use.mask5
-rw-r--r--profiles/default-linux/amd64/2005.1/vserver/package.mask5
-rw-r--r--profiles/default-linux/amd64/2005.1/vserver/packages15
-rw-r--r--profiles/default-linux/amd64/2005.1/vserver/parent1
-rw-r--r--profiles/default-linux/amd64/2005.1/vserver/virtuals6
-rw-r--r--profiles/default-linux/amd64/ChangeLog18
31 files changed, 17 insertions, 875 deletions
diff --git a/profiles/default-linux/amd64/2005.0/README b/profiles/default-linux/amd64/2005.0/README
deleted file mode 100644
index bda8cc4c76a5..000000000000
--- a/profiles/default-linux/amd64/2005.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-As of Monday 28th, 2005, this profile has gone stable. All previous
-profiles are considered deprecated. Please update to one of the 2005.0
-profiles.
-
-For upgrade instructions, please check out the following URL for full
-instructions:
-
-http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=1
diff --git a/profiles/default-linux/amd64/2005.0/deprecated b/profiles/default-linux/amd64/2005.0/deprecated
deleted file mode 100644
index 794c995ec152..000000000000
--- a/profiles/default-linux/amd64/2005.0/deprecated
+++ /dev/null
@@ -1,15 +0,0 @@
-default-linux/amd64/2006.1/desktop
-# There are several possible profiles that you can use to replace this one.
-
-# default-linux/amd64/2006.1
-# default-linux/amd64/2006.1/desktop
-# default-linux/amd64/2006.1/server
-
-# By default, we use the desktop profile.
-
-# emerge -n '>=sys-apps/portage-2.0.51'
-# cd /etc
-# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/amd64/2006.1/desktop make.profile
-
-# This profile is deprecated and will be removed on or after January 1st, 2007.
diff --git a/profiles/default-linux/amd64/2005.0/make.defaults b/profiles/default-linux/amd64/2005.0/make.defaults
deleted file mode 100644
index dbec030d5d1f..000000000000
--- a/profiles/default-linux/amd64/2005.0/make.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/make.defaults,v 1.25 2006/10/04 20:56:20 wolf31o2 Exp $
-
-#removed because managers vote requires us to do so
-#("when we go nptl, we all go nptl")
-#STAGE1_USE="nptl -nptlonly"
-
-# This profile doesn't fully support multilib portage yet. We still rely
-# on the emul-* packages. As such, we have -multilib-pkg here to emphasise
-# that point.
-FEATURES="sandbox autoconfig -multilib-pkg"
-
-USE="alsa berkdb crypt cups eds emboss encode foomaticdb gif gnome gpm gstreamer gtk gtk2 imlib ipv6 jpeg kde lzw lzw-tiff mp3 mpeg ncurses nls opengl pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd tiff usb zlib X xpm xv zlib -java"
diff --git a/profiles/default-linux/amd64/2005.0/no-multilib/make.defaults b/profiles/default-linux/amd64/2005.0/no-multilib/make.defaults
deleted file mode 100644
index a9f0c6386300..000000000000
--- a/profiles/default-linux/amd64/2005.0/no-multilib/make.defaults
+++ /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/default-linux/amd64/2005.0/no-multilib/make.defaults,v 1.1 2005/01/28 01:36:54 eradicator Exp $
-
-MULTILIB_ABIS="amd64"
diff --git a/profiles/default-linux/amd64/2005.0/no-multilib/package.mask b/profiles/default-linux/amd64/2005.0/no-multilib/package.mask
deleted file mode 100644
index fe4d5729d3cc..000000000000
--- a/profiles/default-linux/amd64/2005.0/no-multilib/package.mask
+++ /dev/null
@@ -1,186 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/no-multilib/package.mask,v 1.48 2006/12/12 16:50:13 wolf31o2 Exp $
-
-# AMD64 Team <amd64@gentoo.org>
-# Mask packages that rely on amd64 multilib
-app-antivirus/bitdefender-console
-app-antivirus/f-prot
-app-antivirus/vlnx
-app-arch/rar
-app-arch/stuffit
-app-benchmarks/cpuburn
-app-cdr/cdrecord-prodvd
-app-cdr/nero
-app-emulation/cedaga
-app-emulation/crossover-office-bin
-app-emulation/crossover-office-pro-bin
-app-emulation/point2play
-app-emulation/vmware-dsp
-app-emulation/vmware-player
-app-emulation/vmware-server
-app-emulation/vmware-server-console
-app-emulation/vmware-workstation
-app-emulation/winex-transgaming
-app-i18n/kurso-de-esperanto
-app-mobilephone/bitpim
-app-office/mozilla-sunbird-bin
-app-office/ooextras
-app-office/oooqs
-app-office/ooqstart-gnome
-app-office/openoffice-bin
-app-pda/qtopia-desktop-bin
-app-emulation/cedega
-app-emulation/emul-linux-x86-baselibs
-app-emulation/emul-linux-x86-compat
-app-emulation/emul-linux-x86-glibc
-app-emulation/emul-linux-x86-gtklibs
-app-emulation/emul-linux-x86-medialibs
-app-emulation/emul-linux-x86-nvidia
-app-emulation/emul-linux-x86-qtlibs
-app-emulation/emul-linux-x86-sdl
-app-emulation/emul-linux-x86-soundlibs
-app-emulation/emul-linux-x86-xlibs
-app-emulation/emul-linux-x86-java
-app-emulation/transgaming-fontinstaller
-app-emulation/transgaming-mozctlinstaller
-app-emulation/winex-transgaming
-app-emulation/wine
-app-emulation/winesetuptk
-app-emulation/winex
-app-emulation/winex-cvs
-app-emulation/winex-transgaming
-app-text/acroread
-<dev-java/blackdown-jdk-1.4.2
-<dev-java/blackdown-jre-1.4.2
-dev-util/dialogblocks
-dev-util/helpblocks
-games-action/descent3
-games-action/descent3-demo
-games-action/heretic2
-games-action/heretic2-demo
-games-action/lugaru-demo
-games-action/mutantstorm-demo
-games-action/parsec
-games-action/phobiaii
-games-action/rune
-games-action/spacetripper-demo
-games-arcade/barbarian-bin
-games-arcade/gish-demo
-games-emulation/goosnes
-games-emulation/nestra
-games-emulation/snes9express
-games-emulation/snes9x
-games-emulation/zsnes
-games-emulation/mupen64
-games-fps/americas-army
-games-fps/doom3-cdoom
-games-fps/doom3-chextrek
-games-fps/doom3-data
-games-fps/doom3-demo
-games-fps/doom3-ducttape
-games-fps/doom3-dungeon
-games-fps/doom3-eventhorizon
-games-fps/doom3-hellcampaign
-games-fps/doom3-inhell
-games-fps/doom3-lms
-games-fps/doom3-mitm
-games-fps/doom3-opencoop
-games-fps/doom3-phantasm
-games-fps/doom3-roe
-games-fps/doom3
-games-fps/enemy-territory-etpro
-games-fps/enemy-territory-fortress
-games-fps/enemy-territory-truecombat
-games-fps/enemy-territory
-games-fps/glxquake-bin
-games-fps/legends
-games-fps/postal2mp-demo
-games-fps/quake3-alliance
-games-fps/quake3-alternatefire
-games-fps/quake3-bfp
-games-fps/quake3-bin
-games-fps/quake3-brainworks
-games-fps/quake3-cpma
-games-fps/quake3-defrag
-games-fps/quake3-demo
-games-fps/quake3-matrix
-games-fps/quake3-nsco
-games-fps/quake3-osp
-games-fps/quake3-ra3
-games-fps/quake3-ruinhunters
-games-fps/quake3-teamarena
-games-fps/quake3-threewave
-games-fps/quake3-tremulous
-games-fps/quake3-truecombat
-games-fps/quake3-urbanterror
-games-fps/quake3-wop
-games-fps/quake4-bin
-games-fps/quake4-data
-games-fps/quake4-demo
-games-fps/rtcw
-games-fps/rtcwmp-demo
-games-fps/rtcwsp-demo
-games-fps/soldieroffortune
-games-fps/soldieroffortune-demo
-games-fps/tremulous-bin
-games-fps/ut2003
-games-fps/ut2003-demo
-games-fps/ut2004-demo
-games-fps/vendetta-online-bin
-games-puzzle/hoh-bin
-games-roguelike/adom
-games-rpg/nwmouse
-games-rpg/nwn
-games-rpg/nwn-cep
-games-rpg/nwn-data
-games-server/nwn-ded
-games-server/ut2003-ded
-games-simulation/simutrans
-games-strategy/coldwar
-games-strategy/coldwar-demo
-games-strategy/darwinia
-games-strategy/darwinia-demo
-games-strategy/dominions2
-games-strategy/heroes3
-games-strategy/heroes3-demo
-games-strategy/majesty-demo
-games-strategy/x2
-games-strategy/x2-demo
-mail-client/ciphire-mail
-mail-client/mozilla-thunderbird-bin
-media-fonts/acroread-asianfonts
-media-gfx/grender
-media-gfx/maya
-media-libs/win32codecs
-media-sound/peercast
-media-sound/shoutcast-server-bin
-media-sound/shoutcast-trans-bin
-media-sound/teamspeak2-client-bin
-media-sound/teamspeak2-server-bin
-media-sound/ventrilo-server-bin
-media-video/binkplayer
-media-video/dvdrip
-media-video/mplayer-bin
-media-video/realplayer
-net-dialup/slmodem
-net-im/aim
-net-im/skype
-net-im/ymessenger
-net-misc/icaclient
-net-misc/nx-x11-bin
-net-misc/nxclient
-net-p2p/sancho-bin
-net-www/netscape-flash
-net-www/nspluginwrapper
-sci-biology/foldingathome
-sys-apps/memtest86
-sys-apps/memtest86+
-sys-libs/lib-compat-loki
-www-client/opera
-www-client/mozilla-bin
-www-client/mozilla-firefox-bin
-x11-misc/googleearth
-x11-misc/qcomicbook
-
-# AMD64 Team; <amd64@gentoo.org>
-# grub is not available on no-multilib-profiles; use sys-boot/grub-static
-sys-boot/grub
diff --git a/profiles/default-linux/amd64/2005.0/no-multilib/package.use.mask b/profiles/default-linux/amd64/2005.0/no-multilib/package.use.mask
deleted file mode 100644
index bbc104f12289..000000000000
--- a/profiles/default-linux/amd64/2005.0/no-multilib/package.use.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Nov 2, 2006; Jim Ramsay <lack@gentoo.org>
-# This flag needs masked app-arch/rar (sadly not app-arch/unrar)
-rox-extra/archive rar
diff --git a/profiles/default-linux/amd64/2005.0/no-multilib/parent b/profiles/default-linux/amd64/2005.0/no-multilib/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default-linux/amd64/2005.0/no-multilib/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default-linux/amd64/2005.0/no-multilib/use.mask b/profiles/default-linux/amd64/2005.0/no-multilib/use.mask
deleted file mode 100644
index 579d0005a8d0..000000000000
--- a/profiles/default-linux/amd64/2005.0/no-multilib/use.mask
+++ /dev/null
@@ -1,9 +0,0 @@
-# USE flags masked because providing packages have ABI=x86
-
-# 2006/03/22 Danny van Dyk <kugelfang@gentoo.org>
-# media-sound/realplayer is x86 only.
-real
-
-# 2006/05/04 Chris Gianelloni <wolf31o2@gentoo.org>
-# games-fps/quake3-teamarena is 32-bit
-teamarena
diff --git a/profiles/default-linux/amd64/2005.0/package.mask b/profiles/default-linux/amd64/2005.0/package.mask
deleted file mode 100644
index daaa472af747..000000000000
--- a/profiles/default-linux/amd64/2005.0/package.mask
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/package.mask,v 1.19 2006/10/06 19:01:12 wolf31o2 Exp $
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# gcc ebuilds that haven't been updated to use the src_install in
-# toolchain.eclass yet
-~sys-devel/gcc-3.4.0
-~sys-devel/gcc-3.4.1
-~sys-devel/gcc-3.4.2
-=sys-devel/gcc-3.4.3
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# Use linux headers which give us asm-i386 headers as well
-<sys-kernel/linux26-headers-2.6.8.1-r3
-<sys-kernel/linux-headers-2.6.8.1-r3
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# These are provided by non-emul packages now
-<app-emulation/emul-linux-x86-glibc-1000
-app-emulation/emul-linux-x86-nvidia
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# Make sure we have a correct /etc/env.d entry
-<app-emulation/emul-linux-x86-baselibs-1.2.2-r2
-<app-emulation/emul-linux-x86-xlibs-1.2-r2
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# Non multilib-friendly baselayouts
-=sys-apps/baselayout-1.11.7-r2
-=sys-apps/baselayout-1.11.8
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# These perl versions grep in /usr/include for things that are in
-# gentoo-multilib
-<sys-devel/libperl-5.8.5
-<dev-lang/perl-5.8.5-r2
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# These don't work right for multilib
-<sys-apps/sandbox-1.2.1-r3
diff --git a/profiles/default-linux/amd64/2005.0/packages b/profiles/default-linux/amd64/2005.0/packages
deleted file mode 100644
index c73ec973d0e8..000000000000
--- a/profiles/default-linux/amd64/2005.0/packages
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/packages,v 1.10 2005/01/27 00:33:18 eradicator Exp $
-
-*>=sys-devel/binutils-2.15.90.0.1.1-r3
-*>=sys-devel/gcc-3.3.5-r1
-*>=sys-libs/glibc-2.3.4.20040808-r1
-
-# Make portage/toolchain honor ${ABI}
-*>=sys-apps/portage-2.0.51-r13
-*>=sys-devel/gcc-config-1.3.9
->=sys-devel/distcc-2.18.3-r1
-
-*>=sys-apps/baselayout-1.9.4-r7
diff --git a/profiles/default-linux/amd64/2005.0/parent b/profiles/default-linux/amd64/2005.0/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default-linux/amd64/2005.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default-linux/amd64/2005.0/profile.bashrc b/profiles/default-linux/amd64/2005.0/profile.bashrc
deleted file mode 100644
index e3013d63c59a..000000000000
--- a/profiles/default-linux/amd64/2005.0/profile.bashrc
+++ /dev/null
@@ -1,22 +0,0 @@
-# The version of profile in our 'packages' does not yet set ABI for us nor
-# export the CFLAGS_${ABI} envvars... The multilib-pkg patch does, but this
-# won't be in portage until atleast .52_pre
-
-if [ -n "${ABI}" ]; then
- export ABI
-elif [ -n "${DEFAULT_ABI}" ]; then
- export ABI="${DEFAULT_ABI}"
-else
- export ABI="amd64"
-fi
-
-#export CFLAGS_amd64
-export CFLAGS_x86
-
-# Make sure they updated to 2005.0 properly
-if [ -L /lib32 -o -L /usr/lib32 ] && [ ${PORTAGE_CALLER} != "repoman" ] ; then
- eerror "It appears you have switched to the 2005.0 profile without following"
- eerror "the upgrade guide. Please see the following URL for more information:"
- eerror "http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=1"
- exit 1
-fi
diff --git a/profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh b/profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh
deleted file mode 100644
index a50a3f7cfc13..000000000000
--- a/profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh
+++ /dev/null
@@ -1,229 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh,v 1.8 2005/08/21 04:28:00 eradicator Exp $
-
-TMPDIR="$(portageq envvar PORTAGE_TMPDIR)"
-PORTDIR="$(portageq envvar PORTDIR)"
-
-# change to yes if you want to use DISTCC
-if portageq envvar FEATURES | grep -q distcc ; then
- export USE_DISTCC="yes"
-else
- export USE_DISTCC="no"
-fi
-
-#--- You shouldn't need to chane anything past this line ---
-
-PORTAGE_REQ=">=sys-apps/portage-2.0.51-r9"
-GCC_CONFIG_REQ=">=sys-devel/gcc-config-1.3.9"
-DISTCC_REQ=">=sys-devel/distcc-2.18.3-r1"
-EMUL_GLIBC_REQ=">=app-emulation/emul-linux-x86-glibc-2.3.4.20041102"
-LINUX_HEADERS_REQ=">=sys-kernel/linux-headers-2.6.8.1-r3"
-
-# When do we need to emerge sandbox instead of portage?
-PORTAGE_NEEDSANDBOX=">sys-apps/portage-2.0.51.19"
-SANDBOX_REQ="sys-apps/sandbox"
-
-TMPDIR="${TMPDIR}/2005.0_upgrade"
-
-if ! source /sbin/functions.sh ; then
- echo "$0: Failed to source /sbin/functions.sh" >&2
- exit 1
-fi
-
-mkdir -p ${TMPDIR} &> /dev/null
-cd ${TMPDIR}
-
-myDie() {
- if [[ -f step5 ]] ; then
- eerror "Upgrade failed in stage 6. We were unable to unmerge the"
- eerror "emul-linux-x86-glibc package. This is the last step of the upgrade process."
- elif [[ -f step4 ]] ; then
- eerror "Upgrade failed in stage 5. This is the biggest step of the upgrade"
- eerror "process. We were unable to build glibc for your system."
- eerror "Try running:"
- eerror "FEATURES=-sandbox emerge --oneshot sys-libs/glibc && touch ${TMPDIR}/step5"
- elif [[ -f step3 ]] ; then
- eerror "Upgrade failed in stage 4. The upgrade script failed to change"
- eerror "your /etc/make.profile symlink to the 2005.0 profile. Did"
- eerror "you intend to set PORTDIR to something other than ${PORTDIR}"
- eerror "in the upgrade script? If so, set it and re-execute the script."
- elif [[ -f step2 ]] ; then
- eerror "Upgrade failed in stage 3. Your multilib configuration is"
- eerror "probably broken, but 64bit applications will work fine while"
- eerror "you debug the problem. If you wish to revert to a working"
- eerror "2004.3 multilib system, then delete /lib32 and /usr/lib32"
- eerror "and re-emerge your emul-* packages. This process might also"
- eerror "fix whatever problem prevented the upgrade."
- elif [[ -f step1 ]] ; then
- eerror "Upgrade failed in stage 2. You still have a fully functional"
- eerror "2004.3 system."
- elif [[ -f step0 ]] ; then
- eerror "Upgrade failed in stage 1. You still have a fully functional"
- eerror "2004.3 system."
- else
- eerror "Upgrade failed updating portage. No changes have been made to"
- eerror "your system by the upgrade process."
- fi
-
- echo
- ewarn "You may safely re-execute this upgrade script after correcting any"
- ewarn "any problems to resume the upgrade process."
- echo
- eerror "Please report the following error and any errors above if you file"
- eerror "a bug at http://bugs.gentoo.org"
-
- echo "${@}"
- exit 1
-}
-
-if [[ ! -f step0 ]]; then
- if [[ ( -d /lib32 && ! -L /lib32 ) || ( -d /usr/lib32 && ! -L /usr/lib32 ) ]] ; then
- eerror "It looks like you have /lib32 or /usr/lib32 directories already."
- eerror "Have you already begun a manual upgrade? If so, pleasse revert your"
- eerror "changes and restart the script."
- exit 1
- fi
-
- if [[ -x /usr/bin/readlink ]] && /usr/bin/readlink /etc/make.profile | grep -q 2005 ; then
- eerror "Your /etc/make.profile symlink is not set to the 2004.3 profile. This script"
- eerror "expects a 2004.3 environment to start the upgrade. If you have started manually"
- eerror "upgrading your system, please revert the changes and start the script again."
- exit 1
- fi
-
- if [[ "$(gcc -m32 -print-multi-directory)" != "32" ]]; then
- eerror "Your compiler does not have multilib support. Pleasse switch to a multilib"
- eerror "enabled compiler with gcc-config. If you don't have one on your system, you can"
- eerror "emerga a multilib gcc by executing the following line:"
- eerror "FEATURES=-sandbox USE=multilib emerge gcc"
- exit 1
- fi
-
- if [[ -f /proc/config.gz ]] ; then
- KERNEL_CONFIG="gunzip -dc /proc/config.gz"
- elif [[ -f /proc/config.bz2 ]] ; then
- KERNEL_CONFIG="bunzip2 -dc /proc/config.bz2"
- elif [[ -f /proc/config ]] ; then
- KERNEL_CONFIG="cat /proc/config"
- elif [[ -f /lib/modules/$(uname -r)/build/.config ]] ; then
- KERNEL_CONFIG="cat /lib/modules/$(uname -r)/build/.config"
- elif [[ -f /lib/modules/$(uname -r)/source/.config ]] ; then
- KERNEL_CONFIG="cat /lib/modules/$(uname -r)/source/.config"
- else
- ewarn "Can't find a config for the running kernel, so we're assuminig"
- ewarn "you correctly have CONFIG_IA32_EMULATION (support for 32bit"
- ewarn "applications) enabled."
- KERNEL_CONFIG="echo CONFIG_IA32_EMULATION=y"
- fi
-
- if ! eval ${KERNEL_CONFIG} | grep -q CONFIG_IA32_EMULATION=y ; then
- myDie "Running kernel does not have support for executing 32bit applications. You need to enable CONFIG_IA32_EMULATION in your running kernel."
- fi
-
- # Always install portage since current might not be multilib friendly
- USE=multilib FEATURES=-sandbox emerge -v --oneshot ${PORTAGE_REQ} || \
- myDie "emerge portage failed"
-
- if portageq has_version / ${PORTAGE_NEEDSANDBOX} ; then \
- USE=multilib FEATURES=-sandbox emerge -v --oneshot ${SANDBOX_REQ} || \
- myDie "emerge sandbox failed"
- fi
-
- touch step0
-fi
-
-if [[ ! -f step1 ]]; then
- if ! portageq has_version / ${GCC_CONFIG_REQ} ; then \
- emerge -v --oneshot ${GCC_CONFIG_REQ} || \
- myDie "emerge gcc-config failed"
- fi
-
- if ! portageq has_version / ${EMUL_GLIBC_REQ} ; then \
- emerge -v --oneshot ${EMUL_GLIBC_REQ} || \
- myDie "emerge emul-glibc failed"
- fi
-
- if [[ "${USE_DISTCC}" == "yes" ]]; then
- if ! portageq has_version / ${DISTCC_REQ} ; then \
- emerge -v --oneshot ${DISTCC_REQ} || \
- myDie "emerge distcc failed"
- fi
- fi
-
- touch step1
-fi
-
-if [[ ! -f step2 ]]; then
- portageq has_version / linux26-headers && emerge unmerge linux26-headers
- if ! portageq has_version / ${LINUX_HEADERS_REQ} ; then \
- emerge -v --oneshot ${LINUX_HEADERS_REQ} || \
- myDie "emerge linux headers failed"
- fi
-
- if ! [[ -f /etc/env.d/04multilib ]]; then
- emerge -v --oneshot baselayout || myDie "emerge baselayout failed"
- fi
-
- if ! [[ -f /etc/env.d/04multilib ]]; then
- myDie "baselayout did not create /etc/env.d/04multilib as expected."
- fi
-
- env-update || myDie "env-update failed"
-
- echo "int main(){return 0;}" > ${TMPDIR}/32test.c
- if ! gcc -m32 ${TMPDIR}/32test.c -o ${TMPDIR}/32test >& ${TMPDIR}/32test.comp.log ; then
- myDie "Error compiling 32bit executable. Please see ${TMPDIR}/32test.comp.log"
- fi
-
- if ! ${TMPDIR}/32test >& ${TMPDIR}/32test.exec.log ; then
- myDie "Error executing 32bit executable. Please see ${TMPDIR}/32test.exec.log"
- fi
-
- touch step2
-fi
-
-if [[ ! -f step3 ]]; then
- [[ -L /lib32 ]] && rm /lib32 && mkdir /lib32
- [[ -L /usr/lib32 ]] && rm /usr/lib32 && mkdir /usr/lib32
- [[ -L /usr/X11R6/lib32 ]] && rm /usr/X11R6/lib32 && mkdir /usr/X11R6/lib32
- cp /emul/linux/x86/{usr/,}lib32/libsandbox.so* /usr/lib32 &> /dev/null
- [[ -f /usr/lib32/libsandbox.so ]] || myDie "Failed to copy over 32bit libsandbox."
- cp /emul/linux/x86/usr/lib32/libc.so /usr/lib32 || myDie "Failed to copy 32bit libc"
- cp /emul/linux/x86/usr/lib32/libpthread.so /usr/lib32 || myDie "Failed to copy 32bit libpthread."
- cp /emul/linux/x86/usr/lib32/*crt*.o /usr/lib32 || myDie "Failed to copy 32bit *crt*.o"
- [[ -d /emul/linux/x86/usr/lib32/nptl ]] && mkdir /usr/lib32/nptl
- [[ -d /emul/linux/x86/usr/lib32/nptl ]] && cp /emul/linux/x86/usr/lib32/nptl/libc.so /usr/lib32/nptl
- [[ -d /emul/linux/x86/usr/lib32/nptl ]] && cp /emul/linux/x86/usr/lib32/nptl/libpthread.so /usr/lib32/nptl
- env-update || myDie "env-update failed"
-
- touch step3
-fi
-
-if [[ ! -f step4 ]]; then
- if [[ -L /etc/make.profile ]] ; then
- rm /etc/make.profile || myDie "rm of old profile failed"
- fi
-
- ln -s ${PORTDIR}/profiles/default-linux/amd64/2005.0 /etc/make.profile || \
- myDie "link of new profile failed"
- touch step4
-fi
-
-if [[ ! -f step5 ]]; then
- emerge -v --oneshot sys-libs/glibc || myDie "emerge glibc failed"
- touch step5
-fi
-
-if [[ ! -f step6 ]] ; then
- rm -f /emul/linux/x86/usr/lib/libsandbox.* &> /dev/null
- emerge unmerge emul-linux-x86-glibc || myDie "emerge emul-glibc failed"
- touch step6
-fi
-
-echo "-------------------------------------------------------------------"
-echo "Congratulations, you're almost finished updating to 2005.0. Please"
-echo "run 'emerge -upv system' followed by 'emerge -uv system' to finish."
-
-rm -rf ${TMPDIR}
diff --git a/profiles/default-linux/amd64/2005.0/use.mask b/profiles/default-linux/amd64/2005.0/use.mask
deleted file mode 100644
index 505a2a7b604b..000000000000
--- a/profiles/default-linux/amd64/2005.0/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/use.mask,v 1.1 2005/01/18 06:57:24 eradicator Exp $
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# multilib is forced on when we have ${MULTILIB_ABIS} defined
-multilib
diff --git a/profiles/default-linux/amd64/2005.1/deprecated b/profiles/default-linux/amd64/2005.1/deprecated
deleted file mode 100644
index 794c995ec152..000000000000
--- a/profiles/default-linux/amd64/2005.1/deprecated
+++ /dev/null
@@ -1,15 +0,0 @@
-default-linux/amd64/2006.1/desktop
-# There are several possible profiles that you can use to replace this one.
-
-# default-linux/amd64/2006.1
-# default-linux/amd64/2006.1/desktop
-# default-linux/amd64/2006.1/server
-
-# By default, we use the desktop profile.
-
-# emerge -n '>=sys-apps/portage-2.0.51'
-# cd /etc
-# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/amd64/2006.1/desktop make.profile
-
-# This profile is deprecated and will be removed on or after January 1st, 2007.
diff --git a/profiles/default-linux/amd64/2005.1/make.defaults b/profiles/default-linux/amd64/2005.1/make.defaults
deleted file mode 100644
index ebaad714813a..000000000000
--- a/profiles/default-linux/amd64/2005.1/make.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/make.defaults,v 1.11 2006/10/04 20:56:20 wolf31o2 Exp $
-
-#removed because managers vote requires us to do so
-#("when we go nptl, we all go nptl")
-#STAGE1_USE="nptl -nptlonly"
-
-# This profile doesn't fully support multilib portage yet. We still rely
-# on the emul-* packages. As such, we have -multilib-pkg here to emphasise
-# that point.
-FEATURES="sandbox autoconfig -multilib-pkg"
-
-USE="alsa berkdb crypt cups eds emboss encode foomaticdb gif gnome gpm gstreamer gtk gtk2 imlib ipv6 jpeg kde lzw lzw-tiff mp3 mpeg ncurses nls opengl pam perl png python qt3 qt4 quicktime readline sdl spell ssl tcpd tiff usb zlib X xpm xv zlib -java"
diff --git a/profiles/default-linux/amd64/2005.1/no-multilib/make.defaults b/profiles/default-linux/amd64/2005.1/no-multilib/make.defaults
deleted file mode 100644
index 60baa8f1dae8..000000000000
--- a/profiles/default-linux/amd64/2005.1/no-multilib/make.defaults
+++ /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/default-linux/amd64/2005.1/no-multilib/make.defaults,v 1.1 2005/06/04 21:20:09 eradicator Exp $
-
-MULTILIB_ABIS="amd64"
diff --git a/profiles/default-linux/amd64/2005.1/no-multilib/package.mask b/profiles/default-linux/amd64/2005.1/no-multilib/package.mask
deleted file mode 100644
index 61a80375a400..000000000000
--- a/profiles/default-linux/amd64/2005.1/no-multilib/package.mask
+++ /dev/null
@@ -1,186 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/no-multilib/package.mask,v 1.31 2006/12/12 16:50:13 wolf31o2 Exp $
-
-# AMD64 Team <amd64@gentoo.org>
-# Mask packages that rely on amd64 multilib
-app-antivirus/bitdefender-console
-app-antivirus/f-prot
-app-antivirus/vlnx
-app-arch/rar
-app-arch/stuffit
-app-benchmarks/cpuburn
-app-cdr/cdrecord-prodvd
-app-cdr/nero
-app-emulation/cedaga
-app-emulation/crossover-office-bin
-app-emulation/crossover-office-pro-bin
-app-emulation/point2play
-app-emulation/vmware-dsp
-app-emulation/vmware-player
-app-emulation/vmware-server
-app-emulation/vmware-server-console
-app-emulation/vmware-workstation
-app-emulation/winex-transgaming
-app-i18n/kurso-de-esperanto
-app-mobilephone/bitpim
-app-office/mozilla-sunbird-bin
-app-office/ooextras
-app-office/oooqs
-app-office/ooqstart-gnome
-app-office/openoffice-bin
-app-pda/qtopia-desktop-bin
-app-emulation/cedega
-app-emulation/emul-linux-x86-baselibs
-app-emulation/emul-linux-x86-compat
-app-emulation/emul-linux-x86-glibc
-app-emulation/emul-linux-x86-gtklibs
-app-emulation/emul-linux-x86-medialibs
-app-emulation/emul-linux-x86-nvidia
-app-emulation/emul-linux-x86-qtlibs
-app-emulation/emul-linux-x86-sdl
-app-emulation/emul-linux-x86-soundlibs
-app-emulation/emul-linux-x86-xlibs
-app-emulation/emul-linux-x86-java
-app-emulation/transgaming-fontinstaller
-app-emulation/transgaming-mozctlinstaller
-app-emulation/winex-transgaming
-app-emulation/wine
-app-emulation/winesetuptk
-app-emulation/winex
-app-emulation/winex-cvs
-app-emulation/winex-transgaming
-app-text/acroread
-<dev-java/blackdown-jdk-1.4.2
-<dev-java/blackdown-jre-1.4.2
-dev-util/dialogblocks
-dev-util/helpblocks
-games-action/descent3
-games-action/descent3-demo
-games-action/heretic2
-games-action/heretic2-demo
-games-action/lugaru-demo
-games-action/mutantstorm-demo
-games-action/parsec
-games-action/phobiaii
-games-action/rune
-games-action/spacetripper-demo
-games-arcade/barbarian-bin
-games-arcade/gish-demo
-games-emulation/goosnes
-games-emulation/nestra
-games-emulation/snes9express
-games-emulation/snes9x
-games-emulation/zsnes
-games-emulation/mupen64
-games-fps/americas-army
-games-fps/doom3-cdoom
-games-fps/doom3-chextrek
-games-fps/doom3-data
-games-fps/doom3-demo
-games-fps/doom3-ducttape
-games-fps/doom3-dungeon
-games-fps/doom3-eventhorizon
-games-fps/doom3-hellcampaign
-games-fps/doom3-inhell
-games-fps/doom3-lms
-games-fps/doom3-mitm
-games-fps/doom3-opencoop
-games-fps/doom3-phantasm
-games-fps/doom3-roe
-games-fps/doom3
-games-fps/enemy-territory-etpro
-games-fps/enemy-territory-fortress
-games-fps/enemy-territory-truecombat
-games-fps/enemy-territory
-games-fps/glxquake-bin
-games-fps/legends
-games-fps/postal2mp-demo
-games-fps/quake3-alliance
-games-fps/quake3-alternatefire
-games-fps/quake3-bfp
-games-fps/quake3-bin
-games-fps/quake3-brainworks
-games-fps/quake3-cpma
-games-fps/quake3-defrag
-games-fps/quake3-demo
-games-fps/quake3-matrix
-games-fps/quake3-nsco
-games-fps/quake3-osp
-games-fps/quake3-ra3
-games-fps/quake3-ruinhunters
-games-fps/quake3-teamarena
-games-fps/quake3-threewave
-games-fps/quake3-tremulous
-games-fps/quake3-truecombat
-games-fps/quake3-urbanterror
-games-fps/quake3-wop
-games-fps/quake4-bin
-games-fps/quake4-data
-games-fps/quake4-demo
-games-fps/rtcw
-games-fps/rtcwmp-demo
-games-fps/rtcwsp-demo
-games-fps/soldieroffortune
-games-fps/soldieroffortune-demo
-games-fps/tremulous-bin
-games-fps/ut2003
-games-fps/ut2003-demo
-games-fps/ut2004-demo
-games-fps/vendetta-online-bin
-games-puzzle/hoh-bin
-games-roguelike/adom
-games-rpg/nwmouse
-games-rpg/nwn
-games-rpg/nwn-cep
-games-rpg/nwn-data
-games-server/nwn-ded
-games-server/ut2003-ded
-games-simulation/simutrans
-games-strategy/coldwar
-games-strategy/coldwar-demo
-games-strategy/darwinia
-games-strategy/darwinia-demo
-games-strategy/dominions2
-games-strategy/heroes3
-games-strategy/heroes3-demo
-games-strategy/majesty-demo
-games-strategy/x2
-games-strategy/x2-demo
-mail-client/ciphire-mail
-mail-client/mozilla-thunderbird-bin
-media-fonts/acroread-asianfonts
-media-gfx/grender
-media-gfx/maya
-media-libs/win32codecs
-media-sound/peercast
-media-sound/shoutcast-server-bin
-media-sound/shoutcast-trans-bin
-media-sound/teamspeak2-client-bin
-media-sound/teamspeak2-server-bin
-media-sound/ventrilo-server-bin
-media-video/binkplayer
-media-video/dvdrip
-media-video/mplayer-bin
-media-video/realplayer
-net-dialup/slmodem
-net-im/aim
-net-im/skype
-net-im/ymessenger
-net-misc/icaclient
-net-misc/nx-x11-bin
-net-misc/nxclient
-net-p2p/sancho-bin
-net-www/netscape-flash
-net-www/nspluginwrapper
-sci-biology/foldingathome
-sys-apps/memtest86
-sys-apps/memtest86+
-sys-libs/lib-compat-loki
-www-client/opera
-www-client/mozilla-bin
-www-client/mozilla-firefox-bin
-x11-misc/googleearth
-x11-misc/qcomicbook
-
-# AMD64 Team; <amd64@gentoo.org>
-# grub is not available on no-multilib-profiles; use sys-boot/grub-static
-sys-boot/grub
diff --git a/profiles/default-linux/amd64/2005.1/no-multilib/package.use.mask b/profiles/default-linux/amd64/2005.1/no-multilib/package.use.mask
deleted file mode 100644
index bbc104f12289..000000000000
--- a/profiles/default-linux/amd64/2005.1/no-multilib/package.use.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Nov 2, 2006; Jim Ramsay <lack@gentoo.org>
-# This flag needs masked app-arch/rar (sadly not app-arch/unrar)
-rox-extra/archive rar
diff --git a/profiles/default-linux/amd64/2005.1/no-multilib/parent b/profiles/default-linux/amd64/2005.1/no-multilib/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default-linux/amd64/2005.1/no-multilib/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default-linux/amd64/2005.1/no-multilib/use.mask b/profiles/default-linux/amd64/2005.1/no-multilib/use.mask
deleted file mode 100644
index 579d0005a8d0..000000000000
--- a/profiles/default-linux/amd64/2005.1/no-multilib/use.mask
+++ /dev/null
@@ -1,9 +0,0 @@
-# USE flags masked because providing packages have ABI=x86
-
-# 2006/03/22 Danny van Dyk <kugelfang@gentoo.org>
-# media-sound/realplayer is x86 only.
-real
-
-# 2006/05/04 Chris Gianelloni <wolf31o2@gentoo.org>
-# games-fps/quake3-teamarena is 32-bit
-teamarena
diff --git a/profiles/default-linux/amd64/2005.1/package.mask b/profiles/default-linux/amd64/2005.1/package.mask
deleted file mode 100644
index a2395469ef94..000000000000
--- a/profiles/default-linux/amd64/2005.1/package.mask
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/package.mask,v 1.4 2006/10/06 19:01:12 wolf31o2 Exp $
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# These are provided by non-emul packages now
-<app-emulation/emul-linux-x86-glibc-1000
-app-emulation/emul-linux-x86-nvidia
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# Make sure we have a correct /etc/env.d entry
-<app-emulation/emul-linux-x86-baselibs-1.2.2-r2
-<app-emulation/emul-linux-x86-xlibs-1.2-r2
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# These perl versions grep in /usr/include for things that are in
-# gentoo-multilib
-<sys-devel/libperl-5.8.5
-<dev-lang/perl-5.8.5-r2
diff --git a/profiles/default-linux/amd64/2005.1/packages b/profiles/default-linux/amd64/2005.1/packages
deleted file mode 100644
index 5bb543cabf67..000000000000
--- a/profiles/default-linux/amd64/2005.1/packages
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/packages,v 1.1 2005/06/04 21:20:09 eradicator Exp $
-
-*>=sys-devel/binutils-2.15.90.0.1.1-r4
-*>=sys-devel/gcc-3.4.3-r1
-
-# Avoid the bad NIS stuff with 2.3.4.20041102 and the ugly ebuilds prior to it
-*>=sys-libs/glibc-2.3.5
-
-# Use only portages with sandbox split off
-*>=sys-apps/portage-2.0.51.22
-
-# Make portage/toolchain honor ${ABI}
-*>=sys-devel/gcc-config-1.3.9
->=sys-devel/distcc-2.18.3-r1
-
-*>=sys-apps/baselayout-1.9.4-r7
diff --git a/profiles/default-linux/amd64/2005.1/parent b/profiles/default-linux/amd64/2005.1/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default-linux/amd64/2005.1/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default-linux/amd64/2005.1/profile.bashrc b/profiles/default-linux/amd64/2005.1/profile.bashrc
deleted file mode 100644
index 58e289ebaed9..000000000000
--- a/profiles/default-linux/amd64/2005.1/profile.bashrc
+++ /dev/null
@@ -1,22 +0,0 @@
-# The version of profile in our 'packages' does not yet set ABI for us nor
-# export the CFLAGS_${ABI} envvars...
-
-if [[ -n "${ABI}" ]]; then
- export ABI
-elif [[ -n "${DEFAULT_ABI}" ]]; then
- export ABI="${DEFAULT_ABI}"
-else
- export ABI="amd64"
-fi
-
-#export CFLAGS_amd64
-export CFLAGS_x86
-
-# Make sure they updated to 2005.0 properly
-if [[ (-L /lib32 || -L /usr/lib32 ) && ( ${PORTAGE_CALLER} != "repoman" ) ]] ; then
- eerror "It appears you have switched to the 2005.1 profile without following"
- eerror "the upgrade guide. Please upgrade to 2005.0 first. See the following"
- eerror "URL for more information:"
- eerror "http://www.gentoo.org/proj/en/base/amd64/howtos/2005.0-upgrade-amd64.xml"
- exit 1
-fi
diff --git a/profiles/default-linux/amd64/2005.1/use.mask b/profiles/default-linux/amd64/2005.1/use.mask
deleted file mode 100644
index 7cee46f10b5f..000000000000
--- a/profiles/default-linux/amd64/2005.1/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/use.mask,v 1.1 2005/06/04 21:20:09 eradicator Exp $
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# multilib is forced on when we have ${MULTILIB_ABIS} defined
-multilib
diff --git a/profiles/default-linux/amd64/2005.1/vserver/package.mask b/profiles/default-linux/amd64/2005.1/vserver/package.mask
deleted file mode 100644
index 6d0094375eaf..000000000000
--- a/profiles/default-linux/amd64/2005.1/vserver/package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/vserver/package.mask,v 1.1 2005/11/12 13:32:24 hollow Exp $
-
-# Benedikt Boehm <hollow@gentoo.org>
-# Mask baselayout in vservers. Use baselayout-vserver instead!
-sys-apps/baselayout
diff --git a/profiles/default-linux/amd64/2005.1/vserver/packages b/profiles/default-linux/amd64/2005.1/vserver/packages
deleted file mode 100644
index 59bd53bd4ff2..000000000000
--- a/profiles/default-linux/amd64/2005.1/vserver/packages
+++ /dev/null
@@ -1,15 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/vserver/packages,v 1.3 2005/11/27 07:17:53 hollow Exp $
-
-# we need baselayout-vserver instead of baselayout
--*>=sys-apps/baselayout-1.9.4-r7
--*sys-apps/baselayout
-*sys-apps/baselayout-vserver
-
-# we don't want those by default
--*sys-apps/busybox
--*sys-apps/hdparm
--*sys-apps/kbd
--*sys-fs/e2fsprogs
--*virtual/dev-manager
--*virtual/modutils
--*virtual/ssh
diff --git a/profiles/default-linux/amd64/2005.1/vserver/parent b/profiles/default-linux/amd64/2005.1/vserver/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default-linux/amd64/2005.1/vserver/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default-linux/amd64/2005.1/vserver/virtuals b/profiles/default-linux/amd64/2005.1/vserver/virtuals
deleted file mode 100644
index 7f2f916dda11..000000000000
--- a/profiles/default-linux/amd64/2005.1/vserver/virtuals
+++ /dev/null
@@ -1,6 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/vserver/virtuals,v 1.2 2006/02/21 19:10:54 hollow Exp $
-
-virtual/baselayout sys-apps/baselayout-vserver
-
-# see bug #105616 why this is in here
-virtual/dev-manager sys-apps/baselayout-vserver
diff --git a/profiles/default-linux/amd64/ChangeLog b/profiles/default-linux/amd64/ChangeLog
index 778b322f3917..be2f4bf30c1a 100644
--- a/profiles/default-linux/amd64/ChangeLog
+++ b/profiles/default-linux/amd64/ChangeLog
@@ -1,6 +1,22 @@
# ChangeLog for Gentoo/AMD64 profile directory
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.49 2007/01/06 19:33:46 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.50 2007/01/07 03:58:34 blubb Exp $
+
+ 07 Jan 2007; <blubb@gentoo.org> -2005.0/README, -2005.0/deprecated,
+ -2005.0/make.defaults, -2005.0/no-multilib/make.defaults,
+ -2005.0/no-multilib/package.mask, -2005.0/no-multilib/package.use.mask,
+ -2005.0/no-multilib/parent, -2005.0/no-multilib/use.mask,
+ -2005.0/package.mask, -2005.0/packages, -2005.0/parent,
+ -2005.0/profile.bashrc, -2005.0/use.mask,
+ -2005.0/scripts/2004.3-2005.0upgrade.sh, -2005.1/deprecated,
+ -2005.1/make.defaults, -2005.1/no-multilib/make.defaults,
+ -2005.1/no-multilib/package.mask, -2005.1/no-multilib/package.use.mask,
+ -2005.1/no-multilib/parent, -2005.1/no-multilib/use.mask,
+ -2005.1/package.mask, -2005.1/packages, -2005.1/parent,
+ -2005.1/profile.bashrc, -2005.1/use.mask, -2005.1/vserver/package.mask,
+ -2005.1/vserver/packages, -2005.1/vserver/parent,
+ -2005.1/vserver/virtuals:
+ remove 2005.x profiles
06 Jan 2007; Steve Dibb <beandog@gentoo.org> package.use.mask:
Add -real to mplayer, adding native 64 bit realplayer support with amd64codecs