move a bunch of gcc34-2004.2 entries to the amd64 root profile

8 files changed, 296 insertions, 161 deletions

diff --git a/profiles/default-linux/amd64/gcc34-2004.2/parent b/profiles/default-linux/amd64/gcc34-2004.2/parent
new file mode 100644
index 000000000000..74853ef4eaaf
--- /dev/null
+++ b/profiles/default-linux/amd64/gcc34-2004.2/parent
@@ -0,0 +1,8 @@
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /home/cvsroot/gentoo-x86/profiles/default/x86/2004.0/parent,v 1.2
+# 2004/03/18 00:16:43 seemant Exp $
+
+# This file describes the parent profile to this.  In most cases this will
+# just be the name of the parent directory
+..
diff --git a/profiles/default-linux/amd64/gcc34-2004.2/use.mask b/profiles/default-linux/amd64/gcc34-2004.2/use.mask
deleted file mode 100644
index 507a8d081c9a..000000000000
--- a/profiles/default-linux/amd64/gcc34-2004.2/use.mask
+++ /dev/null
@@ -1,87 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/gcc34-2004.2/use.mask,v 1.3 2004/09/01 20:25:25 lv Exp $
-
-#unknowns
-afs
-drac
-
-# WON'T BUILD - SECTION
-
-# 2004/06/22 - Taken from 2004.0 profile
-# Anything that relies on vm86.h will not built on amd64
-# SVGAlib doesnt build
-svga
-
-# 2004/06/22 - Taken from 2004.0 profile
-# Firebird doesnt build on amd64
-firebird
-
-# 2004/06/22 - Taken from 2004.0 profile
-# x86 binary only, used by php
-fdftk
-
-# 2004/06/22 - Danny van Dyk <kugelfang@gentoo.org>
-# version in portage does not work on amd64 yet
-uclibc
-
-# 2004/06/22 - Taken from 2004.0 profile
-# versions that are in portage do not support amd64,
-# will be removed when Intel issues an update and it gets into portage
-# (it seems to be in the works)
-icc
-ifc
-
-# 2004/06/22 - Taken from 2004.0 profile
-# masked
-3dfx
-
-# 2004/07/22 - Danny van Dyk <kugelfang@gentoo.org>
-# libcaca part of libSDL causes breakage due to missing shared object.
-# BUG #53857
-libcaca
-
-# NOT NECESSARY - SECTION
-
-# 2004/06/22 - Taken from 2004.0 profile
-# Too many packages assume that mmx/sse/sse2/3dnow are 86-32 only things to
-# make them useful on amd64. Anyway, all amd64 cpus have them, so they should
-# not be many flag dependant in this case
-mmx
-mmx2
-sse
-sse2
-3dnow
-
-# 2004/06/22 - Taken from 2004.0 profile
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
-
-# 2004/06/25 - Danny van Dyk <kugelfang@gentoo.org>
-# Known BUGs (#54760) + lack of brain/man power to maintain "hardened" in the
-# default profile. Use the hardened profile instead.
-hardened
-uclibc
-
-# altivec is a ppc instruction set.
-altivec
-
-# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
-# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
-# all of these are binary-only, and not presently available on this
-# architecture.
-adabas
-birdstep
-cpdflib
-dbmaker
-empress
-empress-bcs
-esoob
-filepro
-frontbase
-hyperwave
-informix
-ingres
-pfpro
-solid
-sybase
-sybase-ct
diff --git a/profiles/default-linux/amd64/gcc34-2004.2/virtuals b/profiles/default-linux/amd64/gcc34-2004.2/virtuals
deleted file mode 100644
index 4504b591518d..000000000000
--- a/profiles/default-linux/amd64/gcc34-2004.2/virtuals
+++ /dev/null
@@ -1,67 +0,0 @@
-sys-apps/sh-utils	sys-apps/coreutils
-sys-apps/textutils	sys-apps/coreutils
-sys-apps/fileutils	sys-apps/coreutils
-virtual/os-headers	sys-kernel/linux26-headers
-virtual/lpr             net-print/cups
-virtual/python          dev-lang/python
-virtual/mta             mail-mta/ssmtp
-virtual/alsa            sys-kernel/gentoo-dev-sources
-virtual/kernel          sys-kernel/linux26-headers
-virtual/linux-sources   sys-kernel/gentoo-dev-sources
-virtual/glibc           sys-libs/glibc
-virtual/libc           sys-libs/glibc
-virtual/x11             x11-base/xorg-x11
-virtual/opengl          x11-base/xorg-x11
-virtual/glu             x11-base/xorg-x11
-virtual/glut            media-libs/glut
-virtual/imapUW          net-mail/uw-imap
-x11-libs/xaw            x11-libs/Xaw3d
-virtual/jdk             dev-java/blackdown-jdk
-virtual/jre             dev-java/blackdown-jre
-virtual/imapd           net-mail/courier-imap
-virtual/blackbox        x11-wm/blackbox
-virtual/emacs           app-editors/emacs
-virtual/cron            sys-apps/dcron
-sys-apps/reiserfs-utils sys-fs/reiserfsprogs
-virtual/xemacs          app-editors/xemacs
-virtual/sylpheed        mail-client/sylpheed
-virtual/php             dev-php/mod_php
-virtual/httpd-php				dev-php/mod_php
-virtual/textbrowser	net-www/links
-virtual/mda		mail-filter/procmail
-virtual/xft		x11-base/xorg-x11
-virtual/krb5		app-crypt/mit-krb5
-virtual/bootloader	sys-boot/grub-static
-virtual/editor		app-editors/nano
-virtual/jack		media-sound/jack-audio-connection-kit
-virtual/quicktime	media-libs/libquicktime
-virtual/os-headers	sys-kernel/linux26-headers
-virtual/ghc             dev-lang/ghc-bin
-#sys-apps/modutils	sys-apps/module-init-tools
-#virtual/modutils	sys-apps/module-init-tools
-virtual/modutils	sys-apps/module-init-tools
-virtual/inetd		sys-apps/xinetd
-virtual/antivirus	app-antivirus/clamav
-virtual/aspell-dict	app-dicts/aspell-en
-virtual/skkserv		app-i18n/skkserv
-virtual/snmp		net-analyzer/net-snmp
-virtual/winkernel	sys-kernel/win4lin-sources
-virtual/flim		app-emacs/flim
-virtual/semi		app-emacs/semi
-virtual/tetex		app-text/tetex
-virtual/bittorrent	net-p2p/bittorrent
-virtual/logger		app-admin/sysklogd
-virtual/tftp		net-misc/tftp-hpa
-virtual/gzip		app-arch/gzip
-virtual/ghostscript	app-text/ghostscript
-virtual/imap-c-client	net-libs/c-client
-virtual/mpg123		media-sound/mpg321
-virtual/cdrtools        app-cdr/cdrtools
-virtual/dhcpc		net-misc/dhcpcd
-virtual/ssh		net-misc/openssh
-virtual/dev-manager	sys-fs/devfsd
-virtual/blas		app-sci/blas-atlas
-virtual/lapack		app-sci/lapack-atlas
-virtual/gsasl		net-libs/libgsasl
-virtual/mailx		mail-client/mailx
-virtual/ruby		dev-lang/ruby
diff --git a/profiles/default-linux/amd64/packages b/profiles/default-linux/amd64/packages
index 881681a913df..590764db83b8 100644
--- a/profiles/default-linux/amd64/packages
+++ b/profiles/default-linux/amd64/packages
@@ -1,4 +1,63 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/packages,v 1.2 2004/06/26 23:29:25 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/packages,v 1.3 2004/09/09 03:08:37 lv Exp $
+
+
+*virtual/modutils
+*dev-lang/python
+*app-shells/sash
+*dev-lang/perl
+*virtual/editor
+*net-misc/dhcpcd
+*net-misc/iputils
+*net-misc/rsync
+*net-misc/wget
+*app-shells/bash
+*app-arch/bzip2
+*sys-apps/kbd
+*app-arch/cpio
+*sys-apps/debianutils
+*sys-apps/diffutils
+*sys-fs/e2fsprogs
+*sys-apps/ed
+*sys-apps/file
+*sys-apps/findutils
+*sys-apps/gawk
+*sys-apps/grep
+*sys-apps/groff
+*app-arch/gzip
+*sys-apps/hdparm
+*sys-apps/less
+*sys-apps/man
+*sys-apps/man-pages
+*sys-apps/net-tools
+*sys-apps/procps
+*sys-apps/psmisc
+*sys-apps/sed
+*sys-apps/setserial
+*sys-apps/pam-login
+*app-arch/tar
+*>=sys-apps/texinfo-4.5
+*sys-apps/coreutils
+*sys-apps/util-linux
+*sys-apps/which
+*sys-devel/autoconf
+*>=sys-devel/automake-1.8.3
+*sys-devel/bc
+*sys-devel/bison
+*sys-devel/flex
+*>=sys-devel/libtool-1.4.1-r4
+*sys-devel/m4
+*sys-devel/make
+*sys-devel/patch
+*sys-libs/cracklib  
+*sys-libs/db
+*>=sys-libs/ncurses-5.4
+*>=sys-libs/pam-0.77
+*sys-libs/pwdb      
+*sys-libs/readline  
+*sys-libs/zlib
+*net-misc/openssh
+*virtual/dev-manager
+*sys-apps/linux32
 
