More profile work so the gcc-4.1.1 stuff will work right now.

19 files changed, 488 insertions, 371 deletions

diff --git a/profiles/default-linux/sparc/ChangeLog b/profiles/default-linux/sparc/ChangeLog
index 4e4b1c0879b6..61e60f60e2c9 100644
--- a/profiles/default-linux/sparc/ChangeLog
+++ b/profiles/default-linux/sparc/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sparc profile
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/ChangeLog,v 1.3 2006/09/19 02:12:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/ChangeLog,v 1.4 2006/09/21 02:21:22 weeve Exp $
+
+  21 Sep 2006; Jason Wever <weeve@gentoo.org> sparc32/2006.0/package.mask,
+  sparc64/2006.0/package.mask, sparc32/dev/gcc-4.1.1/make.defaults,
+  sparc64/2006.1/package.mask, +sparc32/dev/gcc-4.1.1/packages,
+  sparc32/2006.1/package.mask, sparc64/dev/gcc.4.1.1/make.defaults,
+  sparc32/dev/gcc-4.1.1/package.mask, +sparc64/dev/gcc.4.1.1/package.mask,
+  sparc32/dev/gcc-4.1.1/use.mask, -sparc32/dev/package.mask,
+  sparc64/dev/gcc.4.1.1/packages, +sparc32/dev/gcc-4.1.1/virtuals,
+  -sparc32/package.mask, sparc64/dev/gcc.4.1.1/use.mask,
+  +sparc64/dev/gcc.4.1.1/virtuals, -sparc64/dev/package.mask,
+  -sparc64/package.mask:
+  More profile work so the gcc-4.1.1 stuff will work right now.
 
   19 Sep 2006; Jason Wever <weeve@gentoo.org> +sparc32/dev/make.defaults,
   +sparc64/dev/gcc.4.1.1/make.defaults, +sparc32/dev/gcc-4.1.1/package.mask,
diff --git a/profiles/default-linux/sparc/sparc32/2006.0/package.mask b/profiles/default-linux/sparc/sparc32/2006.0/package.mask
index 1f87c13aa79f..e1e983d00ee3 100644
--- a/profiles/default-linux/sparc/sparc32/2006.0/package.mask
+++ b/profiles/default-linux/sparc/sparc32/2006.0/package.mask
@@ -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/sparc/sparc32/2006.0/package.mask,v 1.14 2006/07/05 21:38:43 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2006.0/package.mask,v 1.15 2006/09/21 02:21:22 weeve Exp $
 
 # Gustavo Zacarias <gustavoz@gentoo.org>
 # Totally untested on sparc32
@@ -188,3 +188,7 @@ dev-php5/php-java-bridge
 # Gustavo Zacarias <gustavoz@gentoo.org>
 # To avoid odd toolchain mixups
 <dev-libs/libffi-3.4.3
+# Mask gcc-4.x and glibc-2.4 until they are ready
+>=sys-devel/gcc-4.0.0
+>=sys-libs/glibc-2.4
+>=sys-kernel/linux-headers-2.6.17
diff --git a/profiles/default-linux/sparc/sparc32/2006.1/package.mask b/profiles/default-linux/sparc/sparc32/2006.1/package.mask
index 1a5016a433c9..f10806a4610e 100644
--- a/profiles/default-linux/sparc/sparc32/2006.1/package.mask
+++ b/profiles/default-linux/sparc/sparc32/2006.1/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2006.1/package.mask,v 1.2 2006/05/08 14:15:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2006.1/package.mask,v 1.3 2006/09/21 02:21:22 weeve Exp $
 
 # Gustavo Zacarias <gustavoz@gentoo.org>
 # Totally untested on sparc32
@@ -187,3 +187,7 @@ dev-php5/php-java-bridge
 # Gustavo Zacarias <gustavoz@gentoo.org>
 # To avoid odd toolchain mixups
 <dev-libs/libffi-3.4.3
+# Mask gcc-4.x and glibc-2.4 until they are ready
+>=sys-devel/gcc-4.0.0
+>=sys-libs/glibc-2.4
+>=sys-kernel/linux-headers-2.6.17
diff --git a/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/make.defaults b/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/make.defaults
index 5140c1935123..84718d45995e 100644
--- a/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/make.defaults
@@ -1,25 +1,9 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/make.defaults,v 1.1 2006/09/19 02:12:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/make.defaults,v 1.2 2006/09/21 02:21:22 weeve Exp $
 
