summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/default-linux/amd64/2005.0/make.defaults29
-rw-r--r--profiles/default-linux/amd64/2005.1/make.defaults29
-rw-r--r--profiles/default-linux/amd64/2006.0/make.defaults29
-rw-r--r--profiles/default-linux/amd64/2006.1/deprecated7
-rw-r--r--profiles/default-linux/amd64/2006.1/desktop/make.defaults11
-rw-r--r--profiles/default-linux/amd64/2006.1/desktop/parent1
-rw-r--r--profiles/default-linux/amd64/2006.1/desktop/virtuals5
-rw-r--r--profiles/default-linux/amd64/2006.1/make.defaults21
-rw-r--r--profiles/default-linux/amd64/2006.1/no-multilib/make.defaults5
-rw-r--r--profiles/default-linux/amd64/2006.1/no-multilib/package.mask160
-rw-r--r--profiles/default-linux/amd64/2006.1/no-multilib/parent1
-rw-r--r--profiles/default-linux/amd64/2006.1/no-multilib/use.mask13
-rw-r--r--profiles/default-linux/amd64/2006.1/packages17
-rw-r--r--profiles/default-linux/amd64/2006.1/parent1
-rw-r--r--profiles/default-linux/amd64/2006.1/server/make.defaults5
-rw-r--r--profiles/default-linux/amd64/2006.1/server/parent1
-rw-r--r--profiles/default-linux/amd64/ChangeLog18
-rw-r--r--profiles/default-linux/amd64/make.defaults35
-rw-r--r--profiles/default-linux/amd64/parent2
-rw-r--r--profiles/default-linux/amd64/use.mask63
20 files changed, 334 insertions, 119 deletions
diff --git a/profiles/default-linux/amd64/2005.0/make.defaults b/profiles/default-linux/amd64/2005.0/make.defaults
index d18ea585edbf..c0e9bb0a03ec 100644
--- a/profiles/default-linux/amd64/2005.0/make.defaults
+++ b/profiles/default-linux/amd64/2005.0/make.defaults
@@ -1,6 +1,6 @@
# 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.21 2006/04/09 13:18:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/make.defaults,v 1.22 2006/06/09 15:12:46 kugelfang Exp $
#removed because managers vote requires us to do so
#("when we go nptl, we all go nptl")
@@ -11,29 +11,4 @@
# that point.
FEATURES="sandbox autoconfig -multilib-pkg"
-MULTILIB_ABIS="x86 amd64"
-DEFAULT_ABI="amd64"
-
-#CFLAGS_amd64="-m64"
-#CXXFLAGS_amd64="${CFLAGS_amd64}"
-#LDFLAGS_amd64="-m elf_x86_64"
-CHOST_amd64="x86_64-pc-linux-gnu"
-CDEFINE_amd64="__x86_64__"
-LIBDIR_amd64="lib64"
-
-# Added -L/emul* workaround to aid compilation of 32bit packages
-# See bug #88725 for more info - Herbie Hopkins <herbs@gentoo.org> 2005/04/19
-CFLAGS_x86="-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
-CXXFLAGS_x86="${CXXFLAGS_amd64}"
-LDFLAGS_x86="-m elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
-CHOST_x86="i686-pc-linux-gnu"
-CDEFINE_x86="__i386__"
-LIBDIR_x86="lib32"
-
-# In case someone wants to help out by setting FEATURES="multilib-strict"
-MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
-MULTILIB_STRICT_DENY="64-bit.*shared object"
-MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|eclipse-3|debug|portage)"
-
-# Hack to tell baselayout to use symlinks for /lib, /usr/lib, and /usr/local/lib
-SYMLINK_LIB="yes"
+USE="alsa avi 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 pdflib perl png python qt quicktime readline sdl spell ssl tcpd tiff usb zlib X xpm xv zlib -java"
diff --git a/profiles/default-linux/amd64/2005.1/make.defaults b/profiles/default-linux/amd64/2005.1/make.defaults
index 1bec7b6036d3..c34d7b030d9f 100644
--- a/profiles/default-linux/amd64/2005.1/make.defaults
+++ b/profiles/default-linux/amd64/2005.1/make.defaults
@@ -1,6 +1,6 @@
# 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.7 2006/04/09 13:18:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/make.defaults,v 1.8 2006/06/09 15:12:46 kugelfang Exp $
#removed because managers vote requires us to do so
#("when we go nptl, we all go nptl")
@@ -11,29 +11,4 @@
# that point.
FEATURES="sandbox autoconfig -multilib-pkg"
-MULTILIB_ABIS="x86 amd64"
-DEFAULT_ABI="amd64"
-
-#CFLAGS_amd64="-m64"
-#CXXFLAGS_amd64="${CXXFLAGS_amd64}"
-#LDFLAGS_amd64="-m elf_x86_64"
-CHOST_amd64="x86_64-pc-linux-gnu"
-CDEFINE_amd64="__x86_64__"
-LIBDIR_amd64="lib64"
-
-# Added -L/emul* workaround to aid compilation of 32bit packages
-# See bug #88725 for more info - Herbie Hopkins <herbs@gentoo.org> 2005/04/19
-CFLAGS_x86="-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
-CXXFLAGS_x86="${CXXFLAGS_amd64}"
-LDFLAGS_x86="-m elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
-CHOST_x86="i686-pc-linux-gnu"
-CDEFINE_x86="__i386__"
-LIBDIR_x86="lib32"
-
-# In case someone wants to help out by setting FEATURES="multilib-strict"
-MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
-MULTILIB_STRICT_DENY="64-bit.*shared object"
-MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|eclipse-3|debug|portage)"
-
-# Hack to tell baselayout to use symlinks for /lib, /usr/lib, and /usr/local/lib
-SYMLINK_LIB="yes"
+USE="alsa avi 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 pdflib perl png python qt quicktime readline sdl spell ssl tcpd tiff usb zlib X xpm xv zlib -java"
diff --git a/profiles/default-linux/amd64/2006.0/make.defaults b/profiles/default-linux/amd64/2006.0/make.defaults
index 11e972af9e81..50187d2e4bac 100644
--- a/profiles/default-linux/amd64/2006.0/make.defaults
+++ b/profiles/default-linux/amd64/2006.0/make.defaults
@@ -1,36 +1,15 @@
# 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/2006.0/make.defaults,v 1.16 2006/06/02 00:56:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/make.defaults,v 1.17 2006/06/09 15:12:46 kugelfang Exp $
FEATURES="sandbox autoconfig"
-MULTILIB_ABIS="x86 amd64"
-DEFAULT_ABI="amd64"
-ABI=${DEFAULT_ABI}
-
-#CFLAGS_amd64="-m64"
-#CXXFLAGS_amd64="${CXXFLAGS_amd64}"
-#LDFLAGS_amd64="-m elf_x86_64"
-CHOST_amd64="x86_64-pc-linux-gnu"
-CDEFINE_amd64="__x86_64__"
-LIBDIR_amd64="lib64"
-
-# Added -L/emul* workaround to aid compilation of 32bit packages
-# See bug #88725 for more info - Herbie Hopkins <herbs@gentoo.org> 2005/04/19
-CFLAGS_x86="-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
-CXXFLAGS_x86="${CXXFLAGS_amd64}"
-LDFLAGS_x86="-m elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
-CHOST_x86="i686-pc-linux-gnu"
-CDEFINE_x86="__i386__"
-LIBDIR_x86="lib32"
-
-# In case someone wants to help out by setting FEATURES="multilib-strict"
-MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
-MULTILIB_STRICT_DENY="64-bit.*shared object"
-MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage)"
+ABI=amd64
# Hack to tell baselayout to use symlinks for /lib, /usr/lib, and /usr/local/lib
SYMLINK_LIB="yes"
# Switch to nptl, but no nptlonly yet.
USE="nptl -nptlonly"
+
+USE="alsa avi 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 pdflib perl png python qt quicktime readline sdl spell ssl tcpd tiff usb zlib X xpm xv zlib -java"
diff --git a/profiles/default-linux/amd64/2006.1/deprecated b/profiles/default-linux/amd64/2006.1/deprecated
new file mode 100644
index 000000000000..229c66930667
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.1/deprecated
@@ -0,0 +1,7 @@
+This is the Gentoo/AMD64 development profile not intended for end-users.
+
+If you still want to use this: We don't care if it breaks your system,
+expect this to change whenever we feel like it with absolutely no warning,
+including changing to be unusable.
+
+2006/06/07 - Danny van Dyk <kugelfang@gentoo.org>
diff --git a/profiles/default-linux/amd64/2006.1/desktop/make.defaults b/profiles/default-linux/amd64/2006.1/desktop/make.defaults
new file mode 100644
index 000000000000..7137471fae12
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.1/desktop/make.defaults
@@ -0,0 +1,11 @@
+# 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/2006.1/desktop/make.defaults,v 1.1 2006/06/09 15:12:46 kugelfang Exp $
+
+# This will be commented and replaced with just STAGE1_USE="unicode" if we do
+# not end up with a stable glibc 2.4 by 2006.1's release.
+STAGE1_USE="nptl nptlonly unicode"
+
+USE="alsa arts avi cairo cdr dbus dvd dvdr eds emboss encode esd fam gif gnome gpm gstreamer gtk gtk2 hal jpeg kde ldap mad mikmod mp3 mpeg ogg opengl oss pdflib png qt quicktime sdl spell truetype vorbis win32codecs unicode X xml xv"
+# Possible flags for removal (gentoo-dev mailing list)
+USE="${USE} apm imlib motif xmms"
diff --git a/profiles/default-linux/amd64/2006.1/desktop/parent b/profiles/default-linux/amd64/2006.1/desktop/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.1/desktop/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/amd64/2006.1/desktop/virtuals b/profiles/default-linux/amd64/2006.1/desktop/virtuals
new file mode 100644
index 000000000000..5a1bcb96afe9
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.1/desktop/virtuals
@@ -0,0 +1,5 @@
+# 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/2006.1/desktop/virtuals,v 1.1 2006/06/09 15:12:46 kugelfang Exp $
+
+virtual/fam app-admin/gamin
diff --git a/profiles/default-linux/amd64/2006.1/make.defaults b/profiles/default-linux/amd64/2006.1/make.defaults
new file mode 100644
index 000000000000..c061835c91a8
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.1/make.defaults
@@ -0,0 +1,21 @@
+# 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/2006.1/make.defaults,v 1.1 2006/06/09 15:12:46 kugelfang Exp $
+
+ABI=amd64
+
+# Catalyst specific settings:
+# This will be commented and replaced with just STAGE1_USE="unicode" if we do
+# not end up with a stable glibc 2.4 by 2006.1's release.
+STAGE1_USE="nptl nptlonly unicode"
+
+# General 2006.1 profile settings
+# These USE flags are what is common between the various sub-profiles.
+USE="cups gdbm gpm libg++ nptl nptlonly udev"
+# Possibly removed in the future.
+USE="${USE} foomaticdb"
+# Possibly added in the future
+#USE="${USE} ppds"
+
+# By default, we enable keyboard and mouse support for the modular X.Org server.
+INPUT_DEVICES="mouse keyboard"
diff --git a/profiles/default-linux/amd64/2006.1/no-multilib/make.defaults b/profiles/default-linux/amd64/2006.1/no-multilib/make.defaults
new file mode 100644
index 000000000000..185be114c39e
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.1/no-multilib/make.defaults
@@ -0,0 +1,5 @@
+# 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/2006.1/no-multilib/make.defaults,v 1.1 2006/06/09 15:12:46 kugelfang Exp $
+
+MULTILIB_ABIS="amd64"
diff --git a/profiles/default-linux/amd64/2006.1/no-multilib/package.mask b/profiles/default-linux/amd64/2006.1/no-multilib/package.mask
new file mode 100644
index 000000000000..c7e7625e318c
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.1/no-multilib/package.mask
@@ -0,0 +1,160 @@
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.1/no-multilib/package.mask,v 1.1 2006/06/09 15:12:46 kugelfang 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-player
+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-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
+games-action/descent3
+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-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-hellcampaign
+games-fps/doom3-inhell
+games-fps/doom3-lms
+games-fps/doom3-opencoop
+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-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/ut2003
+games-fps/ut2003-demo
+games-fps/ut2004-demo
+games-fps/vendetta-online-bin
+games-puzzle/hoh-bin
+games-roguelike/adom
+games-rpg/nwn
+games-rpg/nwn-cep
+games-server/nwn-ded
+games-server/ut2003-ded
+games-simulation/simutrans
+games-strategy/coldwar-demo
+games-strategy/darwinia
+games-strategy/darwinia-demo
+games-strategy/dominions2
+games-strategy/majesty-demo
+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
+sci-biology/foldingathome
+sys-apps/memtest86
+sys-apps/memtest86+
+sys-boot/grub
+sys-libs/lib-compat-loki
+www-client/opera
+www-client/mozilla-bin
+www-client/mozilla-firefox-bin
+x11-misc/qcomicbook
diff --git a/profiles/default-linux/amd64/2006.1/no-multilib/parent b/profiles/default-linux/amd64/2006.1/no-multilib/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.1/no-multilib/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/amd64/2006.1/no-multilib/use.mask b/profiles/default-linux/amd64/2006.1/no-multilib/use.mask
new file mode 100644
index 000000000000..a03eaebc038a
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.1/no-multilib/use.mask
@@ -0,0 +1,13 @@
+# USE flags masked because providing packages have ABI=x86
+
+# 2006/06/04 Stuart Herbert <stuart@gentoo.org>
+# net-misc/nxclient is x86 only
+nxclient
+
+# 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/2006.1/packages b/profiles/default-linux/amd64/2006.1/packages
new file mode 100644
index 000000000000..125ecf750cdf
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.1/packages
@@ -0,0 +1,17 @@
+# Copyright 2001-2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.1/packages,v 1.1 2006/06/09 15:12:46 kugelfang Exp $
+
+# For instructions on how this file works (as an inclusion mask, primarily),
+# please refer to ${PORTDIR}/profiles/base/packages
+
+# Use this file to lock down specific versions of packages ONLY TO THIS
+# SPECIFIC PROFILE!
+
+# You can also add files to the base system itself if you prefix them with a
+# *
+
+>=sys-apps/baselayout-1.11.12-r4
+>=sys-devel/binutils-2.15.90.0.3-r4
+>=sys-devel/gcc-3.3.4-r1
+>=sys-libs/glibc-2.3.3.20040420-r1
diff --git a/profiles/default-linux/amd64/2006.1/parent b/profiles/default-linux/amd64/2006.1/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.1/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/amd64/2006.1/server/make.defaults b/profiles/default-linux/amd64/2006.1/server/make.defaults
new file mode 100644
index 000000000000..b896727970f2
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.1/server/make.defaults
@@ -0,0 +1,5 @@
+# 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/2006.1/server/make.defaults,v 1.1 2006/06/09 15:12:47 kugelfang Exp $
+
+USE="apache2 ldap mailwrapper mysql snmp truetype xml"
diff --git a/profiles/default-linux/amd64/2006.1/server/parent b/profiles/default-linux/amd64/2006.1/server/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/amd64/2006.1/server/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/amd64/ChangeLog b/profiles/default-linux/amd64/ChangeLog
new file mode 100644
index 000000000000..e8f03f7974d9
--- /dev/null
+++ b/profiles/default-linux/amd64/ChangeLog
@@ -0,0 +1,18 @@
+# ChangeLog for Gentoo/AMD64 profile directory
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.1 2006/06/09 15:12:46 kugelfang Exp $
+
+*2006.1
+
+ 07 Jun 2006; Danny van Dyk <kugelfang@gentoo.org> 2005.0/make.defaults,
+ 2005.1/make.defaults, 2006.0/make.defaults, +2006.1/deprecated,
+ +2006.1/desktop/make.defaults, +2006.1/desktop/parent,
+ +2006.1/desktop/virtuals, +2006.1/make.defaults,
+ +2006.1/no-multilib/make.defaults, +2006.1/no-multilib/package.mask,
+ +2006.1/no-multilib/parent, +2006.1/no-multilib/use.mask,
+ +2006.1/packages, +2006.1/parent, +2006.1/server/make.defaults,
+ +2006.1/server/parent, make.defaults, parent, use.mask:
+ Initial ChangeLog. Added 2006.1 profile including subprofiles desktop and
+ server. All future changes to default-linux/amd64 must be logged here.
+ Cleaned up whole profile directory.
+
diff --git a/profiles/default-linux/amd64/make.defaults b/profiles/default-linux/amd64/make.defaults
index 7c76af3bbcc7..a18510f45c6f 100644
--- a/profiles/default-linux/amd64/make.defaults
+++ b/profiles/default-linux/amd64/make.defaults
@@ -1,14 +1,39 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/make.defaults,v 1.14 2006/05/18 14:22:12 wolf31o2 Exp $
-
-# Default USE flags for amd64 (Systems and GRP)
-USE="alsa avi 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 pdflib perl png python qt quicktime readline sdl spell ssl tcpd tiff usb zlib X xpm xv zlib -java"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/make.defaults,v 1.15 2006/06/09 15:12:46 kugelfang Exp $
ARCH="amd64"
ACCEPT_KEYWORDS="${ARCH}"
CHOST="x86_64-pc-linux-gnu"
-
CFLAGS="-O2 -pipe"
CXXFLAGS="${CFLAGS}"
+
+FEATURES="sandbox sfperms"
+
+USE="berkdb crypt ipv6 ncurses nls pam perl python readline ssl tcpd zlib"
+
+# 2006/06/07 - Danny van Dyk <kugelfang@gentoo.org>
+# Multilib settings for all amd64 subprofiles.
+MULTILIB_ABIS="amd64 x86"
+DEFAULT_ABI="amd64"
+
+# 64bit specific settings.
+CHOST_amd64="x86_64-pc-linux-gnu"
+CDEFINE_amd64="__x86_64__"
+LIBDIR_amd64="lib64"
+
+# 32bit specific settings.
+CFLAGS_x86="-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
+LDFLAGS_x86="-m elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
+CHOST_x86="i686-pc-linux-gnu"
+CDEFINE_x86="__i386__"
+LIBDIR_x86="lib32"
+
+# FEATURES="multilib-strict" specific settings.
+MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
+MULTILIB_STRICT_DENY="64-bit.*shared object"
+MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage)"
+
+# Let sys-apps/baselayout create the lib symlink.
+SYMLINK_LIB="yes"
diff --git a/profiles/default-linux/amd64/parent b/profiles/default-linux/amd64/parent
index f3229c5b9876..8b137891791f 100644
--- a/profiles/default-linux/amd64/parent
+++ b/profiles/default-linux/amd64/parent
@@ -1 +1 @@
-..
+
diff --git a/profiles/default-linux/amd64/use.mask b/profiles/default-linux/amd64/use.mask
index 5e0a6a4041a6..186237562560 100644
--- a/profiles/default-linux/amd64/use.mask
+++ b/profiles/default-linux/amd64/use.mask
@@ -1,18 +1,12 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/use.mask,v 1.34 2006/04/13 18:54:55 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/use.mask,v 1.35 2006/06/09 15:12:46 kugelfang Exp $
-# UNKNOWN - SECTION
+# SECTION: Unmask
-afs
-drac
-
-# UNMASK - SECTION
-
-# media-libs/libemf only works by luck (see bug #127328)
-# this flag makes media-gfx/inkscape dep on media-gfx/pstoedit
-# which deps on libemf
-plugin
+# 2006/06/07 - Danny van Dyk <kugelfang@gentoo.org>
+# Profile cleanup: Unmask emul-linux-x86
+-emul-linux-x86
# 2005/09/14 - Diego Pettenò <flameeyes@gentoo.org>
# nVidia XvMC support works on amd64
@@ -26,13 +20,6 @@ plugin
# codec support x264
-x264
-# 2006/02/05 - Donnie Berkholz <spyderous@gentoo.org>
-# Modular X: mask for architectures on which they aren't available
-video_cards_i740
-video_cards_imstt
-video_cards_newport
-video_cards_nsc
-
# 2006/01/28 - Donnie Berkholz <spyderous@gentoo.org>
# Modular X: unmask for architectures on which they are available
-input_devices_synaptics
@@ -42,16 +29,29 @@ video_cards_nsc
-video_cards_fglrx
-video_cards_vmware
-# WON'T WORK - SECTION
+# SECTION: Unavailable/Broken
+# 2006/06/07 - Danny van Dyk <kugelfang@gentoo.org>
+# Profile cleanup: No info about these
+afs
asm
+drac
+multitarget
+tcc
+vidix
-# 2005/06/04 - Simon Stelling <blubb@gentoo.org>
-# dev-util/xdelta doesn't work as expected by this use flag, it can only use
-# xdelta-files made on a 64bit system
-kdexdeltas
+# 2006/06/07 - Danny van Dyk <kugelfang@gentoo.org>
+# Masked due to bug #127328; prohibits DEPENDs on
+# this flag makes media-gfx/inkscape dep on media-gfx/pstoedit
+# which deps on libemf
+plugin
-# WON'T BUILD - SECTION
+# 2006/02/05 - Donnie Berkholz <spyderous@gentoo.org>
+# Modular X: mask for architectures on which they aren't available
+video_cards_i740
+video_cards_imstt
+video_cards_newport
+video_cards_nsc
# 2005/09/19 - Olivier Fisette <ribosome@gentoo.org>
# cmucl is not available on amd64. Masking to keep "sci-mathematics/maxima"
@@ -62,6 +62,11 @@ cmucl
# sci-libs/cdf doesn't build
cdf
+# 2005/06/04 - Simon Stelling <blubb@gentoo.org>
+# dev-util/xdelta doesn't work as expected by this use flag, it can only use
+# xdelta-files made on a 64bit system
+kdexdeltas
+
# 2004/11/13 - Tom Martin <slarti@gentoo.org>
# dev-libs/mzscheme won't build, #65216
mzscheme
@@ -121,14 +126,4 @@ solid
sybase
sybase-ct
-# dev-lang/tcc won't build
-tcc
-# gcc doesn't build if we have a multitarget binutils
-multitarget
-
-# Unmask emul-linux-x86
--emul-linux-x86
-
-# Vidix support doesn't work on amd64 for now.
-vidix