diff --git a/profiles/default-linux/amd64/profile.bashrc b/profiles/default-linux/amd64/profile.bashrc
new file mode 100644
index 000000000000..61a4f7cec841
--- /dev/null
+++ b/profiles/default-linux/amd64/profile.bashrc
@@ -0,0 +1,29 @@
+# fix for bug 60147, "configure causes sandbox violations when lib64
+# is a directory". currently only works with cvs portage.
+#SANDBOX_WRITE="${SANDBOX_WRITE}:/usr/lib64/conftest:/usr/lib64/cf"
+addwrite /usr/lib64/conftest
+addwrite /usr/lib64/cf
+
+setup_multilib_variables() {
+	# if run via linux32, uname -m will always return i686
+	if [ "$(uname -m)" == "i686" ] ; then
+		CONF_LIBDIR="${CONF_MULTILIBDIR:=lib32}"
+		CHOST="${CHOST32:=i686-pc-linux-gnu}"
+
+		if [ -x /usr/bin/${CC32:=gcc32} ] ; then
+			CC="${CC32:=gcc32}"
+			CPP="${CPP32:=g++32}"
+		else
+			CFLAGS="${CFLAGS} -m32"
+			CXXFLAGS="${CXXFLAGS} -m32"
+		fi
+	else
+		# this isnt needed for profiles that set CONF_LIBDIR, but it
+		# doesnt hurt to be safe.
+		CONF_LIBDIR="${CONF_LIBDIR:=lib64}"
+	fi
+
+	export CONF_LIBDIR
+}
+
+[ "${CCHOST}" == "" -o "${CCHOST}" == "${CHOST}" -o "${CCHOST}" == "${CHOST32}" ] && setup_multilib_variables
diff --git a/profiles/default-linux/amd64/use.defaults b/profiles/default-linux/amd64/use.defaults
index 9ae151783444..7cfcd7163520 100644
--- a/profiles/default-linux/amd64/use.defaults
+++ b/profiles/default-linux/amd64/use.defaults
@@ -1,5 +1,49 @@
-# 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.defaults,v 1.4 2004/09/08 18:29:29 seemant Exp $
+aalib		media-libs/aalib	
+alsa		media-libs/alsa-lib
+arts		kde-base/arts
+berkdb		sys-libs/db
 bitmap-fonts