-# 32bit kernel, 32bit userland
-CHOST="sparc-unknown-linux-gnu"
-PROFILE_ARCH="sparc"
+# USE settings
+USE="apache2 berkdb bitmap-fonts crypt cups dlloader fortran fbcon foomaticdb gdbm gif gstreamer gtk gtk2 imlib jpeg libwww motif ncurses nls oss pam perl png python readline spell ssl tcpd truetype truetype-fonts type1-fonts udev X xml zlib"
 
-# Just sparc32 binutils for linux-headers
-CTARGETS_BINUTILS="sparc-unknown-linux-gnu"
-
-# Multilib stuff
-MULTILIB_ABIS="sparc32"
-DEFAULT_ABI="sparc32"
-ABI=${DEFAULT_ABI}
-CFLAGS_sparc32="-m32"
-LDFLAGS_sparc32="-m elf32_sparc"
-CHOST_sparc32="sparc-unknown-linux-gnu"
-CTARGET_sparc32="sparc-unknown-linux-gnu"
-CDEFINE_sparc32="!__arch64__"
-LIBDIR_sparc32="lib"
-
-# Compiler flags
-CFLAGS="-O2 -pipe"
-CXXFLAGS=${CFLAGS}
+# Just the barebones until bug #120088 is properly fixed <gustavoz>
+USE="${USE} dba gd"
diff --git a/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/package.mask b/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/package.mask
index 79951ace0368..3c22bc8f2a05 100644
--- a/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/package.mask
+++ b/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/package.mask
@@ -1,96 +1,193 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/package.mask,v 1.1 2006/09/19 02:12:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/package.mask,v 1.2 2006/09/21 02:21:22 weeve Exp $
 
-# Masked until bug #60413 is fixed.
-media-libs/xine-lib
-kde-base/artsplugin-xine
-media-sound/quark
-media-sound/sonic-rainbow
-media-video/gxine
-media-video/kaffeine
-media-video/xine-ui
-xfce-extra/xfmedia
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# Totally untested on sparc32
+gnome-base/gnome-mount
+gnome-base/gnome-volume-manager
+gnome-extra/hal-device-manager
+sys-apps/hal
+sys-apps/ivman
+sys-apps/pmount
 
 # Gustavo Zacarias <gustavoz@gentoo.org>
+# Java is broken for the new stuff
+# This is a work in progress - a list of stuff that could eventually be unkeyworded
+app-accessibility/freetts
+app-accessibility/java-access-bridge
+app-arch/dczip
+app-crypt/jacksum
+app-editors/jedit
+app-editors/jext
+app-misc/freemind
+app-misc/jdictionary
+app-misc/jitac
+app-misc/largorecipes
+app-misc/openjnlp
+app-portage/portagemaster
+app-vim/ant
+dev-db/henplus
+dev-db/hsqldb
+dev-java/adaptx
+dev-java/ant
+dev-java/ant-core
+dev-java/ant-tasks
+dev-java/antlr
+dev-java/avalon-framework
+dev-java/avalon-logkit
+dev-java/avalon-logkit-bin
+dev-java/batik
+dev-java/bcel
+dev-java/blackdown-jdk
+dev-java/blackdown-jre
+dev-java/blowfishj
+dev-java/bluej-bin
+dev-java/bsf
+dev-java/bsh
+dev-java/castor
+dev-java/cdegroot-db
+dev-java/cocoon
+dev-java/colt
+dev-java/commons-beanutils
+dev-java/commons-cli
+dev-java/commons-collections
+dev-java/commons-daemon
+dev-java/commons-dbcp
+dev-java/commons-digester
+dev-java/commons-discovery
+dev-java/commons-el
+dev-java/commons-fileupload
+dev-java/commons-httpclient
+dev-java/commons-lang
+dev-java/commons-launcher
+dev-java/commons-logging
+dev-java/commons-modeler
+dev-java/commons-net
+dev-java/commons-pool
+dev-java/commons-validator
+dev-java/concurrent-util
+dev-java/cryptix-jce-bin
+dev-java/dbconnectionbroker-bin
+dev-java/dom4j
+dev-java/edtftpj
+dev-java/exolabcore
+dev-java/exolabtools
+dev-java/fastutil
+dev-java/fop
+dev-java/gjdoc
+dev-java/gnu-classpath
+dev-java/gnu-jaf
+dev-java/gnu-jaxp
+dev-java/icu4j
+dev-java/infobus-bin
+dev-java/jacl
+dev-java/jade
+dev-java/jakarta-oro
+dev-java/jakarta-regexp
+dev-java/java-config
+dev-java/java-sdk-docs
+dev-java/javacup
+dev-java/jaxen
+dev-java/jdbc-mysql
+dev-java/jdbc2-firebird
+dev-java/jdbc2-oracle
+dev-java/jdbc2-postgresql
+dev-java/jdbc2-stdext
+dev-java/jdbc3-firebird
+dev-java/jdbc3-oracle
+dev-java/jdbc3-postgresql
+dev-java/jdbm
+dev-java/jdepend
+dev-java/jdom
+dev-java/jgoodies-looks-bin
+dev-java/jgraph
+dev-java/jikes
+dev-java/jldap
+dev-java/jlex
+dev-java/jlfgr
+dev-java/jmbus
+dev-java/jmf-bin
+dev-java/joscar
+dev-java/jsch
+dev-java/jss
+dev-java/jswat
+dev-java/jta
+dev-java/jump
+dev-java/junit
+dev-java/jython
+dev-java/jzlib
+dev-java/kaffe
+dev-java/kunststoff-bin
+dev-java/ldapsdk
+dev-java/libreadline-java
+dev-java/log4j
+dev-java/makeme
+dev-java/openjgraph
+dev-java/openjms
+dev-java/openjms-bin
+dev-java/oscore-bin
+dev-java/qat
+dev-java/randomguid
+dev-java/rhino
+dev-java/sablevm
+dev-java/saxon-bin
+dev-java/saxpath
+dev-java/servletapi
+dev-java/spin
+dev-java/struts
+dev-java/struts-legacy
+dev-java/sun-jaf-bin
+dev-java/sun-jai-bin
+dev-java/sun-javamail-bin
+dev-java/sun-jimi
+dev-java/systray4j
+dev-java/tagsoup
+dev-java/xalan
+dev-java/xerces
+dev-java/xjavac
+dev-java/xml-commons
+dev-java/xml-commons-resolver
+dev-java/xml-xmlbeans
+dev-java/xmlc
+dev-java/xom
+dev-java/sun-jms
+dev-java/sun-jmx
+dev-tex/ppower4
+dev-util/checkstyle
+dev-util/eclipse-cdt-bin
+dev-util/eclipse-sdt-bin
+dev-util/eclipse-sdk
+dev-util/jarwizard
+dev-util/jconfig
+dev-util/netbeans
+dev-util/pmd
+dev-util/poseidonCE
+games-rpg/pcgen
+kde-base/kdebindings-meta
+kde-base/kdejava
+kde-base/qtjava
+media-gfx/aoi
+net-misc/java-wakeonlan
+net-misc/mindterm
+net-p2p/xnap
+sci-misc/zetagrid
+www-servers/jboss
+www-servers/jetty
+www-servers/orion
+www-servers/resin
+www-servers/resin-ee
+www-servers/tomcat
+
 # Jason Wever <weeve@gentoo.org>
-# Jeremy Huddleston <eradicator@gentoo.org>
-# Packages masked that have hard deps on alsa
-app-accessibility/speech-dispatcher
-app-forensics/regviewer
-dev-games/neoengine
-dev-java/sun-j2sdk
-games-arcade/emergence-bin
-games-emulation/mupen64-alsasnd
-games-roguelike/crossfire-client
-media-libs/alsa-lib
-media-libs/alsa-oss
-media-libs/ladcca
-media-libs/libclalsadrv
-media-libs/libmustux
-media-plugins/alsa-jack
-media-plugins/alsa-plugins
-media-plugins/gst-plugins-alsa
-media-plugins/xmms-alsa
-media-sound/alsa-patch-bay
-media-sound/alsa-tools
-media-sound/alsa-utils
-media-sound/alsamixergui
-media-sound/ams
-media-sound/aseqview
-media-sound/brutefir
-media-sound/gmorgan
-media-sound/gnome-alsamixer
-media-sound/horgand
-media-sound/jack-audio-connection-kit
-media-sound/jamin
-media-sound/kamix
-media-sound/tk707
-media-sound/krecord
-media-sound/museseq
-media-sound/pmidi
-media-sound/qjackconnect
-media-sound/qjackctl
-media-sound/qmidiarp
-media-sound/rosegarden
-media-sound/seq24
-media-sound/sfc
-media-sound/specimen
-media-sound/supercollider
-media-sound/tapiir
-media-video/gephe
+# Mask java related PHP packages
+dev-php4/php-java-bridge
+dev-php5/php-java-bridge
 