+bonobo		gnome-base/bonobo
+cdr		app-cdr/cdrtools
+directfb	dev-libs/DirectFB
+esd		media-sound/esound
+gdbm		sys-libs/gdbm
+ggi		media-libs/libggi
+gnome		gnome-base/gnome
+gphoto2		media-gfx/gphoto2
+gpm		sys-libs/gpm
+gtkhtml		gnome-extra/gtkhtml
+gtk		x11-libs/gtk+
+gtk2		>=x11-libs/gtk+-2
+guile		dev-util/guile
+imlib		media-libs/imlib
+java		virtual/jre
+kde		kde-base/kdebase
+ldap		net-nds/openldap
+libwww		net-libs/libwww
+motif		x11-libs/openmotif
+mozilla		net-www/mozilla
+mysql		dev-db/mysql
+nas		media-libs/nas
+oggvorbis	media-libs/libvorbis
+opengl		virtual/opengl
+pam		sys-libs/pam
+perl		dev-lang/perl
+postgres	dev-db/postgresql
+python		dev-lang/python
+qt		x11-libs/qt
+readline	sys-libs/readline
+ruby		dev-lang/ruby
+scanner		media-gfx/sane-backends
+sdl		media-libs/libsdl
+slang		sys-libs/slang
+snmp		net-analyzer/ucd-snmp
+spell		app-text/gtkspell app-text/ispell app-text/hspell
+ssl		dev-libs/openssl
+tcltk		dev-lang/tcl dev-lang/tk
+tcpd		sys-apps/tcp-wrappers
+tetex		app-text/tetex
+ungif		media-libs/ungif
+xinerama
 xprint