-# Haskell needs ultra
-dev-haskell/haddock
-dev-lang/ghc
-dev-lang/ghc-bin
-dev-haskell/alex
-dev-haskell/buddha
-dev-haskell/c2hs
-dev-haskell/cabal
-dev-haskell/cpphs
-dev-haskell/drift
-dev-haskell/frown
-dev-haskell/gtk2hs
-dev-haskell/happy
-dev-haskell/harp
-dev-haskell/haskell-src-exts
-dev-haskell/haxml
-dev-haskell/hdbc
-dev-haskell/hdbc-odbc
-dev-haskell/hdbc-postgresql
-dev-haskell/hdbc-sqlite
-dev-haskell/hdoc
-dev-haskell/hmake
-dev-haskell/hs-plugins
-dev-haskell/hsql
-dev-haskell/hsql-mysql
-dev-haskell/hsql-odbc
-dev-haskell/hsql-postgresql
-dev-haskell/hsql-sqlite
-dev-haskell/lhs2tex
-dev-haskell/uuagc
-dev-haskell/uulib
-dev-haskell/wash
-dev-haskell/wxhaskell
-dev-util/darcs
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# To avoid odd toolchain mixups
+<dev-libs/libffi-3.4.3
+# Mask gcc-4.x and glibc-2.4 until they are ready
+>=sys-devel/gcc-4.0.0
+>=sys-libs/glibc-2.4
+>=sys-kernel/linux-headers-2.6.17
diff --git a/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/packages b/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/packages
new file mode 100644
index 000000000000..bdf54d4bc763
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/packages
@@ -0,0 +1,14 @@
+# Copyright 1999-2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/packages,v 1.1 2006/09/21 02:21:22 weeve Exp $
+
+# We really want 3.4.x for this profile
+*>=sys-devel/gcc-3.4.5
+*>=sys-devel/binutils-2.16.1-r2
+
+# Need newer ones to build with gcc 3.4.x
+*>=sys-libs/glibc-2.3.6-r3
+
+# Jeremy Huddleston <eradicator@gentoo.org>
+# Earlier versions aren't patched to work with 2.6 headers
+*>=sys-boot/silo-1.4.10
diff --git a/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/use.mask b/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/use.mask
index bb2a81005f80..97857db259bf 100644
--- a/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/use.mask
+++ b/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/use.mask
@@ -1,17 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/use.mask,v 1.1 2006/09/19 02:12:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/use.mask,v 1.2 2006/09/21 02:21:22 weeve Exp $
 
-# nptl on sparc requires the v9 ABI which requires sun4u
-nptl
-nptlonly
+# Java and java-related stuff
+freetts
+java
+java-internal
+java-external
+netbeans
 
-# Jason Wever <weeve@gentoo.org>
-# Don't allow for some video and dvd use flags since sparc32 is too slow
-dvd
-dvdr
-mpeg
-
-# Gustavo Zacarias <gustavoz@gentoo.org>
-# For now, until we check it's status wrt build b0rkage and toolchain
-xine
+# Unmask udev
+-udev
diff --git a/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/virtuals b/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/virtuals
new file mode 100644
index 000000000000..bb93f8ced475
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/virtuals
@@ -0,0 +1,6 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/dev/gcc-4.1.1/virtuals,v 1.1 2006/09/21 02:21:22 weeve Exp $
+
+virtual/dev-manager			sys-fs/udev
+virtual/linux-sources			sys-kernel/gentoo-sources
diff --git a/profiles/default-linux/sparc/sparc32/dev/package.mask b/profiles/default-linux/sparc/sparc32/dev/package.mask
deleted file mode 100644
index 65a856523ad2..000000000000
--- a/profiles/default-linux/sparc/sparc32/dev/package.mask
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/dev/package.mask,v 1.3 2006/09/19 02:12:55 weeve Exp $
-
-# Masked until bug #60413 is fixed.
-media-libs/xine-lib
-kde-base/artsplugin-xine
-media-sound/quark
-media-sound/sonic-rainbow
-media-video/gxine
-media-video/kaffeine
-media-video/xine-ui
-xfce-extra/xfmedia
-
-# Gustavo Zacarias <gustavoz@gentoo.org>
-# Jason Wever <weeve@gentoo.org>
-# Jeremy Huddleston <eradicator@gentoo.org>
-# Packages masked that have hard deps on alsa
-app-accessibility/speech-dispatcher
-app-forensics/regviewer
-dev-games/neoengine
-dev-java/sun-j2sdk
-games-arcade/emergence-bin
-games-emulation/mupen64-alsasnd
-games-roguelike/crossfire-client
-media-libs/alsa-lib
-media-libs/alsa-oss
-media-libs/ladcca
-media-libs/libclalsadrv
-media-libs/libmustux
-media-plugins/alsa-jack
-media-plugins/alsa-plugins
-media-plugins/gst-plugins-alsa
-media-plugins/xmms-alsa
-media-sound/alsa-patch-bay
-media-sound/alsa-tools
-media-sound/alsa-utils
-media-sound/alsamixergui
-media-sound/ams
-media-sound/aseqview
-media-sound/brutefir
-media-sound/gmorgan
-media-sound/gnome-alsamixer
-media-sound/horgand
-media-sound/jack-audio-connection-kit
-media-sound/jamin
-media-sound/kamix
-media-sound/tk707
-media-sound/krecord
-media-sound/museseq
-media-sound/pmidi
-media-sound/qjackconnect
-media-sound/qjackctl
-media-sound/qmidiarp
-media-sound/rosegarden
-media-sound/seq24
-media-sound/sfc
-media-sound/specimen
-media-sound/supercollider
-media-sound/tapiir
-media-video/gephe
-
-# Haskell needs ultra
-dev-haskell/haddock
-dev-lang/ghc
-dev-lang/ghc-bin
-dev-haskell/alex
-dev-haskell/buddha
-dev-haskell/c2hs
-dev-haskell/cabal
-dev-haskell/cpphs
-dev-haskell/drift
-dev-haskell/frown
-dev-haskell/gtk2hs
-dev-haskell/happy
-dev-haskell/harp
-dev-haskell/haskell-src-exts
-dev-haskell/haxml
-dev-haskell/hdbc
-dev-haskell/hdbc-odbc
-dev-haskell/hdbc-postgresql
-dev-haskell/hdbc-sqlite
-dev-haskell/hdoc
-dev-haskell/hmake
-dev-haskell/hs-plugins
-dev-haskell/hsql
-dev-haskell/hsql-mysql
-dev-haskell/hsql-odbc
-dev-haskell/hsql-postgresql
-dev-haskell/hsql-sqlite
-dev-haskell/lhs2tex
-dev-haskell/uuagc
-dev-haskell/uulib
-dev-haskell/wash
-dev-haskell/wxhaskell
-dev-util/darcs
-
-# Mask gcc-4.x and glibc-2.4 until they are ready
->=sys-devel/gcc-4.0.0
->=sys-libs/glibc-2.4
->=sys-kernel/linux-headers-2.6.17
diff --git a/profiles/default-linux/sparc/sparc32/package.mask b/profiles/default-linux/sparc/sparc32/package.mask
deleted file mode 100644
index 15dc7384b0d7..000000000000
--- a/profiles/default-linux/sparc/sparc32/package.mask
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/package.mask,v 1.11 2006/09/19 02:12:55 weeve Exp $
-
-# Masked until bug #60413 is fixed.
-media-libs/xine-lib
-kde-base/artsplugin-xine
-media-sound/quark
-media-sound/sonic-rainbow
-media-video/gxine
-media-video/kaffeine
-media-video/xine-ui
-xfce-extra/xfmedia
-
-# Gustavo Zacarias <gustavoz@gentoo.org>
-# Jason Wever <weeve@gentoo.org>
-# Jeremy Huddleston <eradicator@gentoo.org>
-# Packages masked that have hard deps on alsa
-app-accessibility/speech-dispatcher
-app-forensics/regviewer
-dev-games/neoengine
-dev-java/sun-j2sdk
-games-arcade/emergence-bin
-games-emulation/mupen64-alsasnd
-games-roguelike/crossfire-client
-media-libs/alsa-lib
-media-libs/alsa-oss
-media-libs/ladcca
-media-libs/libclalsadrv
-media-libs/libmustux
-media-plugins/alsa-jack
-media-plugins/alsa-plugins
-media-plugins/gst-plugins-alsa
-media-plugins/xmms-alsa
-media-sound/alsa-patch-bay
-media-sound/alsa-tools
-media-sound/alsa-utils
-media-sound/alsamixergui
-media-sound/ams
-media-sound/aseqview
-media-sound/brutefir
-media-sound/gmorgan
-media-sound/gnome-alsamixer
-media-sound/horgand
-media-sound/jack-audio-connection-kit
-media-sound/jamin
-media-sound/kamix
-media-sound/tk707
-media-sound/krecord
-media-sound/museseq
-media-sound/pmidi
-media-sound/qjackconnect
-media-sound/qjackctl
-media-sound/qmidiarp
-media-sound/rosegarden
-media-sound/seq24
-media-sound/sfc
-media-sound/specimen
-media-sound/supercollider
-media-sound/tapiir
-media-video/gephe
-
-# Haskell needs ultra
-dev-haskell/haddock
-dev-lang/ghc
-dev-lang/ghc-bin
-dev-haskell/alex
-dev-haskell/buddha
-dev-haskell/c2hs
-dev-haskell/cabal
-dev-haskell/cpphs
-dev-haskell/drift
-dev-haskell/frown
-dev-haskell/gtk2hs
-dev-haskell/happy
-dev-haskell/harp
-dev-haskell/haskell-src-exts
-dev-haskell/haxml
-dev-haskell/hdbc
-dev-haskell/hdbc-odbc
-dev-haskell/hdbc-postgresql
-dev-haskell/hdbc-sqlite
-dev-haskell/hdoc
-dev-haskell/hmake
-dev-haskell/hs-plugins
-dev-haskell/hsql
-dev-haskell/hsql-mysql
-dev-haskell/hsql-odbc
-dev-haskell/hsql-postgresql
-dev-haskell/hsql-sqlite
-dev-haskell/lhs2tex
-dev-haskell/uuagc
-dev-haskell/uulib
-dev-haskell/wash
-dev-haskell/wxhaskell
-dev-util/darcs
-
-# Mask gcc-4.x and glibc-2.4 until they are ready
->=sys-devel/gcc-4.0.0
->=sys-libs/glibc-2.4
->=sys-kernel/linux-headers-2.6.17
diff --git a/profiles/default-linux/sparc/sparc64/2006.0/package.mask b/profiles/default-linux/sparc/sparc64/2006.0/package.mask
index 29000208ba73..ae1a6a2ec339 100644
--- a/profiles/default-linux/sparc/sparc64/2006.0/package.mask
+++ b/profiles/default-linux/sparc/sparc64/2006.0/package.mask
@@ -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/sparc/sparc64/2006.0/package.mask,v 1.15 2006/07/05 21:38:43 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.0/package.mask,v 1.16 2006/09/21 02:21:22 weeve Exp $
 
 # Jason Wever <weeve@gentoo.org>
 # gradm requires 64 bit support, which doesn't exist in this profile