+X		x11-base/xorg-x11 x11-base/xfree
diff --git a/profiles/default-linux/amd64/use.mask b/profiles/default-linux/amd64/use.mask
index 7a6088c6b638..af1573e1121a 100644
--- a/profiles/default-linux/amd64/use.mask
+++ b/profiles/default-linux/amd64/use.mask
@@ -1,3 +1,90 @@
 # 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.2 2004/06/26 23:29:25 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/use.mask,v 1.3 2004/09/09 03:08:37 lv Exp $
+
+#unknowns
+afs
+drac
+
+# WON'T BUILD - SECTION
+
+# 2004/06/22 - Taken from 2004.0 profile
+# Anything that relies on vm86.h will not built on amd64
+# SVGAlib doesnt build
+svga
+
+# 2004/06/22 - Taken from 2004.0 profile
+# Firebird doesnt build on amd64
+firebird
+
+# 2004/06/22 - Taken from 2004.0 profile
+# x86 binary only, used by php
+fdftk
+
+# 2004/06/22 - Danny van Dyk <kugelfang@gentoo.org>
+# version in portage does not work on amd64 yet
+uclibc
+
+# 2004/06/22 - Taken from 2004.0 profile
+# versions that are in portage do not support amd64,
+# will be removed when Intel issues an update and it gets into portage
+# (it seems to be in the works)
+icc
+ifc
+
+# 2004/06/22 - Taken from 2004.0 profile
+# masked
+3dfx
+
+# 2004/07/22 - Danny van Dyk <kugelfang@gentoo.org>
+# libcaca part of libSDL causes breakage due to missing shared object.
+# BUG #53857
+libcaca
+
+# NOT NECESSARY - SECTION
+
+# 2004/06/22 - Taken from 2004.0 profile
+# Too many packages assume that mmx/sse/sse2/3dnow are 86-32 only things to
+# make them useful on amd64. Anyway, all amd64 cpus have them, so they should
+# not be many flag dependant in this case
+mmx
+mmx2
+sse
+sse2
+3dnow
+
+# 2004/06/22 - Taken from 2004.0 profile
+# Chris PeBenito <pebenito@gentoo.org>
+# must use a SELinux profile
+selinux
+
+# 2004/06/25 - Danny van Dyk <kugelfang@gentoo.org>
+# Known BUGs (#54760) + lack of brain/man power to maintain "hardened" in the
+# default profile. Use the hardened profile instead.
+hardened
+uclibc
+
+# altivec is a ppc instruction set.
+altivec
+
+# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
+# Dated Sat, 31 Jul 2004 14:49:28 -0700, from robbat2@gentoo.org
+# all of these are binary-only, and not presently available on this
+# architecture.
+adabas
+birdstep
+cpdflib
+dbmaker
+empress
+empress-bcs
+esoob
+filepro
+frontbase
+hyperwave
+informix
+ingres
+pfpro
+solid
+sybase
+sybase-ct
+
diff --git a/profiles/default-linux/amd64/virtuals b/profiles/default-linux/amd64/virtuals
index a6a4306192ea..62bf9782d5ee 100644
--- a/profiles/default-linux/amd64/virtuals
+++ b/profiles/default-linux/amd64/virtuals
@@ -1,5 +1,67 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/virtuals,v 1.6 2004/08/17 13:39:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/virtuals,v 1.7 2004/09/09 03:08:37 lv Exp $
 virtual/mailx		mail-client/mailx