@@ -183,3 +183,7 @@ dev-php5/php-java-bridge
 # Gustavo Zacarias <gustavoz@gentoo.org>
 # To avoid odd toolchain mixups
 <dev-libs/libffi-3.4.3
+# Mask gcc-4.x and glibc-2.4 until they are ready
+>=sys-devel/gcc-4.0.0
+>=sys-libs/glibc-2.4
+>=sys-kernel/linux-headers-2.6.17
diff --git a/profiles/default-linux/sparc/sparc64/2006.1/package.mask b/profiles/default-linux/sparc/sparc64/2006.1/package.mask
index c46dc63577ca..6e263baf15cc 100644
--- a/profiles/default-linux/sparc/sparc64/2006.1/package.mask
+++ b/profiles/default-linux/sparc/sparc64/2006.1/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.1/package.mask,v 1.1 2006/04/11 21:18:28 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.1/package.mask,v 1.2 2006/09/21 02:21:22 weeve Exp $
 
 # Jason Wever <weeve@gentoo.org>
 # gradm requires 64 bit support, which doesn't exist in this profile
@@ -182,3 +182,7 @@ dev-php5/php-java-bridge
 # Gustavo Zacarias <gustavoz@gentoo.org>
 # To avoid odd toolchain mixups
 <dev-libs/libffi-3.4.3
+# Mask gcc-4.x and glibc-2.4 until they are ready
+>=sys-devel/gcc-4.0.0
+>=sys-libs/glibc-2.4
+>=sys-kernel/linux-headers-2.6.17
diff --git a/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/make.defaults b/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/make.defaults
index de8a67444038..894ddc619f68 100644
--- a/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/make.defaults
@@ -1,26 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/make.defaults,v 1.1 2006/09/19 02:12:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/make.defaults,v 1.2 2006/09/21 02:21:22 weeve Exp $
 
-# 64bit kernel, 32bit userland
-CHOST="sparc-unknown-linux-gnu"
-PROFILE_ARCH="sparc64"
+# USE settings
+USE="apache2 arts avi berkdb bitmap-fonts crypt cups dlloader eds encode esd fortran fbcon foomaticdb gdbm gcc64 gif gstreamer gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls nptl nptlonly ogg oss opengl pam perl png python pdflib qt3 readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts udev vorbis X xv xml xmms zlib"
+STAGE1_USE="gcc64 nptl nptlonly"
 
-# We need sparc64 binutils for linux-headers
-CTARGETS_BINUTILS="sparc-unknown-linux-gnu sparc64-unknown-linux-gnu"
-STAGE1_USE="gcc64"
-
-# Multilib stuff
-MULTILIB_ABIS="sparc32"
-DEFAULT_ABI="sparc32"
-ABI=${DEFAULT_ABI}
-CFLAGS_sparc32="-m32"
-LDFLAGS_sparc32="-m elf32_sparc"
-CHOST_sparc32="sparc-unknown-linux-gnu"
-CTARGET_sparc32="sparc-unknown-linux-gnu"
-CDEFINE_sparc32="!__arch64__"
-LIBDIR_sparc32="lib"
-
-# Compiler flags
-CFLAGS="-O2 -mcpu=ultrasparc -pipe"
-CXXFLAGS=${CFLAGS}
+# Just the barebones until bug #120088 is properly fixed <gustavoz>
+USE="${USE} dba gd" 
diff --git a/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/package.mask b/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/package.mask
new file mode 100644
index 000000000000..ac997ceeb82e
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/package.mask
@@ -0,0 +1,188 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/package.mask,v 1.1 2006/09/21 02:21:22 weeve Exp $
+
+# Jason Wever <weeve@gentoo.org>
+# gradm requires 64 bit support, which doesn't exist in this profile
+>sys-apps/gradm-2.0.1-r1
+
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# Java is broken for the new stuff
+# This is a work in progress - a list of stuff that could eventually be unkeyworded
+app-accessibility/freetts
+app-accessibility/java-access-bridge
+app-arch/dczip
+app-crypt/jacksum
+app-editors/jedit
+app-editors/jext
+app-misc/freemind
+app-misc/jdictionary
+app-misc/jitac
+app-misc/largorecipes
+app-misc/openjnlp
+app-portage/portagemaster
+app-vim/ant
+dev-db/henplus
+dev-db/hsqldb
+dev-java/adaptx
+dev-java/ant
+dev-java/ant-core
+dev-java/ant-tasks
+dev-java/antlr
+dev-java/avalon-framework
+dev-java/avalon-logkit
+dev-java/avalon-logkit-bin
+dev-java/batik
+dev-java/bcel
+dev-java/blackdown-jdk
+dev-java/blackdown-jre
+dev-java/blowfishj
+dev-java/bluej-bin
+dev-java/bsf
+dev-java/bsh
+dev-java/castor
+dev-java/cdegroot-db
+dev-java/cocoon
+dev-java/colt
+dev-java/commons-beanutils
+dev-java/commons-cli
+dev-java/commons-collections
+dev-java/commons-daemon
+dev-java/commons-dbcp
+dev-java/commons-digester
+dev-java/commons-discovery
+dev-java/commons-el
+dev-java/commons-fileupload
+dev-java/commons-httpclient
+dev-java/commons-lang
+dev-java/commons-launcher
+dev-java/commons-logging
+dev-java/commons-modeler
+dev-java/commons-net
+dev-java/commons-pool
+dev-java/commons-validator
+dev-java/concurrent-util
+dev-java/cryptix-jce-bin
+dev-java/dbconnectionbroker-bin
+dev-java/dom4j
+dev-java/edtftpj
+dev-java/exolabcore
+dev-java/exolabtools
+dev-java/fastutil
+dev-java/fop
+dev-java/gjdoc
+dev-java/gnu-classpath
+dev-java/gnu-jaf
+dev-java/gnu-jaxp
+dev-java/icu4j
+dev-java/infobus-bin
+dev-java/jacl
+dev-java/jade
+dev-java/jakarta-oro
+dev-java/jakarta-regexp
+dev-java/java-config
+dev-java/java-sdk-docs
+dev-java/javacup
+dev-java/jaxen
+dev-java/jdbc-mysql
+dev-java/jdbc2-firebird
+dev-java/jdbc2-oracle
+dev-java/jdbc2-postgresql
+dev-java/jdbc2-stdext
+dev-java/jdbc3-firebird
+dev-java/jdbc3-oracle
+dev-java/jdbc3-postgresql
+dev-java/jdbm
+dev-java/jdepend
+dev-java/jdom
+dev-java/jgoodies-looks-bin
+dev-java/jgraph
+dev-java/jikes
+dev-java/jldap
+dev-java/jlex
+dev-java/jlfgr
+dev-java/jmbus
+dev-java/jmf-bin
+dev-java/joscar
+dev-java/jsch
+dev-java/jss
+dev-java/jswat
+dev-java/jta
+dev-java/jump
+dev-java/junit
+dev-java/jython
+dev-java/jzlib
+dev-java/kaffe
+dev-java/kunststoff-bin
+dev-java/ldapsdk
+dev-java/libreadline-java
+dev-java/log4j
+dev-java/makeme
+dev-java/openjgraph
+dev-java/openjms
+dev-java/openjms-bin
+dev-java/oscore-bin
+dev-java/qat
+dev-java/randomguid
+dev-java/rhino
+dev-java/sablevm
+dev-java/saxon-bin
+dev-java/saxpath
+dev-java/servletapi
+dev-java/spin
+dev-java/struts
+dev-java/struts-legacy
+dev-java/sun-jaf-bin
+dev-java/sun-jai-bin
+dev-java/sun-javamail-bin
+dev-java/sun-jimi
+dev-java/systray4j
+dev-java/tagsoup
+dev-java/xalan
+dev-java/xerces
+dev-java/xjavac
+dev-java/xml-commons
+dev-java/xml-commons-resolver
+dev-java/xml-xmlbeans
+dev-java/xmlc
+dev-java/xom
+dev-java/sun-jms
+dev-java/sun-jmx
+dev-tex/ppower4
+dev-util/checkstyle
+dev-util/eclipse-cdt-bin
+dev-util/eclipse-sdt-bin
+dev-util/eclipse-sdk
+dev-util/jarwizard
+dev-util/jconfig
+dev-util/netbeans
+dev-util/pmd
+dev-util/poseidonCE
+games-rpg/pcgen
+kde-base/kdebindings-meta
+kde-base/kdejava
+kde-base/qtjava
+media-gfx/aoi
+net-misc/java-wakeonlan
+net-misc/mindterm
+net-p2p/xnap
+sci-misc/zetagrid
+www-servers/jboss
+www-servers/jetty
+www-servers/orion
+www-servers/resin
+www-servers/resin-ee
+www-servers/tomcat
+
+# Jason Wever <weeve@gentoo.org>
+# Mask java related PHP packages
+dev-php4/php-java-bridge
+dev-php5/php-java-bridge
+
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# To avoid odd toolchain mixups
+<dev-libs/libffi-3.4.3
+# Mask gcc-4.x and glibc-2.4 until they are ready
+>=sys-devel/gcc-4.0.0
+>=sys-libs/glibc-2.4
+>=sys-kernel/linux-headers-2.6.17
diff --git a/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/packages b/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/packages
index f3f1283ccfba..cf1818d7fc45 100644
--- a/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/packages
+++ b/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/packages
@@ -1,8 +1,19 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/packages,v 1.1 2006/09/19 02:12:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/packages,v 1.2 2006/09/21 02:21:22 weeve Exp $
 