-
+sys-apps/sh-utils	sys-apps/coreutils
+sys-apps/textutils	sys-apps/coreutils
+sys-apps/fileutils	sys-apps/coreutils
+virtual/os-headers	sys-kernel/linux26-headers
+virtual/lpr             net-print/cups
+virtual/python          dev-lang/python
+virtual/mta             mail-mta/ssmtp
+virtual/alsa            sys-kernel/gentoo-dev-sources
+virtual/kernel          sys-kernel/linux26-headers
+virtual/linux-sources   sys-kernel/gentoo-dev-sources
+virtual/glibc           sys-libs/glibc
+virtual/libc		sys-libs/glibc
+virtual/x11             x11-base/xorg-x11
+virtual/opengl          x11-base/xorg-x11
+virtual/glu             x11-base/xorg-x11
+virtual/glut            media-libs/glut
+virtual/imapUW          net-mail/uw-imap
+x11-libs/xaw            x11-libs/Xaw3d
+virtual/jdk             dev-java/blackdown-jdk
+virtual/jre             dev-java/blackdown-jre
+virtual/imapd           net-mail/courier-imap
+virtual/blackbox        x11-wm/blackbox
+virtual/emacs           app-editors/emacs
+virtual/cron            sys-apps/dcron
+sys-apps/reiserfs-utils sys-fs/reiserfsprogs
+virtual/xemacs          app-editors/xemacs
+virtual/sylpheed        mail-client/sylpheed
+virtual/php             dev-php/mod_php
+virtual/httpd-php	dev-php/mod_php
+virtual/textbrowser	net-www/links
+virtual/mda		mail-filter/procmail
+virtual/xft		x11-base/xorg-x11
+virtual/krb5		app-crypt/mit-krb5
+virtual/bootloader	sys-boot/grub-static
+virtual/editor		app-editors/nano
+virtual/jack		media-sound/jack-audio-connection-kit
+virtual/quicktime	media-libs/libquicktime
+virtual/os-headers	sys-kernel/linux26-headers
+virtual/ghc             dev-lang/ghc-bin
+virtual/modutils	sys-apps/module-init-tools
+virtual/inetd		sys-apps/xinetd
+virtual/antivirus	app-antivirus/clamav
+virtual/aspell-dict	app-dicts/aspell-en
+virtual/skkserv		app-i18n/skkserv
+virtual/snmp		net-analyzer/net-snmp
+virtual/winkernel	sys-kernel/win4lin-sources
+virtual/flim		app-emacs/flim
+virtual/semi		app-emacs/semi
+virtual/tetex		app-text/tetex
+virtual/bittorrent	net-p2p/bittorrent
+virtual/logger		app-admin/sysklogd
+virtual/tftp		net-misc/tftp-hpa
+virtual/gzip		app-arch/gzip
+virtual/ghostscript	app-text/ghostscript
+virtual/imap-c-client	net-libs/c-client
+virtual/mpg123		media-sound/mpg321
+virtual/cdrtools        app-cdr/cdrtools
+virtual/dhcpc		net-misc/dhcpcd
+virtual/ssh		net-misc/openssh
+virtual/dev-manager	sys-fs/devfsd
+virtual/blas		app-sci/blas-atlas
+virtual/lapack		app-sci/lapack-atlas
+virtual/gsasl		net-libs/libgsasl