-# Sometimes necessary to trick programs into thinking we're really
-# a sparc32 system.
-*sys-apps/setarch
+# We really want 3.4.x for this profile
+*>=sys-devel/gcc-3.4.5
+*>=sys-devel/binutils-2.16.1-r2
+
+# Need newer ones to build with gcc 3.4.x
+*>=sys-libs/glibc-2.3.6-r3
+
+# Since we're running a sparc64 kernel w/ 32bit (v9) userland,
+# we need gcc-sparc64 for kernels.
+*>=sys-devel/gcc-sparc64-3.4.6
+
+# Jeremy Huddleston <eradicator@gentoo.org>
+# Earlier versions aren't patched to work with 2.6 headers
+*>=sys-boot/silo-1.4.10
 
diff --git a/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/use.mask b/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/use.mask
index 3e0a8a2169d1..6ea784fde312 100644
--- a/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/use.mask
+++ b/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/use.mask
@@ -1,5 +1,18 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/use.mask,v 1.1 2006/09/19 02:12:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/use.mask,v 1.2 2006/09/21 02:21:22 weeve Exp $
 
--vis
+# Java and java-related stuffs
+freetts
+java
+java-internal
+java-external
+netbeans
+
+# New stuff enabled
+-hal
+-ipod
+-alsa
+-ladcca
+-udev
+-pmount
diff --git a/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/virtuals b/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/virtuals
new file mode 100644
index 000000000000..a0c36600b55a
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/virtuals
@@ -0,0 +1,6 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/gcc.4.1.1/virtuals,v 1.1 2006/09/21 02:21:22 weeve Exp $
+
+virtual/dev-manager			sys-fs/udev
+virtual/linux-sources			sys-kernel/gentoo-sources
diff --git a/profiles/default-linux/sparc/sparc64/dev/package.mask b/profiles/default-linux/sparc/sparc64/dev/package.mask
deleted file mode 100644
index 38b178103d5e..000000000000
--- a/profiles/default-linux/sparc/sparc64/dev/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Mask gcc-4.x and glibc-2.4 until they are ready
->=sys-devel/gcc-4.0.0
->=sys-libs/glibc-2.4
->=sys-kernel/linux-headers-2.6.17
diff --git a/profiles/default-linux/sparc/sparc64/package.mask b/profiles/default-linux/sparc/sparc64/package.mask
deleted file mode 100644
index 38b178103d5e..000000000000
--- a/profiles/default-linux/sparc/sparc64/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Mask gcc-4.x and glibc-2.4 until they are ready
->=sys-devel/gcc-4.0.0
->=sys-libs/glibc-2.4
->=sys-kernel/linux-headers-2.6.17