summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/default-linux')
-rw-r--r--profiles/default-linux/alpha/2004.3/deprecated9
-rw-r--r--profiles/default-linux/alpha/2004.3/make.defaults11
-rw-r--r--profiles/default-linux/alpha/2004.3/parent2
-rw-r--r--profiles/default-linux/alpha/2005.0/2.4/packages7
-rw-r--r--profiles/default-linux/alpha/2005.0/2.4/parent2
-rw-r--r--profiles/default-linux/alpha/2005.0/2.4/virtuals4
-rw-r--r--profiles/default-linux/alpha/2005.0/parent2
-rw-r--r--profiles/default-linux/alpha/2005.0/virtuals2
-rw-r--r--profiles/default-linux/alpha/make.defaults72
-rw-r--r--profiles/default-linux/alpha/package.mask4
-rw-r--r--profiles/default-linux/alpha/packages20
-rw-r--r--profiles/default-linux/alpha/parent7
-rw-r--r--profiles/default-linux/alpha/use.mask111
-rw-r--r--profiles/default-linux/alpha/virtuals14
-rw-r--r--profiles/default-linux/amd64/2004.3/lib64/make.defaults37
-rw-r--r--profiles/default-linux/amd64/2004.3/lib64/packages3
-rw-r--r--profiles/default-linux/amd64/2004.3/lib64/parent3
-rw-r--r--profiles/default-linux/amd64/2004.3/make.defaults36
-rw-r--r--profiles/default-linux/amd64/2004.3/package.mask6
-rw-r--r--profiles/default-linux/amd64/2004.3/packages8
-rw-r--r--profiles/default-linux/amd64/2004.3/parent3
-rw-r--r--profiles/default-linux/amd64/2004.3/profile.bashrc27
-rw-r--r--profiles/default-linux/amd64/2004.3/use.mask2
-rw-r--r--profiles/default-linux/amd64/2005.0/README9
-rw-r--r--profiles/default-linux/amd64/2005.0/make.defaults26
-rw-r--r--profiles/default-linux/amd64/2005.0/no-multilib/make.defaults2
-rw-r--r--profiles/default-linux/amd64/2005.0/no-multilib/package.mask62
-rw-r--r--profiles/default-linux/amd64/2005.0/no-multilib/parent3
-rw-r--r--profiles/default-linux/amd64/2005.0/package.mask54
-rw-r--r--profiles/default-linux/amd64/2005.0/packages12
-rw-r--r--profiles/default-linux/amd64/2005.0/parent3
-rw-r--r--profiles/default-linux/amd64/2005.0/profile.bashrc24
-rw-r--r--profiles/default-linux/amd64/2005.0/scripts/2004.3-2005.0upgrade.sh57
-rw-r--r--profiles/default-linux/amd64/2005.0/use.mask2
-rw-r--r--profiles/default-linux/amd64/2005.1/make.defaults6
-rw-r--r--profiles/default-linux/amd64/2005.1/no-multilib/make.defaults2
-rw-r--r--profiles/default-linux/amd64/2005.1/no-multilib/package.mask17
-rw-r--r--profiles/default-linux/amd64/2005.1/no-multilib/parent2
-rw-r--r--profiles/default-linux/amd64/2005.1/package.mask6
-rw-r--r--profiles/default-linux/amd64/2005.1/packages2
-rw-r--r--profiles/default-linux/amd64/2005.1/parent2
-rw-r--r--profiles/default-linux/amd64/2005.1/profile.bashrc15
-rw-r--r--profiles/default-linux/amd64/2005.1/use.mask2
-rw-r--r--profiles/default-linux/amd64/2006.0/make.defaults3
-rw-r--r--profiles/default-linux/amd64/2006.0/no-multilib/make.defaults2
-rw-r--r--profiles/default-linux/amd64/2006.0/no-multilib/package.mask6
-rw-r--r--profiles/default-linux/amd64/2006.0/no-multilib/parent2
-rw-r--r--profiles/default-linux/amd64/2006.0/no-symlinks/make.defaults2
-rw-r--r--profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/make.defaults2
-rw-r--r--profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/package.mask3
-rw-r--r--profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/parent2
-rw-r--r--profiles/default-linux/amd64/2006.0/no-symlinks/package.mask5
-rw-r--r--profiles/default-linux/amd64/2006.0/no-symlinks/parent2
-rw-r--r--profiles/default-linux/amd64/2006.0/no-symlinks/profile.bashrc2
-rw-r--r--profiles/default-linux/amd64/2006.0/package.mask2
-rw-r--r--profiles/default-linux/amd64/2006.0/packages8
-rw-r--r--profiles/default-linux/amd64/2006.0/parent2
-rw-r--r--profiles/default-linux/amd64/2006.0/profile.bashrc2
-rw-r--r--profiles/default-linux/amd64/2006.0/use.mask2
-rw-r--r--profiles/default-linux/amd64/make.defaults14
-rw-r--r--profiles/default-linux/amd64/package.mask8
-rw-r--r--profiles/default-linux/amd64/packages6
-rw-r--r--profiles/default-linux/amd64/parent5
-rw-r--r--profiles/default-linux/amd64/use.mask112
-rw-r--r--profiles/default-linux/amd64/virtuals6
-rw-r--r--profiles/default-linux/arm/2004.3/make.defaults14
-rw-r--r--profiles/default-linux/arm/make.defaults29
-rw-r--r--profiles/default-linux/arm/packages4
-rw-r--r--profiles/default-linux/arm/use.mask41
-rw-r--r--profiles/default-linux/arm/virtuals7
-rw-r--r--profiles/default-linux/hppa/2004.2/make.defaults58
-rw-r--r--profiles/default-linux/hppa/2005.0/packages5
-rw-r--r--profiles/default-linux/hppa/make.defaults15
-rw-r--r--profiles/default-linux/hppa/packages9
-rw-r--r--profiles/default-linux/hppa/use.mask80
-rw-r--r--profiles/default-linux/hppa/virtuals6
-rw-r--r--profiles/default-linux/ia64/2005.0/packages3
-rw-r--r--profiles/default-linux/ia64/2005.0/parent2
-rw-r--r--profiles/default-linux/ia64/make.defaults11
-rw-r--r--profiles/default-linux/ia64/packages2
-rw-r--r--profiles/default-linux/ia64/use.mask50
-rw-r--r--profiles/default-linux/ia64/virtuals7
-rw-r--r--profiles/default-linux/m68k/make.defaults17
-rw-r--r--profiles/default-linux/m68k/packages2
-rw-r--r--profiles/default-linux/m68k/use.mask18
-rw-r--r--profiles/default-linux/make.defaults18
-rw-r--r--profiles/default-linux/mips/2004.2/make.defaults29
-rw-r--r--profiles/default-linux/mips/2004.2/parent3
-rw-r--r--profiles/default-linux/mips/2005.0/make.defaults2
-rw-r--r--profiles/default-linux/mips/2005.0/parent3
-rw-r--r--profiles/default-linux/mips/cobalt/2004.2/make.defaults37
-rw-r--r--profiles/default-linux/mips/cobalt/2004.2/parent5
-rw-r--r--profiles/default-linux/mips/cobalt/2005.0/make.defaults6
-rw-r--r--profiles/default-linux/mips/cobalt/2005.0/parent2
-rw-r--r--profiles/default-linux/mips/cobalt/packages7
-rw-r--r--profiles/default-linux/mips/cobalt/parent5
-rw-r--r--profiles/default-linux/mips/cobalt/use.mask4
-rw-r--r--profiles/default-linux/mips/cobalt/virtuals6
-rw-r--r--profiles/default-linux/mips/mips64/2004.2/make.defaults32
-rw-r--r--profiles/default-linux/mips/mips64/2004.2/packages10
-rw-r--r--profiles/default-linux/mips/mips64/2004.2/parent3
-rw-r--r--profiles/default-linux/mips/mips64/2005.0/make.defaults6
-rw-r--r--profiles/default-linux/mips/mips64/2005.0/packages2
-rw-r--r--profiles/default-linux/mips/mips64/2005.0/parent3
-rw-r--r--profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults6
-rw-r--r--profiles/default-linux/mips/mips64/ip28/2005.0/packages2
-rw-r--r--profiles/default-linux/mips/mips64/ip28/2005.0/parent3
-rw-r--r--profiles/default-linux/mips/mips64/ip28/parent3
-rw-r--r--profiles/default-linux/mips/mips64/multilib/2005.1/make.defaults2
-rw-r--r--profiles/default-linux/mips/mips64/multilib/2005.1/parent3
-rw-r--r--profiles/default-linux/mips/mips64/multilib/make.defaults2
-rw-r--r--profiles/default-linux/mips/mips64/multilib/parent3
-rw-r--r--profiles/default-linux/mips/mips64/multilib/profile.bashrc2
-rw-r--r--profiles/default-linux/mips/mips64/multilib/use.mask2
-rw-r--r--profiles/default-linux/mips/mips64/n32/2004.2/make.defaults42
-rw-r--r--profiles/default-linux/mips/mips64/n32/2004.2/packages16
-rw-r--r--profiles/default-linux/mips/mips64/n32/2004.2/parent3
-rw-r--r--profiles/default-linux/mips/mips64/n32/2005.0/make.defaults10
-rw-r--r--profiles/default-linux/mips/mips64/n32/2005.0/packages20
-rw-r--r--profiles/default-linux/mips/mips64/n32/2005.0/parent3
-rw-r--r--profiles/default-linux/mips/mips64/n32/parent3
-rw-r--r--profiles/default-linux/mips/mips64/parent3
-rw-r--r--profiles/default-linux/mips/packages13
-rw-r--r--profiles/default-linux/mips/parent3
-rw-r--r--profiles/default-linux/mips/use.mask131
-rw-r--r--profiles/default-linux/mips/virtuals18
-rw-r--r--profiles/default-linux/packages12
-rw-r--r--profiles/default-linux/packages.build16
-rw-r--r--profiles/default-linux/parent8
-rw-r--r--profiles/default-linux/ppc/1.0/deprecated5
-rw-r--r--profiles/default-linux/ppc/1.0/make.defaults35
-rw-r--r--profiles/default-linux/ppc/1.0/packages243
-rw-r--r--profiles/default-linux/ppc/1.0/parent7
-rw-r--r--profiles/default-linux/ppc/1.0/use.mask3
-rw-r--r--profiles/default-linux/ppc/1.0/virtuals60
-rw-r--r--profiles/default-linux/ppc/1.0_rc/deprecated5
-rw-r--r--profiles/default-linux/ppc/1.0_rc/make.defaults31
-rw-r--r--profiles/default-linux/ppc/1.0_rc/packages172
-rw-r--r--profiles/default-linux/ppc/1.0_rc/parent7
-rw-r--r--profiles/default-linux/ppc/1.0_rc/use.mask3
-rw-r--r--profiles/default-linux/ppc/1.0_rc/virtuals60
-rw-r--r--profiles/default-linux/ppc/1.2/deprecated5
-rw-r--r--profiles/default-linux/ppc/1.2/make.defaults35
-rw-r--r--profiles/default-linux/ppc/1.2/packages239
-rw-r--r--profiles/default-linux/ppc/1.2/parent7
-rw-r--r--profiles/default-linux/ppc/1.2/use.mask3
-rw-r--r--profiles/default-linux/ppc/1.2/virtuals60
-rw-r--r--profiles/default-linux/ppc/1.4/deprecated5
-rw-r--r--profiles/default-linux/ppc/1.4/make.defaults40
-rw-r--r--profiles/default-linux/ppc/1.4/packages120
-rw-r--r--profiles/default-linux/ppc/1.4/parent7
-rw-r--r--profiles/default-linux/ppc/1.4/use.mask46
-rw-r--r--profiles/default-linux/ppc/1.4/virtuals67
-rw-r--r--profiles/default-linux/ppc/2004.0/make.defaults40
-rw-r--r--profiles/default-linux/ppc/2004.0/packages97
-rw-r--r--profiles/default-linux/ppc/2004.0/parent7
-rw-r--r--profiles/default-linux/ppc/2004.0/use.mask43
-rw-r--r--profiles/default-linux/ppc/2004.0/virtuals64
-rw-r--r--profiles/default-linux/ppc/2004.1/make.defaults40
-rw-r--r--profiles/default-linux/ppc/2004.1/packages97
-rw-r--r--profiles/default-linux/ppc/2004.1/parent7
-rw-r--r--profiles/default-linux/ppc/2004.1/use.mask44
-rw-r--r--profiles/default-linux/ppc/2004.1/virtuals64
-rw-r--r--profiles/default-linux/ppc/2004.2/make.defaults40
-rw-r--r--profiles/default-linux/ppc/2004.2/packages97
-rw-r--r--profiles/default-linux/ppc/2004.2/parent7
-rw-r--r--profiles/default-linux/ppc/2004.2/use.mask46
-rw-r--r--profiles/default-linux/ppc/2004.2/virtuals65
-rw-r--r--profiles/default-linux/ppc/2004.3/make.defaults22
-rw-r--r--profiles/default-linux/ppc/2004.3/packages2
-rw-r--r--profiles/default-linux/ppc/2004.3/use.mask7
-rw-r--r--profiles/default-linux/ppc/2004.3/virtuals10
-rw-r--r--profiles/default-linux/ppc/2005.0/make.defaults13
-rw-r--r--profiles/default-linux/ppc/2005.0/packages2
-rw-r--r--profiles/default-linux/ppc/2005.0/use.mask7
-rw-r--r--profiles/default-linux/ppc/2005.0/virtuals10
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc/G3/Pegasos/virtuals2
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc/G3/make.defaults2
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc/G4/Pegasos/virtuals2
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc/G4/make.defaults4
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc/make.defaults6
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc/use.mask8
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc/virtuals3
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/970/make.defaults4
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/make.defaults6
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/packages2
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power3/make.defaults2
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power4/make.defaults2
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power5/make.defaults2
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/virtuals3
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/970/make.defaults4
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/make.defaults10
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/package.mask2
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/packages3
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power3/make.defaults2
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power4/make.defaults2
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power5/make.defaults2
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/multilib/make.defaults10
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/multilib/packages4
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/multilib/profile.bashrc12
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/use.mask2
-rw-r--r--profiles/default-linux/ppc/2005.1/ppc64/virtuals5
-rw-r--r--profiles/default-linux/ppc/parent7
-rw-r--r--profiles/default-linux/ppc64/2004.3/make.defaults8
-rw-r--r--profiles/default-linux/ppc64/2004.3/packages6
-rw-r--r--profiles/default-linux/ppc64/2005.0/make.defaults15
-rw-r--r--profiles/default-linux/ppc64/2005.0/packages6
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/970/make.defaults4
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/970/pmac/packages2
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/no-multilib/make.defaults2
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/make.defaults2
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/packages2
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/use.mask2
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/no-multilib/package.mask2
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/no-multilib/packages2
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/no-multilib/profile.bashrc12
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/no-multilib/use.mask2
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/packages2
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/power3/make.defaults4
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/power4/make.defaults4
-rw-r--r--profiles/default-linux/ppc64/dev/2005.1/power5/make.defaults4
-rw-r--r--profiles/default-linux/ppc64/dev/multilib/make.defaults2
-rw-r--r--profiles/default-linux/ppc64/dev/multilib/no-multilib/make.defaults2
-rw-r--r--profiles/default-linux/ppc64/dev/multilib/no-multilib/package.mask2
-rw-r--r--profiles/default-linux/ppc64/dev/multilib/packages2
-rw-r--r--profiles/default-linux/ppc64/dev/multilib/use.mask2
-rw-r--r--profiles/default-linux/ppc64/make.defaults4
-rw-r--r--profiles/default-linux/ppc64/use.mask37
-rw-r--r--profiles/default-linux/ppc64/virtuals7
-rw-r--r--profiles/default-linux/s390/2004.3/make.defaults8
-rw-r--r--profiles/default-linux/s390/make.defaults15
-rw-r--r--profiles/default-linux/s390/packages4
-rw-r--r--profiles/default-linux/s390/use.mask45
-rw-r--r--profiles/default-linux/s390/virtuals8
-rw-r--r--profiles/default-linux/sh/make.defaults14
-rw-r--r--profiles/default-linux/sh/packages2
-rw-r--r--profiles/default-linux/sh/use.mask47
-rw-r--r--profiles/default-linux/sh/virtuals8
-rw-r--r--profiles/default-linux/sparc/make.defaults4
-rw-r--r--profiles/default-linux/sparc/packages44
-rw-r--r--profiles/default-linux/sparc/parent7
-rw-r--r--profiles/default-linux/sparc/sparc32/2004.3/deprecated4
-rw-r--r--profiles/default-linux/sparc/sparc32/2004.3/make.defaults15
-rw-r--r--profiles/default-linux/sparc/sparc32/2004.3/parent7
-rw-r--r--profiles/default-linux/sparc/sparc32/2005.0/make.defaults6
-rw-r--r--profiles/default-linux/sparc/sparc32/2005.0/package.mask17
-rw-r--r--profiles/default-linux/sparc/sparc32/2005.0/packages5
-rw-r--r--profiles/default-linux/sparc/sparc32/2005.0/parent2
-rw-r--r--profiles/default-linux/sparc/sparc32/2005.1/make.defaults4
-rw-r--r--profiles/default-linux/sparc/sparc32/2005.1/package.mask14
-rw-r--r--profiles/default-linux/sparc/sparc32/2005.1/packages3
-rw-r--r--profiles/default-linux/sparc/sparc32/2005.1/parent2
-rw-r--r--profiles/default-linux/sparc/sparc32/make.defaults38
-rw-r--r--profiles/default-linux/sparc/sparc32/parent3
-rw-r--r--profiles/default-linux/sparc/sparc32/use.mask48
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.2/deprecated4
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.2/make.defaults28
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.2/package.mask6
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.2/packages15
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.2/parent3
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.2/use.mask2
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.3/26headers/packages3
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.3/26headers/parent2
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.3/26headers/virtuals4
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.3/deprecated4
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.3/make.defaults23
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.3/package.mask58
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.3/packages18
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.3/parent2
-rw-r--r--profiles/default-linux/sparc/sparc64/2004.3/use.mask2
-rw-r--r--profiles/default-linux/sparc/sparc64/2005.0/make.defaults11
-rw-r--r--profiles/default-linux/sparc/sparc64/2005.0/package.mask72
-rw-r--r--profiles/default-linux/sparc/sparc64/2005.0/packages9
-rw-r--r--profiles/default-linux/sparc/sparc64/2005.0/parent2
-rw-r--r--profiles/default-linux/sparc/sparc64/2005.0/use.mask4
-rw-r--r--profiles/default-linux/sparc/sparc64/2005.1/make.defaults4
-rw-r--r--profiles/default-linux/sparc/sparc64/2005.1/package.mask10
-rw-r--r--profiles/default-linux/sparc/sparc64/2005.1/packages3
-rw-r--r--profiles/default-linux/sparc/sparc64/2005.1/parent2
-rw-r--r--profiles/default-linux/sparc/sparc64/2005.1/use.mask2
-rw-r--r--profiles/default-linux/sparc/sparc64/2006.0/make.defaults4
-rw-r--r--profiles/default-linux/sparc/sparc64/2006.0/package.mask157
-rw-r--r--profiles/default-linux/sparc/sparc64/2006.0/packages4
-rw-r--r--profiles/default-linux/sparc/sparc64/2006.0/parent2
-rw-r--r--profiles/default-linux/sparc/sparc64/2006.0/use.mask4
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/make.defaults3
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/package.mask6
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/parent3
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/multilib/README12
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/multilib/make.defaults7
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/multilib/package.mask19
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/multilib/packages9
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/multilib/parent5
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/multilib/virtuals4
-rw-r--r--profiles/default-linux/sparc/sparc64/make.defaults18
-rw-r--r--profiles/default-linux/sparc/sparc64/packages2
-rw-r--r--profiles/default-linux/sparc/sparc64/parent3
-rw-r--r--profiles/default-linux/sparc/sparc64/server/make.defaults2
-rw-r--r--profiles/default-linux/sparc/sparc64/server/package.mask65
-rw-r--r--profiles/default-linux/sparc/sparc64/server/packages3
-rw-r--r--profiles/default-linux/sparc/sparc64/server/parent2
-rw-r--r--profiles/default-linux/sparc/sparc64/server/use.mask2
-rw-r--r--profiles/default-linux/sparc/sparc64/use.mask9
-rw-r--r--profiles/default-linux/sparc/use.mask98
-rw-r--r--profiles/default-linux/sparc/virtuals63
-rw-r--r--profiles/default-linux/use.defaults6
-rw-r--r--profiles/default-linux/use.mask44
-rw-r--r--profiles/default-linux/virtuals11
-rw-r--r--profiles/default-linux/x86/2004.0/deprecated13
-rw-r--r--profiles/default-linux/x86/2004.0/make.defaults26
-rw-r--r--profiles/default-linux/x86/2004.0/packages7
-rw-r--r--profiles/default-linux/x86/2004.0/parent6
-rw-r--r--profiles/default-linux/x86/2004.2/deprecated13
-rw-r--r--profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults20
-rw-r--r--profiles/default-linux/x86/2004.2/gcc34/2.6/packages1
-rw-r--r--profiles/default-linux/x86/2004.2/gcc34/2.6/parent2
-rw-r--r--profiles/default-linux/x86/2004.2/gcc34/2.6/virtuals5
-rw-r--r--profiles/default-linux/x86/2004.2/gcc34/make.defaults21
-rw-r--r--profiles/default-linux/x86/2004.2/gcc34/packages79
-rw-r--r--profiles/default-linux/x86/2004.2/gcc34/parent2
-rw-r--r--profiles/default-linux/x86/2004.2/make.defaults26
-rw-r--r--profiles/default-linux/x86/2004.2/packages5
-rw-r--r--profiles/default-linux/x86/2004.2/parent2
-rw-r--r--profiles/default-linux/x86/2004.3/deprecated13
-rw-r--r--profiles/default-linux/x86/2004.3/make.defaults19
-rw-r--r--profiles/default-linux/x86/2004.3/package.mask1
-rw-r--r--profiles/default-linux/x86/2004.3/packages5
-rw-r--r--profiles/default-linux/x86/2004.3/parent2
-rw-r--r--profiles/default-linux/x86/2005.0/2.4/deprecated10
-rw-r--r--profiles/default-linux/x86/2005.0/2.4/packages28
-rw-r--r--profiles/default-linux/x86/2005.0/2.4/parent2
-rw-r--r--profiles/default-linux/x86/2005.0/2.4/use.mask2
-rw-r--r--profiles/default-linux/x86/2005.0/2.4/virtuals3
-rw-r--r--profiles/default-linux/x86/2005.0/make.defaults21
-rw-r--r--profiles/default-linux/x86/2005.0/packages17
-rw-r--r--profiles/default-linux/x86/2005.0/parent2
-rw-r--r--profiles/default-linux/x86/2005.1/2.4/deprecated13
-rw-r--r--profiles/default-linux/x86/2005.1/2.4/packages2
-rw-r--r--profiles/default-linux/x86/2005.1/2.4/parent2
-rw-r--r--profiles/default-linux/x86/2005.1/2.4/use.mask2
-rw-r--r--profiles/default-linux/x86/2005.1/2.4/virtuals2
-rw-r--r--profiles/default-linux/x86/2005.1/make.defaults4
-rw-r--r--profiles/default-linux/x86/2005.1/packages7
-rw-r--r--profiles/default-linux/x86/2005.1/parent2
-rw-r--r--profiles/default-linux/x86/dev/2006.0/make.defaults6
-rw-r--r--profiles/default-linux/x86/dev/2006.0/packages2
-rw-r--r--profiles/default-linux/x86/dev/2006.0/parent4
-rw-r--r--profiles/default-linux/x86/gcc2/make.defaults16
-rw-r--r--profiles/default-linux/x86/gcc2/package.mask10
-rw-r--r--profiles/default-linux/x86/gcc2/packages32
-rw-r--r--profiles/default-linux/x86/gcc2/packages.build10
-rw-r--r--profiles/default-linux/x86/gcc2/parent6
-rw-r--r--profiles/default-linux/x86/gcc31/deprecated13
-rw-r--r--profiles/default-linux/x86/gcc31/make.defaults21
-rw-r--r--profiles/default-linux/x86/gcc31/packages22
-rw-r--r--profiles/default-linux/x86/gcc31/parent6
-rw-r--r--profiles/default-linux/x86/make.defaults69
-rw-r--r--profiles/default-linux/x86/packages14
-rw-r--r--profiles/default-linux/x86/parent7
-rw-r--r--profiles/default-linux/x86/use.mask25
-rw-r--r--profiles/default-linux/x86/virtuals9
-rw-r--r--profiles/default-linux/x86/xbox/make.defaults18
-rw-r--r--profiles/default-linux/x86/xbox/packages5
-rw-r--r--profiles/default-linux/x86/xbox/parent3
-rw-r--r--profiles/default-linux/x86/xbox/virtuals2
365 files changed, 2626 insertions, 3433 deletions
diff --git a/profiles/default-linux/alpha/2004.3/deprecated b/profiles/default-linux/alpha/2004.3/deprecated
index f5e91112e334..69babf06c572 100644
--- a/profiles/default-linux/alpha/2004.3/deprecated
+++ b/profiles/default-linux/alpha/2004.3/deprecated
@@ -1,15 +1,16 @@
default-linux/alpha/2005.0
+# Gentoo has switched to 2.6 as the defaults for headers/kernels. If you wish
+# to use 2.4 headers/kernels, then you should do the following to upgrade:
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/alpha/2005.0 make.profile
+# ln -s ../usr/portage/profiles/default-linux/alpha/2005.0/2.4 make.profile
-# Gentoo has switched to 2.6 as the defaults for headers/kernels. If you wish
-# to use 2.4 headers/kernels, then you should do the following to upgrade:
+# If you wish to use the default 2.6 kernel, do the following:
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/alpha/2005.0/2.4 make.profile
+# ln -s ../usr/portage/profiles/default-linux/alpha/2005.0 make.profile
# More information can be found at the following URLs:
# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/default-linux/alpha/2004.3/make.defaults b/profiles/default-linux/alpha/2004.3/make.defaults
index dae7b740604e..af241d9476bb 100644
--- a/profiles/default-linux/alpha/2004.3/make.defaults
+++ b/profiles/default-linux/alpha/2004.3/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2004.3/make.defaults,v 1.1 2004/09/21 14:21:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2004.3/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
#
# System-wide defaults for the Portage system
# See portage(5) manpage
@@ -13,7 +13,6 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurs
# pulled in during *emerge system*!
USE="
-alpha
arts
avi
berkdb
@@ -21,6 +20,8 @@ bitmap-fonts
crypt
cups
encode
+fortran
+font-server
foomaticdb
gdbm
gif
@@ -50,15 +51,15 @@ qt
quicktime
readline
sdl
-slang
spell
ssl
tcpd
truetype
+truetype-fonts
+type1-fonts
X
xml2
xmms
-xprint
xv
zlib
"
diff --git a/profiles/default-linux/alpha/2004.3/parent b/profiles/default-linux/alpha/2004.3/parent
index d2c7059f62f3..3e46fb8c9ad7 100644
--- a/profiles/default-linux/alpha/2004.3/parent
+++ b/profiles/default-linux/alpha/2004.3/parent
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2004.3/parent,v 1.1 2004/09/21 14:21:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2004.3/parent,v 1.1.1.1 2005/11/30 09:48:36 chriswhite 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/alpha/2005.0/2.4/packages b/profiles/default-linux/alpha/2005.0/2.4/packages
index 71c2343d7b00..8c5de2cf215e 100644
--- a/profiles/default-linux/alpha/2005.0/2.4/packages
+++ b/profiles/default-linux/alpha/2005.0/2.4/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2005.0/2.4/packages,v 1.1 2005/01/20 21:10:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2005.0/2.4/packages,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
@@ -11,11 +11,8 @@
# You can also add files to the base system itself if you prefix them with a
# *
-<sys-kernel/ac-sources-2.5
-<sys-kernel/alpha-sources-2.5
<sys-kernel/ck-sources-2.5
<sys-kernel/gentoo-sources-2.5
-<sys-kernel/grsec-sources-2.5
<sys-kernel/hardened-sources-2.5
<sys-kernel/openmosix-sources-2.5
<sys-kernel/rsbac-sources-2.5
@@ -25,3 +22,5 @@
<sys-kernel/win4lin-sources-2.5
<sys-kernel/linux-headers-2.5
+
+->=sys-kernel/linux-headers-2.5
diff --git a/profiles/default-linux/alpha/2005.0/2.4/parent b/profiles/default-linux/alpha/2005.0/2.4/parent
index 0dfd34d92857..18a1794a8dbc 100644
--- a/profiles/default-linux/alpha/2005.0/2.4/parent
+++ b/profiles/default-linux/alpha/2005.0/2.4/parent
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2005.0/2.4/parent,v 1.1 2005/01/20 21:10:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2005.0/2.4/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/alpha/2005.0/2.4/virtuals b/profiles/default-linux/alpha/2005.0/2.4/virtuals
index 482885f45def..d93869b0b47d 100644
--- a/profiles/default-linux/alpha/2005.0/2.4/virtuals
+++ b/profiles/default-linux/alpha/2005.0/2.4/virtuals
@@ -1,5 +1,5 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2005.0/2.4/virtuals,v 1.1 2005/01/20 21:10:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2005.0/2.4/virtuals,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
-virtual/linux-sources sys-kernel/vanilla-sources
+virtual/dev-manager sys-fs/devfsd
diff --git a/profiles/default-linux/alpha/2005.0/parent b/profiles/default-linux/alpha/2005.0/parent
index 1de82d8a7450..6b6be20769e5 100644
--- a/profiles/default-linux/alpha/2005.0/parent
+++ b/profiles/default-linux/alpha/2005.0/parent
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2005.0/parent,v 1.1 2005/01/20 21:07:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2005.0/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/alpha/2005.0/virtuals b/profiles/default-linux/alpha/2005.0/virtuals
index 16fd77352a06..7a1333396f08 100644
--- a/profiles/default-linux/alpha/2005.0/virtuals
+++ b/profiles/default-linux/alpha/2005.0/virtuals
@@ -1,5 +1,5 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2005.0/virtuals,v 1.1 2005/01/20 21:07:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2005.0/virtuals,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
virtual/linux-sources sys-kernel/vanilla-sources
diff --git a/profiles/default-linux/alpha/make.defaults b/profiles/default-linux/alpha/make.defaults
index b16d2d0d5d8f..b00905d4886b 100644
--- a/profiles/default-linux/alpha/make.defaults
+++ b/profiles/default-linux/alpha/make.defaults
@@ -1,9 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/make.defaults,v 1.1 2005/03/05 16:34:58 wolf31o2 Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
+
+ARCH="alpha"
+ACCEPT_KEYWORDS="alpha"
+
+CHOST="alpha-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
@@ -12,60 +16,4 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
# has a conditional dependency on java (which it does,) then a JDK will be
# pulled in during *emerge system*!
-USE="
-alpha
-arts
-avi
-berkdb
-bitmap-fonts
-crypt
-cups
-encode
-fortran
-f77
-font-server
-foomaticdb
-gdbm
-gif
-gnome
-gpm
-gtk
-gtk2
-imlib
-jpeg
-kde
-libg++
-libwww
-mad
-mikmod
-motif
-mpeg
-mp3
-ncurses
-nls
-oggvorbis
-opengl
-oss
-pam
-pdflib
-png
-python
-qt
-quicktime
-readline
-sdl
-spell
-ssl
-tcpd
-truetype
-truetype-fonts
-type1-fonts
-X
-xml2
-xmms
-xv
-zlib
-"
-
-ARCH="alpha"
-ACCEPT_KEYWORDS="alpha"
+USE="arts avi berkdb bitmap-fonts crypt cups eds encode fortran font-server foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libg++ libwww mad mikmod motif mpeg mp3 ncurses nls ogg oggvorbis opengl oss pam pdflib png python qt quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml2 xmms xv zlib"
diff --git a/profiles/default-linux/alpha/package.mask b/profiles/default-linux/alpha/package.mask
index 26c594c09067..e69de29bb2d1 100644
--- a/profiles/default-linux/alpha/package.mask
+++ b/profiles/default-linux/alpha/package.mask
@@ -1,4 +0,0 @@
-## Fernando J. Pereda <ferdy@gentoo.org>
-# cannot mark stable because of gnomemm stuff
-# wrt bug #92494
-app-cdr/cdrdao
diff --git a/profiles/default-linux/alpha/packages b/profiles/default-linux/alpha/packages
index c2a7f1bf0fa2..6b57bc6d3074 100644
--- a/profiles/default-linux/alpha/packages
+++ b/profiles/default-linux/alpha/packages
@@ -1,7 +1,6 @@
-# Copyright 2001-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /home/cvsroot/gentoo-x86/profiles/default/x86/2004.0/packages,v
-# 1.2 2004/03/18 00:16:43 seemant Exp $
+# Copyright 2001-2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/packages,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
@@ -12,15 +11,6 @@
# You can also add files to the base system itself if you prefix them with a
# *
-
-*sys-libs/pwdb
-
->=app-admin/sysklogd-1.4.1
-<sys-apps/shadow-5
->=sys-apps/texinfo-4.2-r5
->=sys-devel/automake-1.6.1-r6
>=sys-devel/binutils-2.13.90.0.4
->=sys-devel/libtool-1.4.1-r9
->=sys-libs/ncurses-5.2.20020112a
->=sys-libs/pam-0.75-r9
->=x11-base/xfree-4.2.1
+>=sys-devel/gcc-3.2
+>=sys-libs/glibc-2.2.5-r7
diff --git a/profiles/default-linux/alpha/parent b/profiles/default-linux/alpha/parent
index d5f6b3b3c012..ad633556369d 100644
--- a/profiles/default-linux/alpha/parent
+++ b/profiles/default-linux/alpha/parent
@@ -1,8 +1,7 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/alpha/use.mask b/profiles/default-linux/alpha/use.mask
index c2e1a51d3ffd..0aa84af0299e 100644
--- a/profiles/default-linux/alpha/use.mask
+++ b/profiles/default-linux/alpha/use.mask
@@ -1,9 +1,116 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/use.mask,v 1.1 2004/03/23 23:04:04 jmaynard Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/use.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# This file masks out USE flags that are simply NOT allowed in the default
# profile for any architecture. This works, for example, if a non-default
# profile (such as the selinux profiles) have a USE flag associated with
# them.
+# These will probably never be supported, for obvious reasons (wrong arch)
+icc
+icc-pgo
+svga
+
+# These are debatable, since technically an alpha could support this hardware
+pcmcia
+3dfx
+
+# avifile is broken atm
+avi
+
+# No hardware to test
+pda
+
+# Can't get USB working to test
+gphoto2
+
+# No apm support on alpha
+apm
+
+# alpha doesn't have java support other than compaq-j*, which isn't a
+# current version. must mask this to keep things sane
+java
+java-internal
+java-external
+
+# firebird appears to be x86-only (the db, not the browser)
+firebird
+
+# tcc is x86-only
+tcc
+
+# I don't think that openafs really works on other architectures,
+# despite some internal Gentoo efforts (mine) to port it
+afs
+uclibc
+
+# 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
+db2
+dbmaker
+empress
+empress-bcs
+esoob
+filepro
+frontbase
+hyperwave
+informix
+ingres
+oracle7
+oci8
+pfpro
+solid
+sybase
+sybase-ct
+
+hardened
+hal
+howl
+jack
+freetts
+djbfft
+lm_sensors
+
+gnustep
+
+# Mask intel fortran compiler
+ifc
+
+emboss
+
+# Mask vpopmail until net-mail/vpopmail goes out of package.mask
+vpopmail
+
+# Mask pyste until gccxml / elementtree work on alpha
+pyste
+
+# Mask mono for further testing
+mono
+
+# can't test wireless currently
+wifi
+
+# dbus is not currently supported by alpha
+dbus
+
+# apache segfaults when using mpm-peruser (bug 105778)
+mpm-peruser
+
+pike
+
+fdftk
+
+timidity
+
+# We don't have any virtual/mpi (bug 111807)
+mpi
+
+# masks required for asterisk
+pri
+zaptel
diff --git a/profiles/default-linux/alpha/virtuals b/profiles/default-linux/alpha/virtuals
index 34d16a64b323..ade966c7ea95 100644
--- a/profiles/default-linux/alpha/virtuals
+++ b/profiles/default-linux/alpha/virtuals
@@ -1,10 +1,8 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/virtuals,v 1.1 2004/03/23 23:04:04 jmaynard Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/virtuals,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
-# This file is used to either override or extend the parent profile's
-# virtuals mappings. In this case, this is for ARCHITECTURE SPECIFIC
-# mappings
-
-virtual/bootloader sys-boot/aboot
-virtual/linux-sources sys-kernel/alpha-sources
+virtual/alsa sys-kernel/vanilla-sources
+virtual/bootloader sys-boot/aboot
+virtual/jre dev-java/compaq-jre
+virtual/jdk dev-java/compaq-jdk
diff --git a/profiles/default-linux/amd64/2004.3/lib64/make.defaults b/profiles/default-linux/amd64/2004.3/lib64/make.defaults
index b0172236dda6..1d4bfcd5e436 100644
--- a/profiles/default-linux/amd64/2004.3/lib64/make.defaults
+++ b/profiles/default-linux/amd64/2004.3/lib64/make.defaults
@@ -1,35 +1,22 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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/2004.3/lib64/make.defaults,v 1.1 2004/09/09 03:53:00 lv Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-
-ARCH="amd64"
-ACCEPT_KEYWORDS="${ARCH}"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/lib64/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# GCC 3.4.2 has multilib enabled by default, but we still need multilib in USE
# for compatibility
-GRP_STAGE23_USE="${ARCH} ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses multilib readline zlib erandom -java -nptl"
+GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses multilib readline zlib -java -nptl"
# Sane, functional, almost-but-not-quite-minimal default for USE
-USE="${GRP_STAGE23_USE} oss alsa crypt jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xprint xrandr xv"
-
-# unfortunately, gcc doesnt provide is with an -march=x86_64.
-CFLAGS="-O2 -pipe -march=k8"
-CXXFLAGS="${CFLAGS}"
+USE="${GRP_STAGE23_USE} bitmap-fonts truetype-fonts type1-fonts font-server oss alsa crypt fortran jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
-ARCH="amd64"
-CHOST="x86_64-pc-linux-gnu"
+# we can enable sandbox now that we use multilib by default
+FEATURES="sandbox autoconfig"
-# currently theoretical multilib stuff only available if using portage 2.0.51
-CHOST32="i686-pc-linux-gnu"
-CONF_MULTILIBDIR="lib32"
CONF_LIBDIR="lib64"
+CONF_MULTILIBDIR="lib32"
-CC32="gcc32"
-CPP32="g++32"
-
-# we can enable sandbox now that we use multilib by default
-FEATURES="sandbox"
-
+# If FEATURES="multilib-strict" on newer portages (see bug #75420), emerge
+# will die if we try installing 64bit libs into a lib dir. This should
+# help us squash bugs for future correct multilib support.
+MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib"
+MULTILIB_STRICT_DENY="64-bit.*shared object"
diff --git a/profiles/default-linux/amd64/2004.3/lib64/packages b/profiles/default-linux/amd64/2004.3/lib64/packages
index 250c8781fa7c..f56336b388a7 100644
--- a/profiles/default-linux/amd64/2004.3/lib64/packages
+++ b/profiles/default-linux/amd64/2004.3/lib64/packages
@@ -6,6 +6,3 @@
>=sys-apps/sysklogd-1.4.1
>dev-lang/gpc-2.1
-
-*app-portage/gentoolkit
-
diff --git a/profiles/default-linux/amd64/2004.3/lib64/parent b/profiles/default-linux/amd64/2004.3/lib64/parent
index 74853ef4eaaf..521b416dd0d1 100644
--- a/profiles/default-linux/amd64/2004.3/lib64/parent
+++ b/profiles/default-linux/amd64/2004.3/lib64/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/lib64/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/2004.3/make.defaults b/profiles/default-linux/amd64/2004.3/make.defaults
index faa9937a2c37..54fb423ad04a 100644
--- a/profiles/default-linux/amd64/2004.3/make.defaults
+++ b/profiles/default-linux/amd64/2004.3/make.defaults
@@ -1,37 +1,13 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/make.defaults,v 1.1 2004/09/09 03:10:58 lv Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-
-ARCH="amd64"
-ACCEPT_KEYWORDS="${ARCH}"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# GCC 3.4.2 has multilib enabled by default, but we still need multilib in USE
-# for compatibility
-GRP_STAGE23_USE="${ARCH} ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses multilib readline zlib erandom -java -nptl"
-
-# Sane, functional, almost-but-not-quite-minimal default for USE
-USE="${GRP_STAGE23_USE} oss alsa crypt jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xprint xrandr xv"
-
-# unfortunately, gcc doesnt provide is with an -march=x86_64.
-CFLAGS="-O2 -pipe -march=k8"
-CXXFLAGS="${CFLAGS}"
-
-ARCH="amd64"
-CHOST="x86_64-pc-linux-gnu"
-
-# currently theoretical multilib stuff only available if using portage 2.0.51
-CHOST32="i686-pc-linux-gnu"
-CONF_MULTILIBDIR="lib32"
-# until everything in the tree understands $(get_libdir), the only sand
-# default for this is lib.
-CONF_LIBDIR="lib"
-
-CC32="gcc32"
-CPP32="g++32"
+# for compatibility. also, without this we might actually fail to build stages.
+STAGE1_USE="multilib"
# we can enable sandbox now that we use multilib by default
-FEATURES="sandbox"
+FEATURES="sandbox autoconfig"
+CONF_LIBDIR="lib"
+CONF_MULTILIBDIR="lib32"
diff --git a/profiles/default-linux/amd64/2004.3/package.mask b/profiles/default-linux/amd64/2004.3/package.mask
index 4fe71a354361..314ec6611464 100644
--- a/profiles/default-linux/amd64/2004.3/package.mask
+++ b/profiles/default-linux/amd64/2004.3/package.mask
@@ -1,2 +1,8 @@
# needs gcc-3.3.3
=dev-lang/gpc-20040516
+
+# We need to keep emul-glibc up to date for the upgrade process to work, so
+# 2.3.5 will be the last glibc release supported under 2004.3 unless someone
+# wants to volunteer maintaining emul-glibc until 2004.3 is removed from
+# portage.
+>=sys-libs/glibc-2.3.5.20050421
diff --git a/profiles/default-linux/amd64/2004.3/packages b/profiles/default-linux/amd64/2004.3/packages
index 250c8781fa7c..d52556adcebd 100644
--- a/profiles/default-linux/amd64/2004.3/packages
+++ b/profiles/default-linux/amd64/2004.3/packages
@@ -1,11 +1,5 @@
*>=sys-apps/baselayout-1.9.4
-*>=sys-apps/portage-2.0.50-r10
+*>=sys-apps/portage-2.0.51
*>=sys-devel/binutils-2.15.90.0.1.1-r1
*>=sys-devel/gcc-3.3.4
*>=sys-libs/glibc-2.3.4.20040619-r1
-
->=sys-apps/sysklogd-1.4.1
->dev-lang/gpc-2.1
-
-*app-portage/gentoolkit
-
diff --git a/profiles/default-linux/amd64/2004.3/parent b/profiles/default-linux/amd64/2004.3/parent
index 74853ef4eaaf..2cbcd03e91f1 100644
--- a/profiles/default-linux/amd64/2004.3/parent
+++ b/profiles/default-linux/amd64/2004.3/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/2004.3/profile.bashrc b/profiles/default-linux/amd64/2004.3/profile.bashrc
index 61a4f7cec841..0a0f2cdd5dcb 100644
--- a/profiles/default-linux/amd64/2004.3/profile.bashrc
+++ b/profiles/default-linux/amd64/2004.3/profile.bashrc
@@ -1,8 +1,13 @@
-# 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
+# currently theoretical multilib stuff only available if using portage 2.0.51
+CHOST32="i686-pc-linux-gnu"
+CONF_MULTILIBDIR="${CONF_MULTILIBDIR:=lib32}"
+# until everything in the tree understands $(get_libdir), the only sane
+# default for this is lib.
+CONF_LIBDIR="${CONF_LIBDIR:=lib}"
+ARCH_WRAPPER="linux32"
+CC32="gcc32"
+CPP32="g++32"
+
setup_multilib_variables() {
# if run via linux32, uname -m will always return i686
@@ -27,3 +32,15 @@ setup_multilib_variables() {
}
[ "${CCHOST}" == "" -o "${CCHOST}" == "${CHOST}" -o "${CCHOST}" == "${CHOST32}" ] && setup_multilib_variables
+[ "${CONF_MULTILIBDIR}" == "lib" -a "${CONF_LIBDIR}" == "lib64" ] && SKIP_MULTILIB_HACK="YES"
+
+
+# spec switching support only available in gcc 3.4.2-r1 and later
+if [ -n "${USE_SPECS}" ] ; then
+ GCC_VER="$(${CC:=gcc} -dumpversion)"
+ SPECSLOC="/usr/lib/gcc-lib/${CHOST}/${GCC_VER}/"
+ if [ -f ${SPECSLOC}/${USE_SPECS}.specs ] ; then
+ export GCC_SPECS="${SPECSLOC}/${USE_SPECS}.specs"
+ fi
+fi
+
diff --git a/profiles/default-linux/amd64/2004.3/use.mask b/profiles/default-linux/amd64/2004.3/use.mask
index a6f8fea78f30..6ccb51601bb6 100644
--- a/profiles/default-linux/amd64/2004.3/use.mask
+++ b/profiles/default-linux/amd64/2004.3/use.mask
@@ -1,2 +1,2 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/use.mask,v 1.1 2005/01/23 11:15:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/use.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
-multilib
diff --git a/profiles/default-linux/amd64/2005.0/README b/profiles/default-linux/amd64/2005.0/README
index 1e2d99fc1834..bda8cc4c76a5 100644
--- a/profiles/default-linux/amd64/2005.0/README
+++ b/profiles/default-linux/amd64/2005.0/README
@@ -1,3 +1,8 @@
-1) emerge -v '>=sys-apps/portage-2.0.51-r9'
-1) emerge unmerge app-emulation/emul-linux-x86-glibc
+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/make.defaults b/profiles/default-linux/amd64/2005.0/make.defaults
index 05ac349253c7..695ae1604630 100644
--- a/profiles/default-linux/amd64/2005.0/make.defaults
+++ b/profiles/default-linux/amd64/2005.0/make.defaults
@@ -1,25 +1,37 @@
# 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.1 2005/01/08 20:18:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
-STAGE1_USE="multilib"
-GRP_STAGE23_USE="${STAGE1_USE} multislot ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses readline zlib -java -nptl"
-USE="${GRP_STAGE23_USE} bitmap-fonts truetype-fonts type1-fonts oss alsa crypt fortran f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
+#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"
-MULTILIB_ABIS="amd64 x86"
+MULTILIB_ABIS="x86 amd64"
DEFAULT_ABI="amd64"
-CFLAGS_amd64="-m64"
+#CFLAGS_amd64="-m64"
+#LDFLAGS_amd64="-m elf_x86_64"
+CHOST_amd64="x86_64-pc-linux-gnu"
+CDEFINE_amd64="__x86_64__"
LIBDIR_amd64="lib64"
-CFLAGS_x86="-m32"
+# 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"
+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)"
+
+# Hack to tell baselayout to use symlinks for /lib, /usr/lib, and /usr/local/lib
+SYMLINK_LIB="yes"
diff --git a/profiles/default-linux/amd64/2005.0/no-multilib/make.defaults b/profiles/default-linux/amd64/2005.0/no-multilib/make.defaults
index a9f0c6386300..6c2585e2423b 100644
--- a/profiles/default-linux/amd64/2005.0/no-multilib/make.defaults
+++ b/profiles/default-linux/amd64/2005.0/no-multilib/make.defaults
@@ -1,5 +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/2005.0/no-multilib/make.defaults,v 1.1 2005/01/28 01:36:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/no-multilib/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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
index 18021a9a4daa..aeca876d5d9a 100644
--- a/profiles/default-linux/amd64/2005.0/no-multilib/package.mask
+++ b/profiles/default-linux/amd64/2005.0/no-multilib/package.mask
@@ -1,18 +1,70 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/no-multilib/package.mask,v 1.1 2005/01/28 01:36:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/no-multilib/package.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# Mask multilib amd64 things
+app-antivirus/bitdefender-console
+app-arch/rar
+app-benchmarks/cpuburn
+app-cdr/cdrecord-prodvd
+app-emulation/cedaga
+app-emulation/crossover-office-bin
+app-emulation/winex-transgaming
+app-office/mozilla-sunbird-bin
+app-office/openoffice-bin
+app-office/openoffice-ximian-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/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
+games-arcade/barbarian-bin
+games-emulation/nestra
+games-emulation/snes9x
+games-emulation/zsnes
+games-fps/americas-army
+games-fps/doom3-demo
games-fps/doom3
-games-fps/quake3
-net-www/opera
-net-www/mozilla-bin
-net-www/mozilla-firefox-bin
+games-fps/enemy-territory
+games-fps/postal2mpdemo
+games-fps/quake3-bin
+games-fps/rtcw
+games-fps/vendetta-online-bin
+games-rpg/nwn
+games-rpg/nwn-cep
+games-server/nwn-ded
+media-libs/win32codecs
+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/mplayer-bin
+media-video/realplayer
+net-im/aim
+net-im/skype
+net-im/ymessenger
+net-www/netscape-flash
+sci-biology/foldingathome
+sys-apps/memtest86
+sys-apps/memtest86+
+sys-boot/grub
+www-client/opera
+www-client/mozilla-bin
+www-client/mozilla-firefox-bin
+
+-<media-video/nvidia-glx-1.0.6629-r3
diff --git a/profiles/default-linux/amd64/2005.0/no-multilib/parent b/profiles/default-linux/amd64/2005.0/no-multilib/parent
index 6b0271ae1579..8b38ed9c12c9 100644
--- a/profiles/default-linux/amd64/2005.0/no-multilib/parent
+++ b/profiles/default-linux/amd64/2005.0/no-multilib/parent
@@ -1,7 +1,6 @@
# Copyright 2004-2005 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/no-multilib/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/2005.0/package.mask b/profiles/default-linux/amd64/2005.0/package.mask
index d6813c1297ff..febbbe1b5891 100644
--- a/profiles/default-linux/amd64/2005.0/package.mask
+++ b/profiles/default-linux/amd64/2005.0/package.mask
@@ -1,25 +1,41 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/package.mask,v 1.1 2005/01/08 20:18:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/package.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
-# multilib aware versions (install to / look in proper $(get_libdir))
-<app-editors/emacs-21.3-r5
-<dev-lang/tcl-8.4.6-r1
-<dev-lang/tk-8.4.6-r1
-<dev-tcltk/expect-5.42.1
-<net-libs/courier-authlib-0.52
+# 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>
-# Force binutils-config versions of binutils
-=sys-devel/binutils-2.15.90.0.3-r3
-=sys-devel/binutils-2.15.91.0.1
-=sys-devel/binutils-2.15.91.0.2
-=sys-devel/binutils-2.15.92.0.2-r1
+# 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>
-# Don't use packages which do ugly symlink hackery for lib/lib64
-=x11-libs/qt-2.3.2-r1
-~x11-libs/qt-3.2.3
-~x11-libs/qt-3.3.1
-~x11-libs/qt-3.3.2
-=x11-libs/qt-3.3.3
-=x11-libs/qt-3.3.3-r1
+# These are provided by non-emul packages now
+-=app-emulation/emul-linux-x86-glibc-1000
+<app-emulation/emul-linux-x86-glibc-1000
+app-emulation/emul-linux-x86-nvidia
+<media-video/nvidia-glx-1.0.6629-r3
+
+# 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
index 6895849cfd38..16439823765a 100644
--- a/profiles/default-linux/amd64/2005.0/packages
+++ b/profiles/default-linux/amd64/2005.0/packages
@@ -1,16 +1,14 @@
# 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.1 2005/01/08 20:18:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/packages,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
-*>=sys-devel/binutils-2.15.90.0.1.1-r4
-*>=sys-devel/gcc-3.4.3-r1
+*>=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-r9
+*>=sys-apps/portage-2.0.51-r13
*>=sys-devel/gcc-config-1.3.9
>=sys-devel/distcc-2.18.3-r1
-# Don't use packages which do ugly symlink hackery for lib/lib64
-*>=sys-apps/baselayout-1.11.8-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
index 6b0271ae1579..5b468d83fada 100644
--- a/profiles/default-linux/amd64/2005.0/parent
+++ b/profiles/default-linux/amd64/2005.0/parent
@@ -1,7 +1,6 @@
# Copyright 2004-2005 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/2005.0/profile.bashrc b/profiles/default-linux/amd64/2005.0/profile.bashrc
index ca83def53f26..e3013d63c59a 100644
--- a/profiles/default-linux/amd64/2005.0/profile.bashrc
+++ b/profiles/default-linux/amd64/2005.0/profile.bashrc
@@ -1,20 +1,22 @@
-# The version of profile in our 'packages' does not yet set ABI for us.
+# 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
-for dir in /lib /lib64 /usr/lib /usr/lib64 /usr/X11R6/lib /usr/X11R6/lib64 /usr/qt/*/lib /usr/qt/*/lib64 /usr/kde/*/lib /usr/kde/*/lib64; do
- if [ -L "${dir}" ]; then
- ewarn "${dir} is a symlink"
- #exit 1
- fi
-done
+#export CFLAGS_amd64
+export CFLAGS_x86
-if [ -z "${IWANTTOTRASHMYSYSTEM}" ]; then
- eerror "The amd64 2005.0 profile is still in active development and"
- eerror "not yet ready for user testing. An announcement will be made"
- eerror "on gentoo-amd64@gentoo.org once we are ready for testers."
+# 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
index 1baa18058f37..f0a83d49f05b 100644
--- 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
@@ -1,4 +1,7 @@
#!/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.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
TMPDIR="$(portageq envvar PORTAGE_TMPDIR)"
PORTDIR="$(portageq envvar PORTDIR)"
@@ -91,12 +94,34 @@ if [[ ! -f step0 ]]; then
fi
if [[ "$(gcc -m32 -print-multi-directory)" != "32" ]]; then
- eerror "Your compiler does not have multilib support."
- eerror "Please emerge gcc with USE=multilib:"
- eerror "FEATURES=-sandbox USE=multilib emerge gcc."
+ 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"
@@ -146,22 +171,31 @@ if [[ ! -f step2 ]]; then
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
+ [[ -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
+ [[ -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
@@ -178,11 +212,12 @@ if [[ ! -f step4 ]]; then
fi
if [[ ! -f step5 ]]; then
- emerge -v --oneshot glibc || myDie "emerge glibc failed"
+ 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
diff --git a/profiles/default-linux/amd64/2005.0/use.mask b/profiles/default-linux/amd64/2005.0/use.mask
index 505a2a7b604b..92ea1bef6e57 100644
--- a/profiles/default-linux/amd64/2005.0/use.mask
+++ b/profiles/default-linux/amd64/2005.0/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/use.mask,v 1.1 2005/01/18 06:57:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/use.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# multilib is forced on when we have ${MULTILIB_ABIS} defined
diff --git a/profiles/default-linux/amd64/2005.1/make.defaults b/profiles/default-linux/amd64/2005.1/make.defaults
index b7423619159e..43c47d25b8c7 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.1 2005/06/04 21:20:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
#removed because managers vote requires us to do so
#("when we go nptl, we all go nptl")
@@ -14,8 +14,8 @@ FEATURES="sandbox autoconfig -multilib-pkg"
MULTILIB_ABIS="x86 amd64"
DEFAULT_ABI="amd64"
-CFLAGS_amd64="-m64"
-LDFLAGS_amd64="-m elf_x86_64"
+#CFLAGS_amd64="-m64"
+#LDFLAGS_amd64="-m elf_x86_64"
CHOST_amd64="x86_64-pc-linux-gnu"
CDEFINE_amd64="__x86_64__"
LIBDIR_amd64="lib64"
diff --git a/profiles/default-linux/amd64/2005.1/no-multilib/make.defaults b/profiles/default-linux/amd64/2005.1/no-multilib/make.defaults
index 60baa8f1dae8..3f1e09e6e5f5 100644
--- a/profiles/default-linux/amd64/2005.1/no-multilib/make.defaults
+++ b/profiles/default-linux/amd64/2005.1/no-multilib/make.defaults
@@ -1,5 +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/2005.1/no-multilib/make.defaults,v 1.1 2005/06/04 21:20:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/no-multilib/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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
index 9f70621ba183..0a43836e993e 100644
--- a/profiles/default-linux/amd64/2005.1/no-multilib/package.mask
+++ b/profiles/default-linux/amd64/2005.1/no-multilib/package.mask
@@ -1,8 +1,11 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/no-multilib/package.mask,v 1.1 2005/06/04 21:20:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/no-multilib/package.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# Mask multilib amd64 things
+app-antivirus/bitdefender-console
+app-arch/rar
app-benchmarks/cpuburn
+app-cdr/cdrecord-prodvd
app-emulation/cedaga
app-emulation/crossover-office-bin
app-emulation/winex-transgaming
@@ -14,6 +17,7 @@ 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
@@ -28,27 +32,36 @@ app-emulation/winex
app-emulation/winex-cvs
app-emulation/winex-transgaming
app-text/acroread
+games-arcade/barbarian-bin
games-emulation/nestra
+games-emulation/snes9x
games-emulation/zsnes
games-fps/americas-army
games-fps/doom3-demo
games-fps/doom3
games-fps/enemy-territory
games-fps/postal2mpdemo
-games-fps/quake3
+games-fps/quake3-bin
games-fps/rtcw
games-fps/vendetta-online-bin
games-rpg/nwn
games-rpg/nwn-cep
games-server/nwn-ded
+media-libs/win32codecs
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/mplayer-bin
media-video/realplayer
+net-im/aim
net-im/skype
+net-im/ymessenger
net-www/netscape-flash
+sci-biology/foldingathome
+sys-apps/memtest86
+sys-apps/memtest86+
sys-boot/grub
www-client/opera
www-client/mozilla-bin
diff --git a/profiles/default-linux/amd64/2005.1/no-multilib/parent b/profiles/default-linux/amd64/2005.1/no-multilib/parent
index c03945bb9269..42a188c7c957 100644
--- a/profiles/default-linux/amd64/2005.1/no-multilib/parent
+++ b/profiles/default-linux/amd64/2005.1/no-multilib/parent
@@ -1,6 +1,6 @@
# Copyright 2004-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/parent,v 1.1 2005/06/04 21:20:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/no-multilib/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/2005.1/package.mask b/profiles/default-linux/amd64/2005.1/package.mask
index 5cc3656a5ac0..db1f5a4fed4c 100644
--- a/profiles/default-linux/amd64/2005.1/package.mask
+++ b/profiles/default-linux/amd64/2005.1/package.mask
@@ -1,8 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/package.mask,v 1.1 2005/06/04 21:20:09 eradicator Exp $
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# Use linux headers which give us asm-i386 headers as well
-<sys-kernel/linux-headers-2.6.8.1-r3
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/package.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# These are provided by non-emul packages now
diff --git a/profiles/default-linux/amd64/2005.1/packages b/profiles/default-linux/amd64/2005.1/packages
index 5bb543cabf67..06704b6320a4 100644
--- a/profiles/default-linux/amd64/2005.1/packages
+++ b/profiles/default-linux/amd64/2005.1/packages
@@ -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/packages,v 1.1 2005/06/04 21:20:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/packages,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
*>=sys-devel/binutils-2.15.90.0.1.1-r4
*>=sys-devel/gcc-3.4.3-r1
diff --git a/profiles/default-linux/amd64/2005.1/parent b/profiles/default-linux/amd64/2005.1/parent
index ed65e1f48287..e862c55e1023 100644
--- a/profiles/default-linux/amd64/2005.1/parent
+++ b/profiles/default-linux/amd64/2005.1/parent
@@ -1,6 +1,6 @@
# Copyright 2004-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/parent,v 1.1 2005/06/04 21:20:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/2005.1/profile.bashrc b/profiles/default-linux/amd64/2005.1/profile.bashrc
index 1da1aefbaba8..58e289ebaed9 100644
--- a/profiles/default-linux/amd64/2005.1/profile.bashrc
+++ b/profiles/default-linux/amd64/2005.1/profile.bashrc
@@ -9,19 +9,14 @@ else
export ABI="amd64"
fi
-export CFLAGS_amd64
+#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.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/2005.0-upgrade-amd64.xml"
- exit 1
-fi
-
-if [[ -z "${IWILLFIXITMYSELF}" ]] ; then
- eerror "Youa re using a development profile. If you REALLY want to do this, then set the following in /etc/make.conf:"
- eerror "IWILLFIXITMYSELF=1"
+ 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
index 7cee46f10b5f..4032f088dfe2 100644
--- a/profiles/default-linux/amd64/2005.1/use.mask
+++ b/profiles/default-linux/amd64/2005.1/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/use.mask,v 1.1 2005/06/04 21:20:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.1/use.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# multilib is forced on when we have ${MULTILIB_ABIS} defined
diff --git a/profiles/default-linux/amd64/2006.0/make.defaults b/profiles/default-linux/amd64/2006.0/make.defaults
index d014c6ef5122..82b52c5b1dbf 100644
--- a/profiles/default-linux/amd64/2006.0/make.defaults
+++ b/profiles/default-linux/amd64/2006.0/make.defaults
@@ -1,11 +1,12 @@
# 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.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
FEATURES="sandbox autoconfig"
MULTILIB_ABIS="x86 amd64"
DEFAULT_ABI="amd64"
+ABI=${DEFAULT_ABI}
#CFLAGS_amd64="-m64"
#LDFLAGS_amd64="-m elf_x86_64"
diff --git a/profiles/default-linux/amd64/2006.0/no-multilib/make.defaults b/profiles/default-linux/amd64/2006.0/no-multilib/make.defaults
index fa1eb681852a..826dc0d324e1 100644
--- a/profiles/default-linux/amd64/2006.0/no-multilib/make.defaults
+++ b/profiles/default-linux/amd64/2006.0/no-multilib/make.defaults
@@ -1,5 +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.0/no-multilib/make.defaults,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-multilib/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
MULTILIB_ABIS="amd64"
diff --git a/profiles/default-linux/amd64/2006.0/no-multilib/package.mask b/profiles/default-linux/amd64/2006.0/no-multilib/package.mask
index 2e7ba4500132..6e9fdec58987 100644
--- a/profiles/default-linux/amd64/2006.0/no-multilib/package.mask
+++ b/profiles/default-linux/amd64/2006.0/no-multilib/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-multilib/package.mask,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-multilib/package.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# Mask multilib amd64 things
@@ -40,7 +40,7 @@ games-fps/doom3-demo
games-fps/doom3
games-fps/enemy-territory
games-fps/postal2mpdemo
-games-fps/quake3
+games-fps/quake3-bin
games-fps/rtcw
games-fps/vendetta-online-bin
games-rpg/nwn
@@ -58,6 +58,8 @@ net-im/skype
net-im/ymessenger
net-www/netscape-flash
sci-biology/foldingathome
+sys-apps/memtest86
+sys-apps/memtest86+
sys-boot/grub
www-client/opera
www-client/mozilla-bin
diff --git a/profiles/default-linux/amd64/2006.0/no-multilib/parent b/profiles/default-linux/amd64/2006.0/no-multilib/parent
index 21c85f10c50e..4a7aef172f4f 100644
--- a/profiles/default-linux/amd64/2006.0/no-multilib/parent
+++ b/profiles/default-linux/amd64/2006.0/no-multilib/parent
@@ -1,6 +1,6 @@
# Copyright 2004-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/no-multilib/parent,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-multilib/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/2006.0/no-symlinks/make.defaults b/profiles/default-linux/amd64/2006.0/no-symlinks/make.defaults
index 631de6b8ff52..a0f11f65e382 100644
--- a/profiles/default-linux/amd64/2006.0/no-symlinks/make.defaults
+++ b/profiles/default-linux/amd64/2006.0/no-symlinks/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/2006.0/no-symlinks/make.defaults,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# Hack to tell baselayout NOT to use symlinks for /lib, /usr/lib, and /usr/local/lib
SYMLINK_LIB="no"
diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/make.defaults b/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/make.defaults
index fe1972b365ca..5e4cc5abfd84 100644
--- a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/make.defaults
+++ b/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/make.defaults
@@ -1,5 +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.0/no-symlinks/no-lib32/make.defaults,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
LIBDIR_x86="lib"
diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/package.mask b/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/package.mask
index 9390ac1d8601..3b05499e031a 100644
--- a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/package.mask
+++ b/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/package.mask,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/package.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# multilib aware versions (install to & look in proper $(get_libdir))
@@ -32,7 +32,6 @@
<sys-devel/flex-2.5.4a-r6
<sys-devel/libperl-5.8.6
<sys-libs/pam-0.77-r7
-<sys-libs/pwdb-0.62-r1
<www-client/mozilla-firefox-1.0.4
<dev-libs/libxml2-2.6.18
<dev-libs/libxslt-1.1.13-r1
diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/parent b/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/parent
index 4501582927f9..423b4d2a883b 100644
--- a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/parent
+++ b/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/parent
@@ -1,6 +1,6 @@
# Copyright 2004-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/no-symlinks/no-lib32/parent,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/2006.0/no-symlinks/package.mask b/profiles/default-linux/amd64/2006.0/no-symlinks/package.mask
index 9314f4360805..c271c6b19ab8 100644
--- a/profiles/default-linux/amd64/2006.0/no-symlinks/package.mask
+++ b/profiles/default-linux/amd64/2006.0/no-symlinks/package.mask
@@ -1,5 +1,2 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/package.mask,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/package.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
-# Simon Stelling <blubb@gentoo.org>
-# default library location is fubared on >2.0.51.x; bug #103818
->=sys-apps/portage-2.0.52
diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/parent b/profiles/default-linux/amd64/2006.0/no-symlinks/parent
index 536c038bf642..7d82906604ca 100644
--- a/profiles/default-linux/amd64/2006.0/no-symlinks/parent
+++ b/profiles/default-linux/amd64/2006.0/no-symlinks/parent
@@ -1,6 +1,6 @@
# Copyright 2004-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/no-symlinks/parent,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/2006.0/no-symlinks/profile.bashrc b/profiles/default-linux/amd64/2006.0/no-symlinks/profile.bashrc
index d7f58c1b4fa0..dc304939daa0 100644
--- a/profiles/default-linux/amd64/2006.0/no-symlinks/profile.bashrc
+++ b/profiles/default-linux/amd64/2006.0/no-symlinks/profile.bashrc
@@ -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/2006.0/no-symlinks/profile.bashrc,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/profile.bashrc,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
for dir in /lib /lib64 /usr/lib /usr/lib64 /usr/X11R6/lib /usr/X11R6/lib64 /usr/qt/*/lib /usr/qt/*/lib64 /usr/kde/*/lib /usr/kde/*/lib64; do
if [ -L "${dir}" ]; then
diff --git a/profiles/default-linux/amd64/2006.0/package.mask b/profiles/default-linux/amd64/2006.0/package.mask
index c004249275ed..10768030284b 100644
--- a/profiles/default-linux/amd64/2006.0/package.mask
+++ b/profiles/default-linux/amd64/2006.0/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/package.mask,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/package.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# These are provided by non-emul packages now
diff --git a/profiles/default-linux/amd64/2006.0/packages b/profiles/default-linux/amd64/2006.0/packages
index 6303578e7ea2..5a8e3210b180 100644
--- a/profiles/default-linux/amd64/2006.0/packages
+++ b/profiles/default-linux/amd64/2006.0/packages
@@ -1,14 +1,14 @@
# 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/packages,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/packages,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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
+# ${CHOST} over ${ABI} changes went into 2.3.5-r2
+*>=sys-libs/glibc-2.3.5-r2
-# Use only portages with sandbox split off
+# Sandbox broken out
*>=sys-apps/portage-2.0.51.22
# Make sure toolchain compiler is friendly to multilib based on ${CHOST}
diff --git a/profiles/default-linux/amd64/2006.0/parent b/profiles/default-linux/amd64/2006.0/parent
index 41ae85a2dadf..a452a513a51a 100644
--- a/profiles/default-linux/amd64/2006.0/parent
+++ b/profiles/default-linux/amd64/2006.0/parent
@@ -1,6 +1,6 @@
# Copyright 2004-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/parent,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/2006.0/profile.bashrc b/profiles/default-linux/amd64/2006.0/profile.bashrc
index 869c59390cf4..8c6e1fdcf08b 100644
--- a/profiles/default-linux/amd64/2006.0/profile.bashrc
+++ b/profiles/default-linux/amd64/2006.0/profile.bashrc
@@ -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/2006.0/profile.bashrc,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/profile.bashrc,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
if [ -z "${IWANTTOTRASHMYSYSTEM}" ]; then
eerror "The amd64 2006.0 profile is still in active development and requires"
diff --git a/profiles/default-linux/amd64/2006.0/use.mask b/profiles/default-linux/amd64/2006.0/use.mask
index 5332266f36a4..184282772ff0 100644
--- a/profiles/default-linux/amd64/2006.0/use.mask
+++ b/profiles/default-linux/amd64/2006.0/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/use.mask,v 1.1 2005/10/07 02:22:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/use.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# multilib is forced on when we have ${MULTILIB_ABIS} defined
diff --git a/profiles/default-linux/amd64/make.defaults b/profiles/default-linux/amd64/make.defaults
index 96c4f3baf544..daab5b341c0b 100644
--- a/profiles/default-linux/amd64/make.defaults
+++ b/profiles/default-linux/amd64/make.defaults
@@ -1,14 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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/make.defaults,v 1.1 2005/01/01 02:59:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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 userlocales zlib X xpm xv -java"
ARCH="amd64"
ACCEPT_KEYWORDS="${ARCH}"
CHOST="x86_64-pc-linux-gnu"
-# GCC 3.4.2 has multilib enabled by default, but we still need multilib in USE
-# for compatibility. also, without this we might actually fail to build stages.
-STAGE1_USE="multilib"
-GRP_STAGE23_USE="${STAGE1_USE}"
-USE="${GRP_STAGE23_USE}"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
diff --git a/profiles/default-linux/amd64/package.mask b/profiles/default-linux/amd64/package.mask
index 74151176a859..783389b82a36 100644
--- a/profiles/default-linux/amd64/package.mask
+++ b/profiles/default-linux/amd64/package.mask
@@ -1,5 +1,9 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/package.mask,v 1.1 2005/01/12 04:06:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/package.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
-# Jeremy Huddleston <eradicator@gentoo.org>
+# 2005.0 Jeremy Huddleston <eradicator@gentoo.org>
# This is a stub file 'cause glibc provides 32bit libs on newer profiles
=app-emulation/emul-linux-x86-glibc-1000
+
+# 2005/10/24 Simon Stelling <blubb@gentoo.org>
+# Don't even try to compile openoffice-2.x, it won't work.
+>=app-office/openoffice-2.0.0
diff --git a/profiles/default-linux/amd64/packages b/profiles/default-linux/amd64/packages
index 15bf48574d01..23d7ee6abbe9 100644
--- a/profiles/default-linux/amd64/packages
+++ b/profiles/default-linux/amd64/packages
@@ -1,4 +1,6 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# 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.1 2004/04/09 18:33:52 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/packages,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
+
+*sys-apps/linux32
diff --git a/profiles/default-linux/amd64/parent b/profiles/default-linux/amd64/parent
index 832a4b2c88df..b57a5412dd3a 100644
--- a/profiles/default-linux/amd64/parent
+++ b/profiles/default-linux/amd64/parent
@@ -1,7 +1,6 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/parent,v 1.1.1.1 2005/11/30 09:48:35 chriswhite 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/use.mask b/profiles/default-linux/amd64/use.mask
index 336677c7a73a..7a84e0a8b1f8 100644
--- a/profiles/default-linux/amd64/use.mask
+++ b/profiles/default-linux/amd64/use.mask
@@ -1,3 +1,111 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# 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.1 2004/04/09 18:33:52 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/use.mask,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
+
+# UNKNOWN - SECTION
+
+afs
+drac
+
+# UNMASK - SECTION
+
+# 2005/09/14 - Diego Pettenò <flameeyes@gentoo.org>
+# nVidia XvMC support works on amd64
+-nvidia
+
+# WON'T WORK - SECTION
+
+asm
+
+# 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
+
+# 2005/01/12 - Benjamin Schindler <config@gentoo.org>
+# Optional mono support will never work until we have a stable mono compiler
+# Update: 2005/05/15 - Tom Martin <slarti@gentoo.org>
+# Will work with mono 1.1.6, waiting on that to be stabilised.
+mono
+
+# WON'T BUILD - SECTION
+
+# 2005/09/19 - Olivier Fisette <ribosome@gentoo.org>
+# cmucl is not available on amd64. Masking to keep "sci-mathematics/maxima"
+# happy.
+cmucl
+
+# 2005/08/28 - Simon Stelling <blubb@gentoo.org>
+# sci-libs/cdf doesn't build
+cdf
+
+# 2004/11/13 - Tom Martin <slarti@gentoo.org>
+# dev-libs/mzscheme won't build, #65216
+mzscheme
+
+# 2004/10/06 - Jeremy Huddleston <eradicator@gentoo.org>
+# sys-cluster/pvm won't build
+pvm
+
+# 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
+
+# NOT NECESSARY - SECTION
+
+# 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
+
+# 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
diff --git a/profiles/default-linux/amd64/virtuals b/profiles/default-linux/amd64/virtuals
index b87c349aaf27..ee83f3ee69bc 100644
--- a/profiles/default-linux/amd64/virtuals
+++ b/profiles/default-linux/amd64/virtuals
@@ -1,3 +1,5 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# 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.1 2004/04/09 18:33:52 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/virtuals,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
+
+virtual/bootloader sys-boot/grub
diff --git a/profiles/default-linux/arm/2004.3/make.defaults b/profiles/default-linux/arm/2004.3/make.defaults
index 52a6f7cc5883..2b7568958739 100644
--- a/profiles/default-linux/arm/2004.3/make.defaults
+++ b/profiles/default-linux/arm/2004.3/make.defaults
@@ -1,15 +1,7 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/arm/2004.3/make.defaults,v 1.1 2004/10/15 14:20:01 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/arm/2004.3/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
-USE="arm crypt ncurses readline ssl zlib"
+GRP_STAGE23_USE="acl berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd"
-ARCH="arm"
-ACCEPT_KEYWORDS="arm"
-
-FEATURES="-sandbox sfperms"
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+USE="${GRP_STAGE23_USE} crypt zlib"
diff --git a/profiles/default-linux/arm/make.defaults b/profiles/default-linux/arm/make.defaults
index 65473fc9c59b..19f954d317a0 100644
--- a/profiles/default-linux/arm/make.defaults
+++ b/profiles/default-linux/arm/make.defaults
@@ -1,25 +1,16 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/arm/make.defaults,v 1.1 2004/12/22 02:40:30 vapier Exp $
-
-GRP_STAGE23_USE="
-acl
-berkdb
-gpm
-ipv6
-ncurses
-nls
-pam
-perl
-python
-readline
-ssl
-tcpd
-"
-
-USE="${GRP_STAGE23_USE} crypt zlib"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/arm/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="arm"
ACCEPT_KEYWORDS="arm"
+CHOST="arm-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+
FEATURES="sfperms"
+
+GRP_STAGE23_USE="berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd"
+
+USE="${GRP_STAGE23_USE} crypt zlib"
diff --git a/profiles/default-linux/arm/packages b/profiles/default-linux/arm/packages
index 61a768286df6..d3961e7cd7b8 100644
--- a/profiles/default-linux/arm/packages
+++ b/profiles/default-linux/arm/packages
@@ -1,3 +1,7 @@
+# Copyright 2001-2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/arm/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
+
>=sys-devel/binutils-2.13.90.0.4
>=sys-devel/gcc-3.2
>=sys-libs/glibc-2.2.5
diff --git a/profiles/default-linux/arm/use.mask b/profiles/default-linux/arm/use.mask
index b2150225fe0d..021d0d2b9ac2 100644
--- a/profiles/default-linux/arm/use.mask
+++ b/profiles/default-linux/arm/use.mask
@@ -1,20 +1,15 @@
-
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
hardened
# Paul de Vrieze <pauldv@gentoo.org>
# There is no java in this profile (if there is it must be available). Without
# this repoman will fail on apps like sys-libs/db
java
+java-internal
+java-external
-3dnow
icc
icc-pgo
-mmx
svga
-sse
uclibc
# see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
@@ -31,6 +26,7 @@ empress
empress-bcs
esoob
filepro
+firebird
frontbase
hyperwave
informix
@@ -42,3 +38,34 @@ solid
sybase
sybase-ct
fdftk
+djbfft
+qdbm
+mzscheme
+
+directfb
+qt
+arts
+kde
+alsa
+nas
+
+hal
+howl
+
+lirc
+jack
+afs
+
+emboss
+neXt
+lesstif
+
+mozilla
+
+dbus
+
+3dfx
+mono
+pike
+
+timidity
diff --git a/profiles/default-linux/arm/virtuals b/profiles/default-linux/arm/virtuals
index 45cab5665af4..51a188fc6db4 100644
--- a/profiles/default-linux/arm/virtuals
+++ b/profiles/default-linux/arm/virtuals
@@ -1 +1,6 @@
-virtual/bootloader sys-boot/nettrom
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/arm/virtuals,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
+
+virtual/bootloader sys-boot/nettrom
+virtual/linux-sources sys-kernel/vanilla-sources
diff --git a/profiles/default-linux/hppa/2004.2/make.defaults b/profiles/default-linux/hppa/2004.2/make.defaults
index c12c79b8731f..d415dbf73381 100644
--- a/profiles/default-linux/hppa/2004.2/make.defaults
+++ b/profiles/default-linux/hppa/2004.2/make.defaults
@@ -1,54 +1,12 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/2004.2/make.defaults,v 1.1.1.1 2005/11/30 09:48:34 chriswhite Exp $
+#
# System-wide defaults for the Portage system
+# See portage(5) manpage
-USE="
-berkdb
-crypt
-cups
-encode
-foomaticdb
-gdbm
-gif
-gnome
-gpm
-gtk
-gtk2
-imlib
-jpeg
-kde
-libg++
-libwww
-mikmod
-motif
-ncurses
-nls
-oggvorbis
-opengl
-oss
-pam
-pdflib
-png
-python
-qt
-quicktime
-readline
-sdl
-slang
-spell
-ssl
-svga
-tcpd
-truetype
-X
-xml2
-xmms
-xv
-zlib
-"
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+# System-wide defaults for the Portage system
-ARCH="hppa"
-COMPILER="gcc3"
-ACCEPT_KEYWORDS="hppa"
+USE="berkdb bitmap-fonts crypt cups encode font-server foomaticdb fortran gdbm gif gnome gpm gtk gtk2 imlib jpeg kde libg++ libwww mikmod motif ncurses nls oggvorbis opengl oss pam pdflib pic png python qt quicktime readline sdl spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
-FEATURES="sandbox sfperms strict"
+GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
diff --git a/profiles/default-linux/hppa/2005.0/packages b/profiles/default-linux/hppa/2005.0/packages
index 1c0fc6f84578..05b5f1f6873a 100644
--- a/profiles/default-linux/hppa/2005.0/packages
+++ b/profiles/default-linux/hppa/2005.0/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/2005.0/packages,v 1.1 2005/01/11 15:53:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/2005.0/packages,v 1.1.1.1 2005/11/30 09:48:34 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
@@ -16,6 +16,3 @@
>=sys-devel/binutils-2.14.90.0.8-r1
>=sys-devel/gcc-3.3.4-r1
>=sys-libs/glibc-2.3.3.20040420-r1
-
->=sys-kernel/hppa-sources-2.5
->=sys-kernel/linux-headers-2.5
diff --git a/profiles/default-linux/hppa/make.defaults b/profiles/default-linux/hppa/make.defaults
index 5f9928c7b873..3fedd1076939 100644
--- a/profiles/default-linux/hppa/make.defaults
+++ b/profiles/default-linux/hppa/make.defaults
@@ -1,13 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/make.defaults,v 1.1 2005/01/06 10:49:42 gmsoft Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-
-# System-wide defaults for the Portage system
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/make.defaults,v 1.1.1.1 2005/11/30 09:48:34 chriswhite Exp $
ARCH="hppa"
ACCEPT_KEYWORDS="hppa"
+CHOST="hppa-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="-O1 -pipe"
+
FEATURES="sandbox sfperms strict"
+
+USE="berkdb crypt cups foomaticdb fortran gdbm gpm imlib ipv6 libwww ncurses nls pam perl pic python readline spell ssl tcpd xml2 zlib"
diff --git a/profiles/default-linux/hppa/packages b/profiles/default-linux/hppa/packages
index f641d0cb8d8e..907af9e41b1a 100644
--- a/profiles/default-linux/hppa/packages
+++ b/profiles/default-linux/hppa/packages
@@ -1,10 +1,9 @@
# Copyright 2001-2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/packages,v 1.1 2004/08/06 05:24:42 vapier Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/packages,v 1.1.1.1 2005/11/30 09:48:34 chriswhite Exp $
+
+*virtual/bootloader
->=sys-apps/baselayout-1.8.5.8
->=sys-apps/portage-2.0.36
>=sys-devel/binutils-2.13.90.0.16-r1
>=sys-devel/gcc-3.2.2
>=sys-libs/glibc-2.3.1-r2
-virtual/x11
diff --git a/profiles/default-linux/hppa/use.mask b/profiles/default-linux/hppa/use.mask
index ea91f4cf9538..c9923623a3ba 100644
--- a/profiles/default-linux/hppa/use.mask
+++ b/profiles/default-linux/hppa/use.mask
@@ -1,3 +1,51 @@
+# 27 Nov 2005 Guy Martin <gmsoft@gentoo.org>
+# gccxml doesn't build and boost depend on it with this use
+pyste
+
+# 25 Jul 2005 Guy Martin <gmsoft@gentoo.org>
+# lm_sensors not supported on hppa and ieee1394 not tested
+lm_sensors
+ieee1394
+
+# 25 Jun 2005 Guy Martin <gmsoft@gentoo.org>
+# mono is not yet supported on hppa
+mono
+
+# 19 Jun 2005 Guy Martin <gmsoft@gentoo.org>
+# dmalloc is broken on hppa
+dmalloc
+
+# 14 May 2005 Guy Martin <gmsoft@gentoo.org>
+# kde-base/libkcal doesn't compile yet on hppa and is a needed dep
+irmc
+
+# 25 Mar 2005 Guy Martin <gmsoft@gentoo.org>
+# Masking lapck not yet tested
+lapack
+
+# 10 Mar 2005 Stefan Knoblich <stkn@gentoo.org>
+# This needs zaptel and pri
+bri
+florz
+
+# 20 Feb 2005 Guy Martin <gmsoft@gentoo.org>
+# Hardware for asterisk not yet tested
+zaptel
+resperl
+pri
+
+# 18 Feb 2005 Guy Martin <gmsoft@gentoo.org>
+# No emboss support on hppa for now
+emboss
+
+# 05 Oct 2004 Guy Martin <gmsoft@gentoo.org>
+# jack is not yet supported on hppa
+jack
+
+# 04 Oct 2004 Guy Martin <gmsoft@gentoo.org>
+# hal not yet tested
+hal
+
# 11 Aug 2004 Guy Martin <gmsoft@gentoo.org>
# No nptl support yet
nptl
@@ -32,46 +80,38 @@ foreign-package
# Avi support is far from 'supported'
avi
-# 06 Jul 2003 Guy Martin <gmsoft@gentoo.org>
-# Mozilla is curently not working
-mozilla
-
# 13 Apr 2003 Guy Martin <gmsoft@gentoo.org>
# Selinux patches not tested on hppa and no kernel sources are emergeables with this patch.
selinux
-# 07 Apr 2003 Guy Martin <gmsoft@gentoo.org>
-# I don't have the hardware to test usb support. So, this is disabled for now.
-usb
-
# 20 Mar 2003 Guy Martin <gmsoft@gentoo.org>
# Many java apps need java => 1.3 and hppa has only 1.1 right now
java
+# 5 Jan 2005 Ciaran McCreesh <ciaranm@gentoo.org>
+# No reliable java, no netbeans. bug 66762
+netbeans
+
# 19 Mar 2003 Guy Martin <gmsoft@gentoo.org>
# acl not tested yet
acl
# 14 Mar 2003 Guy Martin <gmsoft@gentoo.org>
# USE flags not related to hppa
-3dnow
acpi
apm
afs
ev6
+i8x0
icc
icc-pgo
-mmx
nocardbus
pcmcia
pda
-sse
svga
trusted
wavelan
-x86
firebird
-uclibc
# 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
@@ -96,3 +136,17 @@ pfpro
solid
sybase
sybase-ct
+djbfft
+qdbm
+mzscheme
+
+# Added because of xmms-plugin.eclass. Please test out
+# media-sound/beep-media-player and remove if
+bmp
+
+freetts
+
+lirc
+
+3dfx
+pike
diff --git a/profiles/default-linux/hppa/virtuals b/profiles/default-linux/hppa/virtuals
index f64dc50f52cb..23ab103970ec 100644
--- a/profiles/default-linux/hppa/virtuals
+++ b/profiles/default-linux/hppa/virtuals
@@ -1 +1,7 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/virtuals,v 1.1.1.1 2005/11/30 09:48:34 chriswhite Exp $
+
+virtual/alsa sys-kernel/hppa-sources
virtual/bootloader sys-boot/palo
+virtual/linux-sources sys-kernel/hppa-sources
diff --git a/profiles/default-linux/ia64/2005.0/packages b/profiles/default-linux/ia64/2005.0/packages
index d116281a843a..2ef2e456e71b 100644
--- a/profiles/default-linux/ia64/2005.0/packages
+++ b/profiles/default-linux/ia64/2005.0/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2005.0/packages,v 1.1 2005/01/10 19:36:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2005.0/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
@@ -14,7 +14,6 @@
>dev-lang/gpc-2.1
>=sys-apps/baselayout-1.9.4-r3
>=sys-devel/binutils-2.14.90.0.8-r1
->=sys-devel/gcc-3.3.4-r1
>=sys-libs/glibc-2.3.3.20040420-r1
>=sys-kernel/ac-sources-2.5
diff --git a/profiles/default-linux/ia64/2005.0/parent b/profiles/default-linux/ia64/2005.0/parent
index caaa682468b8..4c4ba44949dc 100644
--- a/profiles/default-linux/ia64/2005.0/parent
+++ b/profiles/default-linux/ia64/2005.0/parent
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2005.0/parent,v 1.1 2005/01/10 19:36:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2005.0/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/ia64/make.defaults b/profiles/default-linux/ia64/make.defaults
index 78a8fb3e4fa1..621bd6bfe91d 100644
--- a/profiles/default-linux/ia64/make.defaults
+++ b/profiles/default-linux/ia64/make.defaults
@@ -1,11 +1,14 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/make.defaults,v 1.1 2005/01/21 15:31:28 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="ia64"
ACCEPT_KEYWORDS="ia64"
+CHOST="ia64-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+
FEATURES="sandbox sfperms"
+
+USE="X berkdb bitmap-fonts crypt cups eds encode foomaticdb fortran gdbm gif gnome gpm gstreamer gtk gtk2 imlib ipv6 jpeg kde libg++ libwww mikmod motif ncurses nls ogg oggvorbis opengl oss pam pdflib perl png python qt quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml2 xmms xv zlib"
diff --git a/profiles/default-linux/ia64/packages b/profiles/default-linux/ia64/packages
index f3adaaffb40d..057cca93727c 100644
--- a/profiles/default-linux/ia64/packages
+++ b/profiles/default-linux/ia64/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/packages,v 1.1 2004/09/22 16:07:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
>=sys-devel/binutils-2.13.90.0.4
>=sys-devel/gcc-3.2
diff --git a/profiles/default-linux/ia64/use.mask b/profiles/default-linux/ia64/use.mask
index 10649ead4b02..b61fba0e6e15 100644
--- a/profiles/default-linux/ia64/use.mask
+++ b/profiles/default-linux/ia64/use.mask
@@ -4,10 +4,6 @@
svga
icc
icc-pgo
-mmx
-sse
-x86
-3dnow
# These are debatable, since technically an ia64 could support this hardware
pcmcia
@@ -17,25 +13,15 @@ pcmcia
# No hardware to test
pda
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
-
# No apm support on ia64
apm
-# Paul de Vrieze <pauldv@gentoo.org>
-# There is no java in this profile (if there is it must be available). Without
-# this repoman will fail on apps like sys-libs/db
-java
-
# tcc is x86-only
tcc
# I don't think that openafs really works on other architectures,
# despite some internal Gentoo efforts (mine) to port it
afs
-uclibc
# 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
@@ -56,5 +42,41 @@ pfpro
solid
sybase
sybase-ct
+fdftk
+cpdflib
+qdbm
hardened
+djbfft
+mzscheme
+
+# dietlibc
+diet
+
+jack
+
+freetts
+
+lirc
+
+# mono compiler doesn't build on ia64 (20 Jan 2005 agriffis)
+mono
+
+# need to wait for it jrockit to go stable
+java
+java-internal
+java-external
+
+emboss
+
+# lm_sensors not supported on ia64 hw, afaik
+lm_sensors
+
+# we can't test wifi currently
+wifi
+
+pike
+
+timidity
+
+firebird
diff --git a/profiles/default-linux/ia64/virtuals b/profiles/default-linux/ia64/virtuals
index b4af0649a252..99d6e64cef99 100644
--- a/profiles/default-linux/ia64/virtuals
+++ b/profiles/default-linux/ia64/virtuals
@@ -1,5 +1,8 @@
-# Copyright 2004 Gentoo Foundation.
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/virtuals,v 1.1 2004/09/22 16:07:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/virtuals,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
virtual/bootloader sys-boot/elilo
+virtual/linux-sources sys-kernel/vanilla-sources
+virtual/jre dev-java/jrockit-jdk-bin
+virtual/jdk dev-java/jrockit-jdk-bin
diff --git a/profiles/default-linux/m68k/make.defaults b/profiles/default-linux/m68k/make.defaults
index 49270ff76133..4b3bf02f06d1 100644
--- a/profiles/default-linux/m68k/make.defaults
+++ b/profiles/default-linux/m68k/make.defaults
@@ -1,15 +1,16 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/m68k/make.defaults,v 1.1 2004/11/04 22:09:48 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-
-USE="crypt ncurses readline ssl zlib"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/m68k/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
ARCH="m68k"
ACCEPT_KEYWORDS="m68k"
+CHOST="m68k-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+
FEATURES="-sandbox sfperms"
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
+
+USE="crypt ncurses readline ssl zlib"
diff --git a/profiles/default-linux/m68k/packages b/profiles/default-linux/m68k/packages
index 546e1f725b69..e85994bf5421 100644
--- a/profiles/default-linux/m68k/packages
+++ b/profiles/default-linux/m68k/packages
@@ -1,5 +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/m68k/packages,v 1.1 2005/05/24 23:57:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/m68k/packages,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
*sys-fs/atari-fdisk
diff --git a/profiles/default-linux/m68k/use.mask b/profiles/default-linux/m68k/use.mask
index 824b408df51c..d016b781d6f1 100644
--- a/profiles/default-linux/m68k/use.mask
+++ b/profiles/default-linux/m68k/use.mask
@@ -1,7 +1,3 @@
-
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
hardened
# Paul de Vrieze <pauldv@gentoo.org>
@@ -9,13 +5,9 @@ hardened
# this repoman will fail on apps like sys-libs/db
java
-3dnow
icc
icc-pgo
-mmx
svga
-sse
-uclibc
# 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
@@ -45,3 +37,13 @@ fdftk
djbfft
qdbm
mzscheme
+
+emacs
+xemacs
+
+afs
+tcltk
+ldap
+slang
+X
+diet
diff --git a/profiles/default-linux/make.defaults b/profiles/default-linux/make.defaults
index 596920da9fdc..44f55ed567b2 100644
--- a/profiles/default-linux/make.defaults
+++ b/profiles/default-linux/make.defaults
@@ -1,9 +1,17 @@
-# Copyright 2004 Gentoo Foundation.
-# System-wide defaults for a basic linux system
-
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/make.defaults,v 1.1.1.1 2005/11/30 09:48:34 chriswhite Exp $
+#
+# System-wide defaults for the Portage system
+# See portage(5) manpage
+#
# Please avoid enabling things by default in here if possible. Understand any
-# implications with core packages. For example, if "java" is in USE and db
+# implications with core packages. For example, if "java" is in USE and db
# has a conditional dependency on java (which it does,) then a JDK will be
# pulled in during *emerge system*!
-USE="bitmap-fonts xprint"
+# build X in an expected way
+USE="bitmap-fonts truetype-fonts type1-fonts"
+
+# make sure toolchain has sane defaults
+USE="${USE} fortran"
diff --git a/profiles/default-linux/mips/2004.2/make.defaults b/profiles/default-linux/mips/2004.2/make.defaults
index 4faf1c6917a8..9603da572254 100644
--- a/profiles/default-linux/mips/2004.2/make.defaults
+++ b/profiles/default-linux/mips/2004.2/make.defaults
@@ -1,28 +1,19 @@
-# Copyright 2000 Daniel Robbins, Gentoo Foundation.
-# System-wide defaults for the Portage system
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2004.2/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="mips"
-# Host-type
+FEATURES="ccache autoconfig"
-CHOST=mips-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j1"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-FEATURES="ccache"
-# C Compiler flags
-CFLAGS="-O2 -pipe"
-# C++ Compiler flags
+# Compiler flags
+# We build a *minimum* of mips2, because just about any mips box we theoretically
+# support should meet the mips2 standard
+CFLAGS="-O2 -pipe -march=mips2"
CXXFLAGS=${CFLAGS}
-USE="slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
-
ACCEPT_KEYWORDS="mips"
-COMPILER="gcc3"
+USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips -multilib nomultilib -n32 -n64"
+GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips -multilib nomultilib -n32 -n64"
diff --git a/profiles/default-linux/mips/2004.2/parent b/profiles/default-linux/mips/2004.2/parent
index 74853ef4eaaf..f8afcd1b3d54 100644
--- a/profiles/default-linux/mips/2004.2/parent
+++ b/profiles/default-linux/mips/2004.2/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2004.2/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/2005.0/make.defaults b/profiles/default-linux/mips/2005.0/make.defaults
index 71280d8a2dce..b32dc13547dc 100644
--- a/profiles/default-linux/mips/2005.0/make.defaults
+++ b/profiles/default-linux/mips/2005.0/make.defaults
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2005.0/make.defaults,v 1.1 2005/01/20 00:28:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2005.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="mips"
diff --git a/profiles/default-linux/mips/2005.0/parent b/profiles/default-linux/mips/2005.0/parent
index 74853ef4eaaf..eb4bc5480b77 100644
--- a/profiles/default-linux/mips/2005.0/parent
+++ b/profiles/default-linux/mips/2005.0/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2005.0/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/cobalt/2004.2/make.defaults b/profiles/default-linux/mips/cobalt/2004.2/make.defaults
index bf44943200e4..80527dbea294 100644
--- a/profiles/default-linux/mips/cobalt/2004.2/make.defaults
+++ b/profiles/default-linux/mips/cobalt/2004.2/make.defaults
@@ -1,32 +1,27 @@
-# Copyright 2000 Daniel Robbins, Gentoo Foundation.
-# System-wide defaults for the Portage system
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2004.2/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="mips"
-# Host-type
-
-# Cobalt is little-endian mips
-CHOST=mipsel-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j1"
+# cobalt is a little endian, 32bit-only system
+CHOST="mipsel-unknown-linux-gnu"
# Distinguish cobalt from other mips profiles
PROFILE_ARCH="cobalt"
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-FEATURES="ccache"
-# C Compiler flags
-CFLAGS="-O2 -pipe"
-# C++ Compiler flags
-CXXFLAGS=${CFLAGS}
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
-USE="slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+# Compiler flags
+# We build mips4 by default because all cobalt systems use an RM5231 (or derivative)
+# CPU, which is in the R5000-class and is thus mips4 capable. We also force the
+# ABI to o32 because there is no mips64 support on cobalt (yet) and it therefore
+# cannot run anything else.
+CFLAGS="-O2 -pipe -march=mips4 -mabi=32"
+CXXFLAGS=${CFLAGS}
ACCEPT_KEYWORDS="mips"
-COMPILER="gcc3"
-
+USE="readline gpm berkdb fortran gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
+GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
diff --git a/profiles/default-linux/mips/cobalt/2004.2/parent b/profiles/default-linux/mips/cobalt/2004.2/parent
index 74853ef4eaaf..6421aace3925 100644
--- a/profiles/default-linux/mips/cobalt/2004.2/parent
+++ b/profiles/default-linux/mips/cobalt/2004.2/parent
@@ -1,7 +1,6 @@
# 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 $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2004.2/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/cobalt/2005.0/make.defaults b/profiles/default-linux/mips/cobalt/2005.0/make.defaults
index 459787721d03..a3d0f0540414 100644
--- a/profiles/default-linux/mips/cobalt/2005.0/make.defaults
+++ b/profiles/default-linux/mips/cobalt/2005.0/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 2004 Gentoo Foundation.
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2005.0/make.defaults,v 1.1 2005/01/20 12:39:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2005.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="mips"
@@ -23,5 +23,5 @@ CXXFLAGS=${CFLAGS}
ACCEPT_KEYWORDS="mips"
-USE="readline gpm berkdb fortran f77 gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
+USE="readline gpm berkdb fortran gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
diff --git a/profiles/default-linux/mips/cobalt/2005.0/parent b/profiles/default-linux/mips/cobalt/2005.0/parent
index c98e7680d7ce..01fdbbca530f 100644
--- a/profiles/default-linux/mips/cobalt/2005.0/parent
+++ b/profiles/default-linux/mips/cobalt/2005.0/parent
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2005.0/parent,v 1.1 2005/01/20 12:39:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2005.0/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/cobalt/packages b/profiles/default-linux/mips/cobalt/packages
index fb17706cb1b4..ef541bb901fd 100644
--- a/profiles/default-linux/mips/cobalt/packages
+++ b/profiles/default-linux/mips/cobalt/packages
@@ -1,7 +1,6 @@
-# cobalt-mips base packages
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
# Controls the front LCD panel
*sys-apps/lcdutils
-
-# Bootloader
-*sys-boot/colo
diff --git a/profiles/default-linux/mips/cobalt/parent b/profiles/default-linux/mips/cobalt/parent
index 74853ef4eaaf..5a772e7309b1 100644
--- a/profiles/default-linux/mips/cobalt/parent
+++ b/profiles/default-linux/mips/cobalt/parent
@@ -1,7 +1,6 @@
# 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 $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/cobalt/use.mask b/profiles/default-linux/mips/cobalt/use.mask
index f0b8671c24b6..c2569e3b8a25 100644
--- a/profiles/default-linux/mips/cobalt/use.mask
+++ b/profiles/default-linux/mips/cobalt/use.mask
@@ -1,4 +1,6 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/use.mask,v 1.1 2004/09/23 05:38:34 kumba Exp $
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/use.mask,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
# Cobalt only does mips32, thus it doesn't know about n32/n64 (yet)
n32
diff --git a/profiles/default-linux/mips/cobalt/virtuals b/profiles/default-linux/mips/cobalt/virtuals
index eb11259319b9..8967aacf0c9d 100644
--- a/profiles/default-linux/mips/cobalt/virtuals
+++ b/profiles/default-linux/mips/cobalt/virtuals
@@ -1,2 +1,4 @@
-# use the colo bootloader
-virtual/bootloader sys-boot/colo
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/virtuals,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
+
diff --git a/profiles/default-linux/mips/mips64/2004.2/make.defaults b/profiles/default-linux/mips/mips64/2004.2/make.defaults
index effdd5996c1c..37f6dd219896 100644
--- a/profiles/default-linux/mips/mips64/2004.2/make.defaults
+++ b/profiles/default-linux/mips/mips64/2004.2/make.defaults
@@ -1,29 +1,27 @@
-# Copyright 2000 Daniel Robbins, Gentoo Foundation.
-# System-wide defaults for the Portage system
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2004.2/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="mips"
-# Host-type
+# Even though this is a 64bit kernel, we use a 32-bit userland (o32)
+CHOST="mips-unknown-linux-gnu"
-CHOST=mips-unknown-linux-gnu
-PLATFORM=mips64-unknown-linux-gnu
+# Used in ebuilds for verifying mips64 profile
PROFILE_ARCH="mips64"
-# Options passed to make during the build process
-MAKEOPTS="-j1"
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-FEATURES="ccache"
-# C Compiler flags
-CFLAGS="-O2 -pipe"
-# C++ Compiler flags
+# Compiler flags
+# We build a *minimum* of mips3, because just about any mips64 box we theoretically
+# support should meet the mips3 standard. This is also the mips64 o32 profile,
+# so make that the default ABI
+CFLAGS="-O2 -pipe -march=mips3 -mabi=32"
CXXFLAGS=${CFLAGS}
-USE="slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
-
ACCEPT_KEYWORDS="mips"
-COMPILER="gcc3"
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
diff --git a/profiles/default-linux/mips/mips64/2004.2/packages b/profiles/default-linux/mips/mips64/2004.2/packages
index 7dff7a119d02..ef0a1602ed80 100644
--- a/profiles/default-linux/mips/mips64/2004.2/packages
+++ b/profiles/default-linux/mips/mips64/2004.2/packages
@@ -1,5 +1,13 @@
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2004.2/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
+
# mips64 o32 packages
# Since we're running a mips64 kernel w/ 32bit (o32) userland,
# we need gcc-mips64 for kernels
-sys-devel/gcc-mips64
+*sys-devel/gcc-mips64
+
+# Sometimes necessary to trick programs into thinking we're really
+# a mips32 system.
+*sys-devel/mips32
diff --git a/profiles/default-linux/mips/mips64/2004.2/parent b/profiles/default-linux/mips/mips64/2004.2/parent
index 74853ef4eaaf..79d056770393 100644
--- a/profiles/default-linux/mips/mips64/2004.2/parent
+++ b/profiles/default-linux/mips/mips64/2004.2/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2004.2/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/mips64/2005.0/make.defaults b/profiles/default-linux/mips/mips64/2005.0/make.defaults
index 4c87f7e6a900..297b5602f4b9 100644
--- a/profiles/default-linux/mips/mips64/2005.0/make.defaults
+++ b/profiles/default-linux/mips/mips64/2005.0/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 2004 Gentoo Foundation.
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2005.0/make.defaults,v 1.1 2005/01/20 12:28:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2005.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="mips"
@@ -22,6 +22,6 @@ CXXFLAGS=${CFLAGS}
ACCEPT_KEYWORDS="mips"
-USE="readline fortran f77 gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
diff --git a/profiles/default-linux/mips/mips64/2005.0/packages b/profiles/default-linux/mips/mips64/2005.0/packages
index 1e170e659fa9..a818b5b7ba1e 100644
--- a/profiles/default-linux/mips/mips64/2005.0/packages
+++ b/profiles/default-linux/mips/mips64/2005.0/packages
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2005.0/packages,v 1.1 2005/01/20 12:28:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2005.0/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
# mips64 o32 packages
diff --git a/profiles/default-linux/mips/mips64/2005.0/parent b/profiles/default-linux/mips/mips64/2005.0/parent
index 74853ef4eaaf..7fb9ca5c8ec1 100644
--- a/profiles/default-linux/mips/mips64/2005.0/parent
+++ b/profiles/default-linux/mips/mips64/2005.0/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2005.0/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/mips64/ip28/2005.0/make.defaults b/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults
index c0180b71169f..514ed66b604b 100644
--- a/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults
+++ b/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 2004 Gentoo Foundation.
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults,v 1.1 2005/01/09 18:45:51 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="mips"
@@ -20,6 +20,6 @@ CXXFLAGS=${CFLAGS}
ACCEPT_KEYWORDS="mips"
-USE="readline fortran f77 gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips ip28"
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips ip28"
GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips ip28"
diff --git a/profiles/default-linux/mips/mips64/ip28/2005.0/packages b/profiles/default-linux/mips/mips64/ip28/2005.0/packages
index 03346a657b64..6c1fd280a63e 100644
--- a/profiles/default-linux/mips/mips64/ip28/2005.0/packages
+++ b/profiles/default-linux/mips/mips64/ip28/2005.0/packages
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/ip28/2005.0/packages,v 1.1 2005/01/09 18:45:51 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/ip28/2005.0/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
# mips64 o32 packages
diff --git a/profiles/default-linux/mips/mips64/ip28/2005.0/parent b/profiles/default-linux/mips/mips64/ip28/2005.0/parent
index 74853ef4eaaf..8ddce5e9286b 100644
--- a/profiles/default-linux/mips/mips64/ip28/2005.0/parent
+++ b/profiles/default-linux/mips/mips64/ip28/2005.0/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/ip28/2005.0/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/mips64/ip28/parent b/profiles/default-linux/mips/mips64/ip28/parent
index 74853ef4eaaf..763fb2d6d33e 100644
--- a/profiles/default-linux/mips/mips64/ip28/parent
+++ b/profiles/default-linux/mips/mips64/ip28/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/ip28/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/mips64/multilib/2005.1/make.defaults b/profiles/default-linux/mips/mips64/multilib/2005.1/make.defaults
index 4393446447eb..0aa442024393 100644
--- a/profiles/default-linux/mips/mips64/multilib/2005.1/make.defaults
+++ b/profiles/default-linux/mips/mips64/multilib/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/mips/mips64/multilib/2005.1/make.defaults,v 1.1 2005/04/27 05:13:34 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/multilib/2005.1/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
STAGE1_USE=""
GRP_STAGE23_USE="${STAGE1_USE} ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses readline zlib -java"
diff --git a/profiles/default-linux/mips/mips64/multilib/2005.1/parent b/profiles/default-linux/mips/mips64/multilib/2005.1/parent
index 74853ef4eaaf..641fc30c1aa4 100644
--- a/profiles/default-linux/mips/mips64/multilib/2005.1/parent
+++ b/profiles/default-linux/mips/mips64/multilib/2005.1/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/multilib/2005.1/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/mips64/multilib/make.defaults b/profiles/default-linux/mips/mips64/multilib/make.defaults
index cc021aac39d7..ff1723e1eecb 100644
--- a/profiles/default-linux/mips/mips64/multilib/make.defaults
+++ b/profiles/default-linux/mips/mips64/multilib/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/mips/mips64/multilib/make.defaults,v 1.1 2005/04/27 05:13:34 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/multilib/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
CHOST="mips64-unknown-linux-gnu"
ARCH="mips"
diff --git a/profiles/default-linux/mips/mips64/multilib/parent b/profiles/default-linux/mips/mips64/multilib/parent
index 74853ef4eaaf..3c6f8aff486d 100644
--- a/profiles/default-linux/mips/mips64/multilib/parent
+++ b/profiles/default-linux/mips/mips64/multilib/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/multilib/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/mips64/multilib/profile.bashrc b/profiles/default-linux/mips/mips64/multilib/profile.bashrc
index 3ff38a8eb45f..8efb557bda3e 100644
--- a/profiles/default-linux/mips/mips64/multilib/profile.bashrc
+++ b/profiles/default-linux/mips/mips64/multilib/profile.bashrc
@@ -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/mips/mips64/multilib/profile.bashrc,v 1.1 2005/04/27 05:13:34 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/multilib/profile.bashrc,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
# This isn't ready for mass consumption by the public. Until it's ready,
# block use of this profile.
diff --git a/profiles/default-linux/mips/mips64/multilib/use.mask b/profiles/default-linux/mips/mips64/multilib/use.mask
index 6edc2900e3de..917634eae0ac 100644
--- a/profiles/default-linux/mips/mips64/multilib/use.mask
+++ b/profiles/default-linux/mips/mips64/multilib/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/multilib/use.mask,v 1.1 2005/04/27 05:13:34 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/multilib/use.mask,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# multilib is forced on when we have ${MULTILIB_ABIS} defined
diff --git a/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults b/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults
index 3108b9bb33d3..6971c313b882 100644
--- a/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults
+++ b/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults
@@ -1,36 +1,30 @@
-# copyright 2000 Daniel Robbins, Gentoo Foundation.
-# System-wide defaults for the Portage system
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="mips"
-ABI=n32
-# Host-type
-
-CHOST=mips64-unknown-linux-gnu
-CCHOST=mips64-unknown-linux-gnu
-PLATFORM=${CHOST}
+# n32 is a type of 32bit userland that can only be built with
+# a 64bit compiler, thus we technically use a 64bit userland.
+CHOST="mips64-unknown-linux-gnu"
+# Used in ebuilds for verifying mips64 profile
PROFILE_ARCH="mips64"
-# Options passed to make during the build process
-MAKEOPTS="-j1"
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-FEATURES="debug"
-# C Compiler flags (mips4 atm)
-CFLAGS="-O2 -pipe -mabi=n32 -mips4"
-# C++ Compiler flags
+# Compiler flags
+# We build a *minimum* of mips3, because just about any mips64 box we theoretically
+# support should meet the mips3 standard. This is also the n32 profile, so set
+# the default build ABI to n32
+CFLAGS="-O2 -pipe -march=mips3 -mabi=n32"
CXXFLAGS=${CFLAGS}
-USE="slang readline gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips n32 -multilib"
-
+# There is no "stable" n32 support yet. It's aaaalllll experimental
ACCEPT_KEYWORDS="mips ~mips"
-COMPILER="gcc3"
+STAGE1_USE="n32"
+USE="${STAGE1_USE} readline fortran gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
+GRP_STAGE23_USE="${STAGE1_USE} readline gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
-#Make sure everything is compiled as N32
-#export LDEMULATION=elf32btsmipn32
-#export GNUTARGET=elf32-ntradbigmips
-#EXTRA_ECONF="--libdir=/usr/lib32"
diff --git a/profiles/default-linux/mips/mips64/n32/2004.2/packages b/profiles/default-linux/mips/mips64/n32/2004.2/packages
index 5ad2b4f8a39d..4b42b7f37e0b 100644
--- a/profiles/default-linux/mips/mips64/n32/2004.2/packages
+++ b/profiles/default-linux/mips/mips64/n32/2004.2/packages
@@ -1,24 +1,14 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2004.2/packages,v 1.1 2004/09/27 09:12:55 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2004.2/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
# mips64 n32 packages
-# We want 2.6.6+ headers for n32. 2.6.6 headers are not ready for
-# general consumption, though, so we lock all other mips profiles
-# to 2.4, and unlock 2.6 only for n32.
--*<sys-kernel/mips-headers-2.6.6
-*>=sys-kernel/mips-headers-2.6.6
-
# binutils-2.15* is broken for n32. No idea why, but it won't
# build glibc correctly, so lets mask it for now.
*<sys-devel/binutils-2.15.90.0.1.1
# There is apparently something very funny in gcc-3.4.2 on n32.
# Something related to GOT (global offset table). Have to figure
-# this out eventually.
-*<sys-devel/gcc-3.4.2
-
-# n32 needs a relatively modern glibc
--*<sys-libs/glibc-2.3.4.20040808
-*>=sys-libs/glibc-2.3.4.20040808
+# this out eventually. UPDATE: gcc-3.4.3 seems to work, unmasking
+#*<sys-devel/gcc-3.4.2
diff --git a/profiles/default-linux/mips/mips64/n32/2004.2/parent b/profiles/default-linux/mips/mips64/n32/2004.2/parent
index 74853ef4eaaf..d34f6ab5f986 100644
--- a/profiles/default-linux/mips/mips64/n32/2004.2/parent
+++ b/profiles/default-linux/mips/mips64/n32/2004.2/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2004.2/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/mips64/n32/2005.0/make.defaults b/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults
index fdfb3e902bc6..b1930268ba2a 100644
--- a/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults
+++ b/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults
@@ -1,13 +1,9 @@
-# Copyright 2004 Gentoo Foundation.
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults,v 1.1 2005/01/20 12:38:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="mips"
-# This is ugly and evil. hopefully to be removed... soon. replaced by
-# STAGE1_USE in bootstrap-cascade.sh
-ABI="n32"
-
# n32 is a type of 32bit userland that can only be built with
# a 64bit compiler, thus we technically use a 64bit userland.
CHOST="mips64-unknown-linux-gnu"
@@ -29,6 +25,6 @@ CXXFLAGS=${CFLAGS}
ACCEPT_KEYWORDS="mips ~mips"
STAGE1_USE="n32"
-USE="${STAGE1_USE} readline fortran f77 gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
+USE="${STAGE1_USE} readline fortran gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
GRP_STAGE23_USE="${STAGE1_USE} readline gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
diff --git a/profiles/default-linux/mips/mips64/n32/2005.0/packages b/profiles/default-linux/mips/mips64/n32/2005.0/packages
index 20ff4e43f9d0..f63e616c247f 100644
--- a/profiles/default-linux/mips/mips64/n32/2005.0/packages
+++ b/profiles/default-linux/mips/mips64/n32/2005.0/packages
@@ -1,24 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2005.0/packages,v 1.1 2005/01/20 12:38:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2005.0/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
# mips64 n32 packages
-# We want 2.6.6+ headers for n32. 2.6.6 headers are not ready for
-# general consumption, though, so we lock all other mips profiles
-# to 2.4, and unlock 2.6 only for n32.
--*<sys-kernel/mips-headers-2.6.6
-*>=sys-kernel/mips-headers-2.6.6
-
-# binutils-2.15* is broken for n32. No idea why, but it won't
-# build glibc correctly, so lets mask it for now.
-*<sys-devel/binutils-2.15.90.0.1.1
-
-# There is apparently something very funny in gcc-3.4.2 on n32.
-# Something related to GOT (global offset table). Have to figure
-# this out eventually.
-*<sys-devel/gcc-3.4.2
-
-# n32 needs a relatively modern glibc - Portage Atoms Broke?
-#-~sys-libs/glibc-2.3.4.20040808
-#*>=sys-libs/glibc-2.3.4.20040808
diff --git a/profiles/default-linux/mips/mips64/n32/2005.0/parent b/profiles/default-linux/mips/mips64/n32/2005.0/parent
index 74853ef4eaaf..e579d0d8bbbf 100644
--- a/profiles/default-linux/mips/mips64/n32/2005.0/parent
+++ b/profiles/default-linux/mips/mips64/n32/2005.0/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2005.0/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/mips64/n32/parent b/profiles/default-linux/mips/mips64/n32/parent
index 74853ef4eaaf..ca5dc19180f9 100644
--- a/profiles/default-linux/mips/mips64/n32/parent
+++ b/profiles/default-linux/mips/mips64/n32/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/mips64/parent b/profiles/default-linux/mips/mips64/parent
index 74853ef4eaaf..67f235db8bc2 100644
--- a/profiles/default-linux/mips/mips64/parent
+++ b/profiles/default-linux/mips/mips64/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/packages b/profiles/default-linux/mips/packages
index e44de1d9c667..d1486b36b3af 100644
--- a/profiles/default-linux/mips/packages
+++ b/profiles/default-linux/mips/packages
@@ -1,10 +1,7 @@
-# mips base packages
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
+# Top-level mips profile
-# Core Packages
-*>=sys-devel/gnuconfig-20030708
-*>=sys-kernel/mips-headers-2.4.21
-
-# Don't Work
-!dev-lang/gpc
-
+# Nothing here!
diff --git a/profiles/default-linux/mips/parent b/profiles/default-linux/mips/parent
index 74853ef4eaaf..885272165d6f 100644
--- a/profiles/default-linux/mips/parent
+++ b/profiles/default-linux/mips/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/mips/use.mask b/profiles/default-linux/mips/use.mask
index aa8fd37002f9..2d411350bd74 100644
--- a/profiles/default-linux/mips/use.mask
+++ b/profiles/default-linux/mips/use.mask
@@ -1,22 +1,114 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/use.mask,v 1.1 2004/09/23 05:38:34 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/use.mask,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
# Stephen P. Becker <geoman@gentoo.org>
-# mask evolution use flag until it can be properly tested
+# remasking hal because of numerous dependency issues
+hal
+
+# Aaron Walker <ka0ttic@gentoo.org>
+# Temporarily masking until net-nds/c-ares can be tested properly
+ares
+
+# Stephen P. Becker <geoman@gentoo.org>
+# masking mono because it doesn't work on mips
+mono
+
+# Hardave Riar <hardave@gentoo.org>
+# Temporarily masking ieee1394 until it can be tested
+# Quick fix to my tree b0rkage
+ieee1394
+
+# Hardave Riar <hardave@gentoo.org>
+# No hardware support
+lm_sensors
+
+# Hardave Riar <hardave@gentoo.org>
+# Temporarily masking wifi until I can test it
+# Preventing kde from going stable
+wifi
+
+# Henrik Brix Andersen <brix@gentoo.org>
+# According to the mips herd, we currently have no way of testing
+# pcmcia on mips, bug #90359
+pcmcia
+
+# John N. Laliberte <allanonjl@gentoo.org>
+# mask scanner support
+scanner
+
+# Stephen P. Becker <geoman@gentoo.org>
+# mad just spits out static on mips (ip22)
+mad
+
+# Stephen P. Becker <geoman@gentoo.org>
+# masked until an alsa driver finally works on mips
+alsa
+
+# Armando Di Cianno <fafhrd@gentoo.org>
+# gnustep is currently unbuildable on mips - masking this to repair windowmaker
+# broken mips keywording becuase of 'gnustep' USE flag
+gnustep
+
+# Hardave Riar <hardave@gentoo.org>
+# This should work, someone with a usb card and digital camera should test it
+gphoto2
+
+# Hardave Riar <hardave@gentoo.org>
+# This will probablly work, but no hardware to test with
+gnokii
+
+# Hardave Riar <hardave@gentoo.org>
+# x86 binary only package
+fdftk
+
+# Ciaran McCreesh <ciaranm@gentoo.org>
+# unresolved dep, bug #82428
+emboss
+
+# Joshua Kinard <kumba@gentoo.org>
+# dietlibc isn't known to work on mips
+diet
+
+# Stephen P. Becker <geoman@gentoo.org>
+# masked because it hoses xchat on 64-bit machines
+xosd
+
+# Stephen P. Becker <geoman@gentoo.org>
+# masked for now until this can be properly tested with alsa
+jack
+
+# Stephen P. Becker <geoman@gentoo.org>
+# masked because of silly java deps with gnome (we have no jre on mips)
+accessibility
+
+# Stephen P. Becker <geoman@gentoo.org>
+# masked because mozilla doesn't work on mips
+mozilla
+
+# Stephen P. Becker <geoman@gentoo.org>
+# masked because I say so, gnome--
+pda
+
+# Ciaran McCreesh <ciaranm@gentoo.org>
+# not even slightly reliable, bug #65216
+mzscheme
+
+# Stephen P. Becker <geoman@gentoo.org>
+# masked because gaim sucks
evo
# Ilya A. Volynets-Evenbach
# no nptl on mips yet
nptl
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
-
# Paul de Vrieze <pauldv@gentoo.org>
# There is no java in this profile (if there is it must be available). Without
# this repoman will fail on apps like sys-libs/db
java
+# Ciaran McCreesh <ciaranm@gentoo.org>
+# No java, no netbeans
+netbeans
+
# Aron Griffis <agriffis@gentoo.org>
# acl doesn't build on mips atm. Mask it so that vim quits
# complaining
@@ -25,8 +117,6 @@ acl
# Flags which aren't applicable to mips (Mostly copied from sparc)
3dfx
-3dnow
-accessibility
acpi
afs
altivec
@@ -40,9 +130,7 @@ informix
firebird
ggi
lirc
-mmx
oci8
-sse
svga
tcc
trusted
@@ -52,18 +140,20 @@ emacs
# And arch keyword flags that don't work
-x86
-ppc
alpha
-hppa
-arm
amd64
+arm
+hppa
ia64
+mips
+ppc
ppc64
+ppc-macos
s390
-uclibc
-macos
+sparc
+x86
x86-obsd
+x86-fbsd
# 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
@@ -89,3 +179,12 @@ pfpro
solid
sybase
sybase-ct
+djbfft
+glitz
+pike
+ocaml
+timidity
+
+# Unmask our instruction sets
+-n32
+-n64
diff --git a/profiles/default-linux/mips/virtuals b/profiles/default-linux/mips/virtuals
index 032999d1e355..43a2fb9e1eb6 100644
--- a/profiles/default-linux/mips/virtuals
+++ b/profiles/default-linux/mips/virtuals
@@ -1,17 +1,7 @@
-# Copyright 2004 Gentoo Foundation.
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/virtuals,v 1.1 2004/09/23 05:38:34 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/virtuals,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
-# Virtuals
-virtual/bootloader sys-boot/dvhtool
-virtual/cron sys-apps/vixie-cron
-virtual/kernel sys-kernel/mips-headers
+virtual/alsa sys-kernel/mips-sources
virtual/linux-sources sys-kernel/mips-sources
-virtual/logger app-admin/sysklogd
-virtual/modutils sys-apps/module-init-tools
-virtual/os-headers sys-kernel/mips-headers
-virtual/mailx mail-client/mailx
-
-
-# Package Remapping
-sys-apps/reiserfs-utils sys-fs/reiserfsprogs
+virtual/os-headers sys-kernel/mips-headers
diff --git a/profiles/default-linux/packages b/profiles/default-linux/packages
index ea99bfae437a..00c98c9324a8 100644
--- a/profiles/default-linux/packages
+++ b/profiles/default-linux/packages
@@ -1,11 +1,13 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/packages,v 1.1 2004/03/19 21:58:52 seemant Exp $
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/packages,v 1.1.1.1 2005/11/30 09:48:34 chriswhite Exp $
# This file extends the base packages file for the default profile that all
# architectures will enjoy. Please note that default is what most architectures
# will have. Some will have an selinux profile (see ${PORTDIR}/profiles/selinux).
# The idea is to only create a new family of profiles when absolutely necessary.
+
+*sys-apps/busybox
+*sys-apps/hdparm
*sys-apps/util-linux
-*virtual/linux-sources
-<sys-apps/shadow-5
+*sys-libs/pwdb
diff --git a/profiles/default-linux/packages.build b/profiles/default-linux/packages.build
index 2341b6520445..7e4bd126c3d6 100644
--- a/profiles/default-linux/packages.build
+++ b/profiles/default-linux/packages.build
@@ -1,14 +1,15 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/packages.build,v 1.1 2004/09/14 15:28:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/packages.build,v 1.1.1.1 2005/11/30 09:48:34 chriswhite Exp $
# This file describes the packages needed to build a stage 1 based on this
-# profile
+# profile. Packages in this file are built in order.
+
+# Please do not move perl before baselayout doing so will break lib -> lib64
+# symlinks on systems that use them.
app-arch/bzip2
-app-arch/gzip
app-arch/tar
-app-editors/nano
app-shells/bash
dev-lang/python
net-misc/rsync
@@ -31,6 +32,11 @@ sys-devel/bison
sys-devel/flex
sys-devel/gcc
sys-devel/gettext
+sys-devel/gnuconfig
sys-devel/make
sys-devel/patch
-sys-libs/glibc
+dev-lang/perl
+virtual/editor
+virtual/gzip
+virtual/libc
+virtual/os-headers
diff --git a/profiles/default-linux/parent b/profiles/default-linux/parent
index dacffa034b3a..0e78bb2b43d5 100644
--- a/profiles/default-linux/parent
+++ b/profiles/default-linux/parent
@@ -1,8 +1,8 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/parent,v 1.1 2004/03/19 21:58:52 seemant Exp $
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/parent,v 1.1.1.1 2005/11/30 09:48:34 chriswhite Exp $
# This file describes the parent profile to this. In most cases this will
# just be the name of the parent directory
-base
+../base
diff --git a/profiles/default-linux/ppc/1.0/deprecated b/profiles/default-linux/ppc/1.0/deprecated
index e69de29bb2d1..08b21a39c433 100644
--- a/profiles/default-linux/ppc/1.0/deprecated
+++ b/profiles/default-linux/ppc/1.0/deprecated
@@ -0,0 +1,5 @@
+default-linux/ppc/2004.2
+# emerge -n '>=sys-apps/portage-2.0.51'
+# cd /etc/
+# rm make.profile
+# ln -s ../usr/portage/profiles/default-linux/ppc/2004.2 make.profile
diff --git a/profiles/default-linux/ppc/1.0/make.defaults b/profiles/default-linux/ppc/1.0/make.defaults
index e93b497a1126..d55192d89502 100644
--- a/profiles/default-linux/ppc/1.0/make.defaults
+++ b/profiles/default-linux/ppc/1.0/make.defaults
@@ -1,31 +1,16 @@
-# Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc.
-# System-wide defaults for the Portage system
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
ARCH="ppc"
+ACCEPT_KEYWORDS="ppc"
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-# C Compiler flags
-CFLAGS="-O2 -pipe"
-# C++ Compiler flags
-CXXFLAGS=${CFLAGS}
+CHOST="powerpc-unknown-linux-gnu"
+CFLAGS="-O2 -fno-strict-aliasing -pipe"
+CXXFLAGS="${CFLAGS}"
-USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg
-nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde
-motif opengl mozilla png truetype ppc"
+FEATURES="sandbox sfperms"
-# The following USE should _not_ bet set on ppc as they can cause breakage
-# in some pacakges (are mostly x86 only options)
-# 3dfx 3dnow avi icc icc-pgo mmx svga sse nas
+GRP_STAGE23_USE="berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd unicode"
-ACCEPT_KEYWORDS="ppc"
+USE="alsa berkdb bitmap-fonts crypt cups emboss fortran gif gnome gpm gtk gtk2 ipv6 jpeg kde libwww mp3 motif mpeg ncurses nls oggvorbis opengl pam pdflib perl png python qt readline spell ssl tcpd truetype truetype-fonts type1-fonts X xml2 xv unicode zlib oss dvd slang gdbm mitshm esd imlib sdl mozilla"
diff --git a/profiles/default-linux/ppc/1.0/packages b/profiles/default-linux/ppc/1.0/packages
index a4acf5925720..5ce9b6d200f6 100644
--- a/profiles/default-linux/ppc/1.0/packages
+++ b/profiles/default-linux/ppc/1.0/packages
@@ -1,238 +1,23 @@
-# IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0/packages,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
-# OK; you're staring at this file and you have no idea what these stars are
-# for. Here's the scoop. An initial "*" marks a package that is part of the
-# official "base" system profile. If there's a "*", then "emerge system" will
-# use the line in its calculations of what "should" be installed for this
-# profile. Lines without a "*" prefix will be ignored for profile
-# calculations.
+# This is a gcc 2.95 profile, gcc, glibc and binutils cannot be updated
-# Now, this is new: *all* lines (star or no star) will be used as a special
-# package *inclusion* mask. For example, the line *=sys-devel/gcc-2.95.3-r1
-# will cause Portage to totally ignore all gcc ebuilds other than
-# gcc-2.95.3-r1. >=, <=, <, > and ~ can be used to offer a bit more
-# flexibility. For example, >=sys-libs/glibc-2.2.4 will cause emerge to ignore
-# all glibc ebuilds with a version less than 2.2.4. This allows us to have
-# profile-specific package.mask settings. *All* lines are used for this
-# masking process, whether they are prefixed with a * or not. And if a generic
-# dep is used, like "sys-apps/foo", then all versions of foo are included. If
-# there is no entry, then all versions of an app are included. The key thing
-# to note is that this file does not need to end up being an exhaustive list
-# of portage packages; just the ones critical to this profile.
-
-# So, what happens to /usr/portage/profiles/package.mask? It's still around,
-# and still useful. But it should mainly be used for broken ebuilds only.
-# package.mask continues to function as normal, masking out ebuilds from *all*
-# system profiles.
-
-# Which to use? Use the profile-specific stuff to "lock down" specific
-# versions of ebuilds. Gentoo Linux 1.0_rc6 uses certain known-compatible
-# versions of binutils, gcc and glibc, so we lock them down here. This
-# prevents the user from shooting himself/herself in the foot by installing a
-# wacky version.
-
-# PPC 1.0 PROFILE - Pieter Van den Abeele <pvdabeel@gentoo.org>
-
-#
-# Temporary masking here only please (permanent ones at bottom)
-#
-
-# Looks like a whole bunch of x86 stuff in the ebuild that I'm not sure
-# will work so great on the PPC so it's masked for PPC testing.
-# Owen - July 0/02
-~net-fs/openafs
-
-# x86 asm in this one, might be fixable at a later date (?) Gerk - june 24 2002
-~media-video/drip
-
-# xine currently has (known) ppc problems
-<media-libs/xine-lib-0.9.11
-<media-video/xine-ui-0.9.11
-<media-video/xine-dvdnav-0.9.11
-
-# vnc code (even from vendor) not very ppc happy at all
-# tightvnc works, so masking this for now - Gerk June 26 2002
-~net-misc/vnc
-
-# temp (to fix) currently x86 only builds
-# that can be adjusted for ppc (gerk)
-~media-gfx/blender
-~media-video/ati-gatos
-
-#
-# Profile specific pkgs start here
-#
+*=sys-devel/binutils-2.12.90.0.7
+*=sys-devel/gcc-2.95.3*
+*=sys-libs/glibc-2.2.5*
-# lock down the gcc 2.95.3 compiled versions of blackdown
-<=dev-java/blackdown-jdk-1.3.1-r8
-<=dev-java/blackdown-jre-1.3.1-r8
+# This version of blackdown is compiled with a gcc 2.95 compiler
-*app-arch/ncompress
-*sys-apps/baselayout
-*sys-apps/portage
-*=sys-devel/binutils-2.12.90.0.7
-*=sys-devel/gcc-2.95.3-r7
-*~sys-libs/glibc-2.2.5
-*sys-apps/texinfo
+=dev-java/blackdown-jdk-1.3.1-r8
+=dev-java/blackdown-jre-1.3.1-r8
-sys-kernel/ppc-sources
->=sys-kernel/linux-headers-2.4.18
+# emerge system profile
-sys-apps/sysklogd
-*>=dev-lang/python-2.2-r4
->=x11-base/xfree-4.1.0-r2
-*virtual/editor
-#*app-editors/vim # Vim emerges xfree ... this sucks
-*sys-fs/hfsutils
-*virtual/bootloader
-*sys-apps/mac-fdisk
-*app-shells/sash
-*dev-lang/perl
-*dev-perl/ExtUtils-MakeMaker
-*net-ftp/ftp
-*net-misc/dhcpcd
-net-misc/netkit-telnetd
-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/eject
-*sys-apps/fbset
-*sys-apps/file
-*sys-apps/fileutils
-*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/modutils
-*sys-apps/net-tools
-*sys-apps/xinetd
-*sys-apps/procps
-*sys-apps/psmisc
*sys-apps/raidtools
*sys-fs/reiserfsprogs
-*sys-apps/sed
-*sys-apps/setserial
-*sys-apps/sh-utils
-*<sys-apps/shadow-5
-*sys-apps/pam-login
-# updated for GLSA
-*>=app-arch/sharutils-4.2.1-r6
-*app-arch/tar
-*sys-apps/textutils
-*sys-apps/util-linux
-*sys-apps/which
-*sys-devel/autoconf
-*>=sys-devel/automake-1.6.1-r5
-*sys-devel/bc
-*sys-devel/bison
-*sys-devel/flex
-*sys-devel/gettext
-*sys-devel/libtool
-*sys-devel/m4
-*sys-devel/make
-*sys-devel/patch
-*sys-libs/cracklib
-*<sys-libs/db-3.2.10
-*sys-libs/gdbm
-*sys-libs/ncurses
-*sys-libs/pam
-*sys-libs/pwdb
-*sys-libs/readline
-*sys-libs/zlib
->=sys-libs/gpm-1.19.3-r5
->=sys-apps/isapnptools-1.23-r6
->=sys-apps/dcron-2.7-r6
-*virtual/ssh
-*>=sys-fs/devfsd-1.3.20
->=sys-apps/xinetd-2.3.3-r6
->=net-fs/samba-2.2.2-r6
-#>=net-fs/samba-2.0.10-r6
->=sys-apps/at-3.1.8-r6
->=app-admin/fcron-1.1.1-r6
->=app-admin/metalog-0.6-r6
->=app-admin/mon-0.38.20-r6
->=app-admin/syslog-ng-1.4.12-r6
->=net-www/apache-1.3.20-r6
->=net-analyzer/ucd-snmp-4.1.2-r6
->=net-ftp/oftpd-0.3.6-r6
->=net-ftp/proftpd-1.2.4-r6
->=net-misc/dhcp-3.0_rc12-r6
->=net-misc/bind-9.1.3-r6
->=net-misc/netkit-timed-0.17-r6
->=net-misc/pdnsd-1.1.6-r6
->=net-mail/exim-3.32-r6
->=net-misc/fakeidentd-1.4-r6
->=net-nds/openldap-1.2.12-r6
->=net-nds/portmap-5b-r6
->=media-sound/alsa-utils-0.5.10-r6
->=net-print/LPRng-3.7.9-r6
->=net-nds/ypbind-1.7-r6
->=net-nds/ypserv-1.3.9-r6
->=net-print/cups-1.1.10-r6
->=sys-apps/apmd-3.0.1-r6
-#>=net-mail/postfix-20010228.5-r6
->=net-misc/portsentry-1.1-r6
->=sys-apps/noflushd-2.4-r6
->=app-text/dictd-1.5.5-r6
->=net-fs/samba-winbind-20010329-r6
->=net-www/wwwoffle-2.6d-r6
->=net-www/squid-2.4.2s-r6
->=net-dialup/ppp-2.4.1-r6
-
-#
-# From here down are premanently 'locked down' builds
-# that are either precompiled bin for x86 or things
-# that don't work on ppc and wont in the future on ppc
-#
-
-# These are ebuilds installing precompiled stuff:
-
-~net-www/netscape-communicator
-~net-www/netscape-flash
-~net-www/netscape-navigator
-~net-www/netscape-plugger
-
-# more precompiled and/or x86 only ebuilds
-# not avail for ppc (gerk)
-~app-text/acroread
-~app-emulation/vmware-workstation
-~app-emulation/wine
-~app-emulation/winesetuptk
-~app-emulation/winex
-~dev-java/ibm-jdk
-~dev-java/sun-jdk
-~dev-java/sun-j2ee
-~dev-java/ibm-jre
-~app-emulation/basiliskII
-~sys-apps/yard
-~app-emulation/dosemu
-~net-www/opera
-~net-www/opera-static
-~dev-util/cvsup
-~media-video/realplayer
-
-# makes no sense on ppc
-~sys-boot/lilo
-~sys-boot/grub
-
-# x86 and sparc only kernels (gerk)
-~sys-kernel/gentoo-sources
-~sys-kernel/crypto-sources
-~sys-kernel/openmosix-sources
-~sys-kernel/redhat-sources
-~sys-kernel/sparc-sources
-~sys-kernel/usermode-sources
-~sys-kernel/xfs-sources
+*sys-fs/hfsutils
+*sys-fs/hfsplusutils
+*sys-fs/mac-fdisk
diff --git a/profiles/default-linux/ppc/1.0/parent b/profiles/default-linux/ppc/1.0/parent
index 832a4b2c88df..f3229c5b9876 100644
--- a/profiles/default-linux/ppc/1.0/parent
+++ b/profiles/default-linux/ppc/1.0/parent
@@ -1,8 +1 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# 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/ppc/1.0/use.mask b/profiles/default-linux/ppc/1.0/use.mask
index de608d3dcd29..305abd820228 100644
--- a/profiles/default-linux/ppc/1.0/use.mask
+++ b/profiles/default-linux/ppc/1.0/use.mask
@@ -37,3 +37,6 @@ rar
# User Mode Linux isn't supported on ppc yet
uml
+
+# Unmask pbbuttonsd
+-pbbuttonsd
diff --git a/profiles/default-linux/ppc/1.0/virtuals b/profiles/default-linux/ppc/1.0/virtuals
index 4bb1f6d5ee59..2eeddc6934a8 100644
--- a/profiles/default-linux/ppc/1.0/virtuals
+++ b/profiles/default-linux/ppc/1.0/virtuals
@@ -1,50 +1,12 @@
-virtual/lpr net-print/cups
-virtual/python dev-lang/python
-virtual/mta net-mail/ssmtp
-virtual/alsa media-sound/alsa-driver
-virtual/kernel sys-kernel/linux-headers
-virtual/linux-sources sys-kernel/ppc-sources
-virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
-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
-sys-apps/console-tools sys-apps/kbd
-virtual/blackbox x11-wm/blackbox
-virtual/emacs app-editors/emacs
-virtual/cron sys-apps/dcron
-sys-apps/reiserfs-utils sys-fs/reiserfsprogs
-virtual/sylpheed net-mail/sylpheed
-virtual/php dev-php/mod_php
-virtual/textbrowser net-www/links
-virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree
-virtual/krb5 app-crypt/heimdal
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0/virtuals,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
+virtual/glu x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/x11 x11-base/xorg-x11
+virtual/xft x11-base/xorg-x11
virtual/bootloader sys-boot/yaboot
-virtual/editor app-editors/nano
-virtual/os-headers sys-kernel/linux-headers
-virtual/modutils sys-apps/modutils
-virtual/inetd sys-apps/xinetd
-virtual/aspell-dict app-dicts/aspell-en
-virtual/skkserv app-i18n/skkserv
-virtual/ghc dev-lang/ghc-bin
-virtual/snmp net-analyzer/net-snmp
-virtual/imap-c-client net-libs/c-client
-virtual/flim app-emacs/flim
-virtual/semi app-emacs/semi
-virtual/tetex app-text/tetex
-virtual/quicktime media-libs/libquicktime
-virtual/bittorrent net-p2p/bittorrent
-virtual/logger app-admin/sysklogd
-
-virtual/ssh net-misc/openssh
-virtual/gzip app-arch/gzip
-virtual/ghostscript app-text/ghostscript
-virtual/w3m net-www/w3m
-virtual/mpg123 media-sound/mpg123
-virtual/dhcpc net-misc/dhcpcd
+virtual/jdk dev-java/ibm-jdk-bin
+virtual/jre dev-java/ibm-jre-bin
+virtual/ghc dev-lang/ghc
+virtual/ooo app-office/openoffice
diff --git a/profiles/default-linux/ppc/1.0_rc/deprecated b/profiles/default-linux/ppc/1.0_rc/deprecated
index e69de29bb2d1..08b21a39c433 100644
--- a/profiles/default-linux/ppc/1.0_rc/deprecated
+++ b/profiles/default-linux/ppc/1.0_rc/deprecated
@@ -0,0 +1,5 @@
+default-linux/ppc/2004.2
+# emerge -n '>=sys-apps/portage-2.0.51'
+# cd /etc/
+# rm make.profile
+# ln -s ../usr/portage/profiles/default-linux/ppc/2004.2 make.profile
diff --git a/profiles/default-linux/ppc/1.0_rc/make.defaults b/profiles/default-linux/ppc/1.0_rc/make.defaults
index 6e050ece9da9..007e62d54f37 100644
--- a/profiles/default-linux/ppc/1.0_rc/make.defaults
+++ b/profiles/default-linux/ppc/1.0_rc/make.defaults
@@ -1,27 +1,16 @@
-# Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc.
-# System-wide defaults for the Portage system
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0_rc/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="ppc"
+ACCEPT_KEYWORDS="ppc"
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
+CHOST="powerpc-unknown-linux-gnu"
+CFLAGS="-O2 -fno-strict-aliasing -pipe"
+CXXFLAGS="${CFLAGS}"
-# C Compiler flags
-CFLAGS="-O2 -pipe"
-# C++ Compiler flags
-CXXFLAGS=${CFLAGS}
+FEATURES="sandbox sfperms"
-USE="oss xv slang readline gpm berkdb gdbm tcpd pam libwww ssl
-nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde
-motif opengl mozilla"
+GRP_STAGE23_USE="berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd unicode"
-ACCEPT_KEYWORDS="ppc"
+USE="alsa berkdb bitmap-fonts crypt cups emboss fortran gif gnome gpm gtk gtk2 ipv6 jpeg kde libwww mp3 motif mpeg ncurses nls oggvorbis opengl pam pdflib perl png python qt readline spell ssl tcpd truetype truetype-fonts type1-fonts X xml2 xv unicode zlib oss slang gdbm mitshm esd sdl mozilla"
diff --git a/profiles/default-linux/ppc/1.0_rc/packages b/profiles/default-linux/ppc/1.0_rc/packages
index 065af5987661..b155cfd83774 100644
--- a/profiles/default-linux/ppc/1.0_rc/packages
+++ b/profiles/default-linux/ppc/1.0_rc/packages
@@ -1,168 +1,12 @@
-# IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0_rc/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
-# OK; you're staring at this file and you have no idea what these stars are
-# for. Here's the scoop. An initial "*" marks a package that is part of the
-# official "base" system profile. If there's a "*", then "emerge system" will
-# use the line in its calculations of what "should" be installed for this
-# profile. Lines without a "*" prefix will be ignored for profile
-# calculations.
+# This profile is deprecated, higly unlikely to still work.
-# Now, this is new: *all* lines (star or no star) will be used as a special
-# package *inclusion* mask. For example, the line *=sys-devel/gcc-2.95.3-r1
-# will cause Portage to totally ignore all gcc ebuilds other than
-# gcc-2.95.3-r1. >=, <=, <, > and ~ can be used to offer a bit more
-# flexibility. For example, >=sys-libs/glibc-2.2.4 will cause emerge to ignore
-# all glibc ebuilds with a version less than 2.2.4. This allows us to have
-# profile-specific package.mask settings. *All* lines are used for this
-# masking process, whether they are prefixed with a * or not. And if a generic
-# dep is used, like "sys-apps/foo", then all versions of foo are included. If
-# there is no entry, then all versions of an app are included. The key thing
-# to note is that this file does not need to end up being an exhaustive list
-# of portage packages; just the ones critical to this profile.
+*=sys-devel/gcc-2.95.3*
+*=sys-libs/glibc-2.2.5*
-# So, what happens to /usr/portage/profiles/package.mask? It's still around,
-# and still useful. But it should mainly be used for broken ebuilds only.
-# package.mask continues to function as normal, masking out ebuilds from *all*
-# system profiles.
-
-# Which to use? Use the profile-specific stuff to "lock down" specific
-# versions of ebuilds. Gentoo Linux 1.0_rc6 uses certain known-compatible
-# versions of binutils, gcc and glibc, so we lock them down here. This
-# prevents the user from shooting himself/herself in the foot by installing a
-# wacky version.
-
-# PPC PROFILE - Pieter Van den Abeele <pvdabeel@gentoo.org>
-
-# makes no sense on ppc
-sys-boot/lilo
-sys-boot/grub
-
-*sys-apps/baselayout
-*sys-apps/portage
-*sys-devel/binutils
-*=sys-devel/gcc-2.95.3-r5
-*~sys-libs/glibc-2.2.5
-
-# Only 2.4.19 is patched for ppc
-# temporarily commented out (debugging)
-#>=sys-kernel/linux-headers-2.4.18
-#>=sys-kernel/linux-sources-2.4.18
-
-#qt-3.0.4 causes big slowdowns on ppc [daybird]
-<=x11-libs/qt-3.0.3.1
-
-sys-apps/sysklogd
-*>=dev-lang/python-2.2-r4
->=x11-base/xfree-4.1.0-r2
-*virtual/editor
-#*app-editors/vim # Vim emerges xfree ... this sucks
*sys-fs/hfsutils
-*virtual/bootloader
-*sys-apps/mac-fdisk
-
-
-# sash - static shell for system recovery
-*app-shells/sash
-
-*dev-lang/perl
-*dev-perl/ExtUtils-MakeMaker
-*net-ftp/ftp
-*net-misc/dhcpcd
-*net-misc/netkit-telnetd
-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/fbset
-*sys-apps/file
-*sys-apps/fileutils
-*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/modutils
-*sys-apps/net-tools
-*sys-apps/xinetd
-*sys-apps/procps
-*sys-apps/psmisc
-*sys-apps/raidtools
-*sys-fs/reiserfsprogs
-*sys-apps/sed
-*sys-apps/setserial
-*sys-apps/sh-utils
-*<sys-apps/shadow-5
-*sys-apps/pam-login
-*app-arch/sharutils
-*app-arch/tar
-*sys-apps/textutils
-*sys-apps/util-linux
-*sys-apps/which
-*sys-devel/autoconf
-*>=sys-devel/automake-1.6.1-r5
-*sys-devel/bc
-*sys-devel/bison
-*sys-devel/flex
-*sys-devel/gettext
-*sys-devel/libtool
-*sys-devel/m4
-*sys-devel/make
-*sys-devel/patch
-*sys-libs/cracklib
-*sys-libs/db
-*sys-libs/gdbm
-*sys-libs/ncurses
-*sys-libs/pam
-*sys-libs/pwdb
-*sys-libs/readline
-*sys-libs/zlib
->=sys-libs/gpm-1.19.3-r5
->=sys-apps/isapnptools-1.23-r6
-*>=sys-apps/dcron-2.7-r6
-*virtual/ssh
-*>=sys-fs/devfsd-1.3.20
->=sys-apps/xinetd-2.3.3-r6
->=net-fs/samba-2.2.2-r6
-#>=net-fs/samba-2.0.10-r6
->=sys-apps/at-3.1.8-r6
->=app-admin/fcron-1.1.1-r6
->=app-admin/metalog-0.6-r6
->=app-admin/mon-0.38.20-r6
->=app-admin/syslog-ng-1.4.12-r6
->=net-www/apache-1.3.20-r6
->=net-analyzer/ucd-snmp-4.1.2-r6
->=net-ftp/oftpd-0.3.6-r6
->=net-ftp/proftpd-1.2.4-r6
->=net-misc/dhcp-3.0_rc12-r6
->=net-misc/bind-9.1.3-r6
->=net-misc/netkit-timed-0.17-r6
->=net-misc/pdnsd-1.1.6-r6
->=net-mail/exim-3.32-r6
->=net-misc/fakeidentd-1.4-r6
->=net-nds/openldap-1.2.12-r6
->=net-nds/portmap-5b-r6
->=media-sound/alsa-utils-0.5.10-r6
->=net-print/LPRng-3.7.9-r6
->=net-nds/ypbind-1.7-r6
->=net-nds/ypserv-1.3.9-r6
->=net-print/cups-1.1.10-r6
->=sys-apps/apmd-3.0.1-r6
-#>=net-mail/postfix-20010228.5-r6
->=net-misc/portsentry-1.1-r6
->=sys-apps/noflushd-2.4-r6
->=app-text/dictd-1.5.5-r6
->=net-fs/samba-winbind-20010329-r6
->=net-www/wwwoffle-2.6d-r6
->=net-www/squid-2.4.2s-r6
->=net-dialup/ppp-2.4.1-r6
+*sys-fs/hfsplusutils
+*sys-fs/mac-fdisk
diff --git a/profiles/default-linux/ppc/1.0_rc/parent b/profiles/default-linux/ppc/1.0_rc/parent
index 832a4b2c88df..f3229c5b9876 100644
--- a/profiles/default-linux/ppc/1.0_rc/parent
+++ b/profiles/default-linux/ppc/1.0_rc/parent
@@ -1,8 +1 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# 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/ppc/1.0_rc/use.mask b/profiles/default-linux/ppc/1.0_rc/use.mask
index de608d3dcd29..305abd820228 100644
--- a/profiles/default-linux/ppc/1.0_rc/use.mask
+++ b/profiles/default-linux/ppc/1.0_rc/use.mask
@@ -37,3 +37,6 @@ rar
# User Mode Linux isn't supported on ppc yet
uml
+
+# Unmask pbbuttonsd
+-pbbuttonsd
diff --git a/profiles/default-linux/ppc/1.0_rc/virtuals b/profiles/default-linux/ppc/1.0_rc/virtuals
index e74da2c3dc57..157cc472edd6 100644
--- a/profiles/default-linux/ppc/1.0_rc/virtuals
+++ b/profiles/default-linux/ppc/1.0_rc/virtuals
@@ -1,48 +1,12 @@
-virtual/lpr net-print/cups
-virtual/python dev-lang/python
-virtual/mta net-mail/ssmtp
-virtual/alsa media-sound/alsa-driver
-virtual/kernel sys-kernel/linux-headers
-virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
-virtual/glut media-libs/glut
-virtual/imapUW net-mail/uw-imap
-x11-libs/xaw x11-libs/Xaw3d
-sys-apps/texinfo sys-devel/gcc
-virtual/jdk dev-java/blackdown-jdk
-virtual/jre dev-java/blackdown-jre
-virtual/imapd net-mail/courier-imap
-virtual/x11-web-browser net-www/mozilla
-sys-apps/console-tools sys-apps/kbd
-virtual/blackbox x11-wm/blackbox
-virtual/emacs app-editors/emacs
-sys-apps/reiserfs-utils sys-fs/reiserfsprogs
-virtual/sylpheed net-mail/sylpheed
-virtual/php dev-php/mod_php
-virtual/textbrowser net-www/links
-virtual/mda net-mail/procmail
-virtual/krb5 app-crypt/heimdal
-virtual/bootloader sys-boot/yaboot
-virtual/editor app-editors/nano
-virtual/os-headers sys-kernel/linux-headers
-virtual/modutils sys-apps/modutils
-virtual/inetd sys-apps/xinetd
-virtual/aspell-dict app-dicts/aspell-en
-virtual/skkserv app-i18n/skkserv
-virtual/ghc dev-lang/ghc-bin
-virtual/snmp net-analyzer/net-snmp
-virtual/imap-c-client net-libs/c-client
-virtual/flim app-emacs/flim
-virtual/semi app-emacs/semi
-virtual/tetex app-text/tetex
-virtual/quicktime media-libs/libquicktime
-virtual/bittorrent net-p2p/bittorrent
-virtual/logger app-admin/sysklogd
-virtual/ssh net-misc/openssh
-virtual/gzip app-arch/gzip
-virtual/ghostscript app-text/ghostscript
-virtual/w3m net-www/w3m
-virtual/mpg123 media-sound/mpg123
-virtual/dhcpc net-misc/dhcpcd
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0_rc/virtuals,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
+virtual/glu x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/x11 x11-base/xorg-x11
+virtual/xft x11-base/xorg-x11
+virtual/bootloader sys-boot/yaboot
+virtual/jdk dev-java/ibm-jdk-bin
+virtual/jre dev-java/ibm-jre-bin
+virtual/ghc dev-lang/ghc
+virtual/ooo app-office/openoffice
diff --git a/profiles/default-linux/ppc/1.2/deprecated b/profiles/default-linux/ppc/1.2/deprecated
index e69de29bb2d1..08b21a39c433 100644
--- a/profiles/default-linux/ppc/1.2/deprecated
+++ b/profiles/default-linux/ppc/1.2/deprecated
@@ -0,0 +1,5 @@
+default-linux/ppc/2004.2
+# emerge -n '>=sys-apps/portage-2.0.51'
+# cd /etc/
+# rm make.profile
+# ln -s ../usr/portage/profiles/default-linux/ppc/2004.2 make.profile
diff --git a/profiles/default-linux/ppc/1.2/make.defaults b/profiles/default-linux/ppc/1.2/make.defaults
index e93b497a1126..59d3270d4c92 100644
--- a/profiles/default-linux/ppc/1.2/make.defaults
+++ b/profiles/default-linux/ppc/1.2/make.defaults
@@ -1,31 +1,16 @@
-# Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc.
-# System-wide defaults for the Portage system
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.2/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
ARCH="ppc"
+ACCEPT_KEYWORDS="ppc"
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-# C Compiler flags
-CFLAGS="-O2 -pipe"
-# C++ Compiler flags
-CXXFLAGS=${CFLAGS}
+CHOST="powerpc-unknown-linux-gnu"
+CFLAGS="-O2 -fno-strict-aliasing -pipe"
+CXXFLAGS="${CFLAGS}"
-USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg
-nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde
-motif opengl mozilla png truetype ppc"
+FEATURES="sandbox sfperms"
-# The following USE should _not_ bet set on ppc as they can cause breakage
-# in some pacakges (are mostly x86 only options)
-# 3dfx 3dnow avi icc icc-pgo mmx svga sse nas
+GRP_STAGE23_USE="berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd unicode"
-ACCEPT_KEYWORDS="ppc"
+USE="alsa berkdb bitmap-fonts crypt cups emboss fortran gif gnome gpm gtk gtk2 ipv6 jpeg kde libwww mp3 motif mpeg ncurses nls oggvorbis opengl pam pdflib perl png python qt readline spell ssl tcpd truetype truetype-fonts type1-fonts X xml2 xv unicode zlib oss dvd slang gdbm mitshm esd imlib sdl mozilla"
diff --git a/profiles/default-linux/ppc/1.2/packages b/profiles/default-linux/ppc/1.2/packages
index 9ab6c4430546..8be5f6d0eb7d 100644
--- a/profiles/default-linux/ppc/1.2/packages
+++ b/profiles/default-linux/ppc/1.2/packages
@@ -1,238 +1,19 @@
-# IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.2/packages,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
-# OK; you're staring at this file and you have no idea what these stars are
-# for. Here's the scoop. An initial "*" marks a package that is part of the
-# official "base" system profile. If there's a "*", then "emerge system" will
-# use the line in its calculations of what "should" be installed for this
-# profile. Lines without a "*" prefix will be ignored for profile
-# calculations.
-
-# Now, this is new: *all* lines (star or no star) will be used as a special
-# package *inclusion* mask. For example, the line *=sys-devel/gcc-2.95.3-r1
-# will cause Portage to totally ignore all gcc ebuilds other than
-# gcc-2.95.3-r1. >=, <=, <, > and ~ can be used to offer a bit more
-# flexibility. For example, >=sys-libs/glibc-2.2.4 will cause emerge to ignore
-# all glibc ebuilds with a version less than 2.2.4. This allows us to have
-# profile-specific package.mask settings. *All* lines are used for this
-# masking process, whether they are prefixed with a * or not. And if a generic
-# dep is used, like "sys-apps/foo", then all versions of foo are included. If
-# there is no entry, then all versions of an app are included. The key thing
-# to note is that this file does not need to end up being an exhaustive list
-# of portage packages; just the ones critical to this profile.
-
-# So, what happens to /usr/portage/profiles/package.mask? It's still around,
-# and still useful. But it should mainly be used for broken ebuilds only.
-# package.mask continues to function as normal, masking out ebuilds from *all*
-# system profiles.
-
-# Which to use? Use the profile-specific stuff to "lock down" specific
-# versions of ebuilds. Gentoo Linux 1.0_rc6 uses certain known-compatible
-# versions of binutils, gcc and glibc, so we lock them down here. This
-# prevents the user from shooting himself/herself in the foot by installing a
-# wacky version.
-
-# PPC 1.2 PROFILE
-
-#
-# Temporary masking here only please (permanent ones at bottom)
-#
-
-# Looks like a whole bunch of x86 stuff in the ebuild that I'm not sure
-# will work so great on the PPC so it's masked for PPC testing.
-# Owen - July 0/02
-~net-fs/openafs
-
-# x86 asm in this one, might be fixable at a later date (?) Gerk - june 24 2002
-~media-video/drip
-
-# xine currently has (known) ppc problems
-<media-libs/xine-lib-0.9.11
-<media-video/xine-ui-0.9.11
-<media-video/xine-dvdnav-0.9.11
-
-# vnc code (even from vendor) not very ppc happy at all
-# tightvnc works, so masking this for now - Gerk June 26 2002
-~net-misc/vnc
-
-# temp (to fix) currently x86 only builds
-# that can be adjusted for ppc (gerk)
-~media-gfx/blender
-~media-video/ati-gatos
-
-#
-# Profile specific pkgs start here
-#
+# This profile is deprecated, might still work, but is around for historic reasons
# lock down the gcc 2.95.3 compiled versions of blackdown
<=dev-java/blackdown-jdk-1.3.1-r8
<=dev-java/blackdown-jre-1.3.1-r8
-*app-arch/ncompress
-*sys-apps/baselayout
-*sys-apps/portage
-*=sys-devel/binutils-2.12.90.0.7
-*=sys-devel/gcc-2.95.3-r7
-*~sys-libs/glibc-2.2.5
-*sys-apps/texinfo
+# gcc-2.95 specific profile, updating binutils, gcc or glibc is not possible
-sys-kernel/ppc-sources
->=sys-kernel/linux-headers-2.4.18
+*=sys-devel/binutils-2.12.90.0.7
+*=sys-devel/gcc-2.95.3*
+*=sys-libs/glibc-2.2.5*
-sys-apps/sysklogd
-*>=dev-lang/python-2.2-r4
->=x11-base/xfree-4.1.0-r2
-*virtual/editor
-#*app-editors/vim # Vim emerges xfree ... this sucks
*sys-fs/hfsutils
-*virtual/bootloader
-*sys-apps/mac-fdisk
-*app-shells/sash
-*dev-lang/perl
-*dev-perl/ExtUtils-MakeMaker
-*net-ftp/ftp
-*net-misc/dhcpcd
-net-misc/netkit-telnetd
-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/eject
-*sys-apps/fbset
-*sys-apps/file
-*sys-apps/fileutils
-*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/modutils
-*sys-apps/net-tools
-*sys-apps/xinetd
-*sys-apps/procps
-*sys-apps/psmisc
-*sys-apps/raidtools
-*sys-fs/reiserfsprogs
-*sys-apps/sed
-*sys-apps/setserial
-*sys-apps/sh-utils
-*<sys-apps/shadow-5
-*sys-apps/pam-login
-# updated for GLSA
-*>=app-arch/sharutils-4.2.1-r6
-*app-arch/tar
-*sys-apps/textutils
-*sys-apps/util-linux
-*sys-apps/which
-*sys-devel/autoconf
-*>=sys-devel/automake-1.6.1-r5
-*sys-devel/bc
-*sys-devel/bison
-*sys-devel/flex
-*sys-devel/gettext
-*sys-devel/libtool
-*sys-devel/m4
-*sys-devel/make
-*sys-devel/patch
-*sys-libs/cracklib
-*<sys-libs/db-3.2.10
-*sys-libs/gdbm
-*sys-libs/ncurses
-*sys-libs/pam
-*sys-libs/pwdb
-*sys-libs/readline
-*sys-libs/zlib
->=sys-libs/gpm-1.19.3-r5
->=sys-apps/isapnptools-1.23-r6
->=sys-apps/dcron-2.7-r6
-*virtual/ssh
-*>=sys-fs/devfsd-1.3.20
->=sys-apps/xinetd-2.3.3-r6
->=net-fs/samba-2.2.2-r6
-#>=net-fs/samba-2.0.10-r6
->=sys-apps/at-3.1.8-r6
->=app-admin/fcron-1.1.1-r6
->=app-admin/metalog-0.6-r6
->=app-admin/mon-0.38.20-r6
->=app-admin/syslog-ng-1.4.12-r6
->=net-www/apache-1.3.20-r6
->=net-analyzer/ucd-snmp-4.1.2-r6
->=net-ftp/oftpd-0.3.6-r6
->=net-ftp/proftpd-1.2.4-r6
->=net-misc/dhcp-3.0_rc12-r6
->=net-misc/bind-9.1.3-r6
->=net-misc/netkit-timed-0.17-r6
->=net-misc/pdnsd-1.1.6-r6
->=net-mail/exim-3.32-r6
->=net-misc/fakeidentd-1.4-r6
->=net-nds/openldap-1.2.12-r6
->=net-nds/portmap-5b-r6
->=media-sound/alsa-utils-0.5.10-r6
->=net-print/LPRng-3.7.9-r6
->=net-nds/ypbind-1.7-r6
->=net-nds/ypserv-1.3.9-r6
->=net-print/cups-1.1.10-r6
->=sys-apps/apmd-3.0.1-r6
-#>=net-mail/postfix-20010228.5-r6
->=net-misc/portsentry-1.1-r6
->=sys-apps/noflushd-2.4-r6
->=app-text/dictd-1.5.5-r6
->=net-fs/samba-winbind-20010329-r6
->=net-www/wwwoffle-2.6d-r6
->=net-www/squid-2.4.2s-r6
->=net-dialup/ppp-2.4.1-r6
-
-#
-# From here down are premanently 'locked down' builds
-# that are either precompiled bin for x86 or things
-# that don't work on ppc and wont in the future on ppc
-#
-
-# These are ebuilds installing precompiled stuff:
-
-~net-www/netscape-communicator
-~net-www/netscape-flash
-~net-www/netscape-navigator
-~net-www/netscape-plugger
-
-# more precompiled and/or x86 only ebuilds
-# not avail for ppc (gerk)
-~app-text/acroread
-~app-emulation/vmware-workstation
-~app-emulation/wine
-~app-emulation/winesetuptk
-~app-emulation/winex
-~dev-java/ibm-jdk
-~dev-java/sun-jdk
-~dev-java/sun-j2ee
-~dev-java/ibm-jre
-~app-emulation/basiliskII
-~sys-apps/yard
-~app-emulation/dosemu
-~net-www/opera
-~net-www/opera-static
-~dev-util/cvsup
-~media-video/realplayer
-
-# makes no sense on ppc
-~sys-boot/lilo
-~sys-boot/grub
-
-# x86 and sparc only kernels (gerk)
-~sys-kernel/gentoo-sources
-~sys-kernel/crypto-sources
-~sys-kernel/openmosix-sources
-~sys-kernel/redhat-sources
-~sys-kernel/sparc-sources
-~sys-kernel/usermode-sources
-~sys-kernel/xfs-sources
-
+*sys-fs/hfsplusutils
+*sys-fs/mac-fdisk
diff --git a/profiles/default-linux/ppc/1.2/parent b/profiles/default-linux/ppc/1.2/parent
index 832a4b2c88df..f3229c5b9876 100644
--- a/profiles/default-linux/ppc/1.2/parent
+++ b/profiles/default-linux/ppc/1.2/parent
@@ -1,8 +1 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# 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/ppc/1.2/use.mask b/profiles/default-linux/ppc/1.2/use.mask
index de608d3dcd29..305abd820228 100644
--- a/profiles/default-linux/ppc/1.2/use.mask
+++ b/profiles/default-linux/ppc/1.2/use.mask
@@ -37,3 +37,6 @@ rar
# User Mode Linux isn't supported on ppc yet
uml
+
+# Unmask pbbuttonsd
+-pbbuttonsd
diff --git a/profiles/default-linux/ppc/1.2/virtuals b/profiles/default-linux/ppc/1.2/virtuals
index 4bb1f6d5ee59..07db1aff991e 100644
--- a/profiles/default-linux/ppc/1.2/virtuals
+++ b/profiles/default-linux/ppc/1.2/virtuals
@@ -1,50 +1,12 @@
-virtual/lpr net-print/cups
-virtual/python dev-lang/python
-virtual/mta net-mail/ssmtp
-virtual/alsa media-sound/alsa-driver
-virtual/kernel sys-kernel/linux-headers
-virtual/linux-sources sys-kernel/ppc-sources
-virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
-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
-sys-apps/console-tools sys-apps/kbd
-virtual/blackbox x11-wm/blackbox
-virtual/emacs app-editors/emacs
-virtual/cron sys-apps/dcron
-sys-apps/reiserfs-utils sys-fs/reiserfsprogs
-virtual/sylpheed net-mail/sylpheed
-virtual/php dev-php/mod_php
-virtual/textbrowser net-www/links
-virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree
-virtual/krb5 app-crypt/heimdal
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.2/virtuals,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
+virtual/glu x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/x11 x11-base/xorg-x11
+virtual/xft x11-base/xorg-x11
virtual/bootloader sys-boot/yaboot
-virtual/editor app-editors/nano
-virtual/os-headers sys-kernel/linux-headers
-virtual/modutils sys-apps/modutils
-virtual/inetd sys-apps/xinetd
-virtual/aspell-dict app-dicts/aspell-en
-virtual/skkserv app-i18n/skkserv
-virtual/ghc dev-lang/ghc-bin
-virtual/snmp net-analyzer/net-snmp
-virtual/imap-c-client net-libs/c-client
-virtual/flim app-emacs/flim
-virtual/semi app-emacs/semi
-virtual/tetex app-text/tetex
-virtual/quicktime media-libs/libquicktime
-virtual/bittorrent net-p2p/bittorrent
-virtual/logger app-admin/sysklogd
-
-virtual/ssh net-misc/openssh
-virtual/gzip app-arch/gzip
-virtual/ghostscript app-text/ghostscript
-virtual/w3m net-www/w3m
-virtual/mpg123 media-sound/mpg123
-virtual/dhcpc net-misc/dhcpcd
+virtual/jdk dev-java/ibm-jdk-bin
+virtual/jre dev-java/ibm-jre-bin
+virtual/ghc dev-lang/ghc
+virtual/ooo app-office/openoffice
diff --git a/profiles/default-linux/ppc/1.4/deprecated b/profiles/default-linux/ppc/1.4/deprecated
index e69de29bb2d1..08b21a39c433 100644
--- a/profiles/default-linux/ppc/1.4/deprecated
+++ b/profiles/default-linux/ppc/1.4/deprecated
@@ -0,0 +1,5 @@
+default-linux/ppc/2004.2
+# emerge -n '>=sys-apps/portage-2.0.51'
+# cd /etc/
+# rm make.profile
+# ln -s ../usr/portage/profiles/default-linux/ppc/2004.2 make.profile
diff --git a/profiles/default-linux/ppc/1.4/make.defaults b/profiles/default-linux/ppc/1.4/make.defaults
index d9d21d8a5c03..a5aeb2786aa5 100644
--- a/profiles/default-linux/ppc/1.4/make.defaults
+++ b/profiles/default-linux/ppc/1.4/make.defaults
@@ -1,36 +1,16 @@
-# Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc.
-# System-wide defaults for the Portage system
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.4/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
ARCH="ppc"
+ACCEPT_KEYWORDS="ppc"
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-# C Compiler flags
-CFLAGS="-O2 -pipe"
-# C++ Compiler flags
-CXXFLAGS=${CFLAGS}
-
-USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg
-nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk gtk2 X qt kde
-motif opengl mozilla png truetype ppc cups foomaticdb"
-
-# The following USE should _not_ bet set on ppc as they can cause breakage
-# in some pacakges (are mostly x86 only options)
-# 3dfx 3dnow avi icc icc-pgo mmx svga sse
+CHOST="powerpc-unknown-linux-gnu"
+CFLAGS="-O2 -fno-strict-aliasing -pipe"
+CXXFLAGS="${CFLAGS}"
-ACCEPT_KEYWORDS="ppc"
+FEATURES="sandbox sfperms"
-COMPILER="gcc3"
+GRP_STAGE23_USE="acl berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd unicode"
+USE="alsa berkdb bitmap-fonts crypt cups emboss fortran gif gnome gpm gtk gtk2 ipv6 jpeg kde libwww mp3 motif mpeg ncurses nls oggvorbis opengl pam pdflib perl png python qt readline spell ssl tcpd truetype truetype-fonts type1-fonts X xml2 xv unicode zlib oss dvd slang gdbm mitshm esd imlib sdl mozilla foomaticdb"
diff --git a/profiles/default-linux/ppc/1.4/packages b/profiles/default-linux/ppc/1.4/packages
index bf4811115114..c8cf281bb527 100644
--- a/profiles/default-linux/ppc/1.4/packages
+++ b/profiles/default-linux/ppc/1.4/packages
@@ -1,123 +1,13 @@
-### GENTOO/PPC 1.4 PROFILE ###
-
-# Contact info by Pieter Van den Abeele <pvdabeel@gentoo.org>
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.4/packages,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
# core stuff
-*virtual/os-headers
-*>=sys-apps/baselayout-1.7.9-r1
-*>=sys-apps/portage-2.0.35
*>=sys-devel/binutils-2.13.90.0.18
*>=sys-devel/gcc-3.2.1
*>=sys-libs/glibc-2.3.1-r2
-# less critical stuff
-
-*<sys-apps/shadow-5
-*>=app-arch/sharutils-4.2.1-r6
-*>=dev-lang/python-2.2-r4
-*>=sys-devel/automake-1.6.1-r5
-*>=sys-fs/devfsd-1.3.20
-*>=sys-libs/pam-0.75-r9
-
-*app-arch/bzip2
-*app-arch/cpio
-*app-arch/gzip
-*app-arch/ncompress
-*app-arch/tar
-*app-shells/bash
-*app-shells/sash
-*dev-lang/perl
-*dev-libs/popt
-*dev-perl/ExtUtils-MakeMaker
-*net-ftp/ftp
-*net-misc/dhcpcd
-*net-misc/iputils
-*net-misc/rsync
-*net-misc/wget
-*sys-apps/coreutils
-*sys-apps/debianutils
-*sys-apps/diffutils
-*sys-apps/ed
-*sys-apps/eject
-*sys-apps/fbset
-*sys-apps/file
-*sys-apps/findutils
-*sys-apps/gawk
-*sys-apps/grep
-*sys-apps/groff
-*sys-apps/hdparm
-*sys-apps/kbd
-*sys-apps/less
-*sys-apps/mac-fdisk
-*sys-apps/man
-*sys-apps/man-pages
-*sys-apps/net-tools
-*sys-apps/pam-login
-*sys-apps/procps
-*sys-apps/psmisc
-*sys-apps/sed
-*sys-apps/setserial
-*sys-apps/slocate
-*sys-apps/texinfo
-*sys-apps/util-linux
-*sys-apps/which
-*sys-apps/xinetd
-*sys-devel/autoconf
-*sys-devel/bc
-*sys-devel/bison
-*sys-devel/flex
-*sys-devel/gettext
-*sys-devel/libtool
-*sys-devel/m4
-*sys-devel/make
-*sys-devel/patch
-*sys-fs/e2fsprogs
*sys-fs/hfsutils
-*sys-libs/cracklib
-*sys-libs/db
-*sys-libs/gdbm
-*sys-libs/ncurses
-*sys-libs/pwdb
-*sys-libs/readline
-*sys-libs/zlib
-*virtual/bootloader
-*virtual/editor
-*virtual/modutils
-*virtual/ssh
->=app-admin/metalog-0.6-r6
->=app-admin/mon-0.38.20-r6
->=app-admin/syslog-ng-1.4.12-r6
->=app-text/dictd-1.5.5-r6
->=media-sound/alsa-utils-0.5.10-r6
->=net-analyzer/ucd-snmp-4.1.2-r6
->=net-dialup/ppp-2.4.1-r6
->=net-fs/samba-2.2.2-r6
->=net-fs/samba-winbind-20010329-r6
->=net-ftp/oftpd-0.3.6-r6
->=net-ftp/proftpd-1.2.4-r6
->=net-mail/exim-3.32-r6
->=net-misc/bind-9.1.3-r6
->=net-misc/dhcp-3.0_rc12-r6
->=net-misc/fakeidentd-1.4-r6
->=net-misc/netkit-timed-0.17-r6
->=net-misc/pdnsd-1.1.6-r6
->=net-misc/portsentry-1.1-r6
->=net-nds/openldap-1.2.12-r6
->=net-nds/portmap-5b-r6
->=net-nds/ypbind-1.7-r6
->=net-nds/ypserv-1.3.9-r6
->=net-print/cups-1.1.10-r6
->=net-www/apache-1.3.20-r6
->=net-www/squid-2.4.2s-r6
->=net-www/wwwoffle-2.6d-r6
->=sys-apps/apmd-3.0.1-r6
->=sys-apps/at-3.1.8-r6
->=sys-apps/sysklogd-1.4.1
->=sys-apps/xinetd-2.3.3-r6
->=sys-libs/gpm-1.19.3-r5
-net-misc/netkit-telnetd
-sys-apps/raidtools
-sys-fs/reiserfsprogs
-virtual/cron
-virtual/linux-sources
+*sys-fs/hfsplusutils
+*sys-fs/mac-fdisk
diff --git a/profiles/default-linux/ppc/1.4/parent b/profiles/default-linux/ppc/1.4/parent
index 832a4b2c88df..f3229c5b9876 100644
--- a/profiles/default-linux/ppc/1.4/parent
+++ b/profiles/default-linux/ppc/1.4/parent
@@ -1,8 +1 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# 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/ppc/1.4/use.mask b/profiles/default-linux/ppc/1.4/use.mask
index e7521ed19ea8..305abd820228 100644
--- a/profiles/default-linux/ppc/1.4/use.mask
+++ b/profiles/default-linux/ppc/1.4/use.mask
@@ -1,22 +1,42 @@
-# this is a list of USE flags
-# that should not be used on PPC
-afs
+# This is a list of USE flags that should not be used on PPC
+
3dfx
-3dnow
+acpi
+adabas
+afs
avi
+birdstep
+cmucl
+fdftk
+hdf
icc
icc-pgo
-mmx
+ifc
+lm_sensors
+real
svga
-sse
-firebird
tcc
+x86
+fmod
+#keep and eye on firebird and interbase as pair
+firebird
+interbase
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
+i8x0
+xvmc
+nvidia
-# HDF is currently broken on ppc, masking
-# until it is fixed
-hdf
+# Unmask our instruction sets
+-altivec
+
+# Fixes bug #86787
+fusion
+
+# rar is binary-only
+rar
+
+# User Mode Linux isn't supported on ppc yet
+uml
+# Unmask pbbuttonsd
+-pbbuttonsd
diff --git a/profiles/default-linux/ppc/1.4/virtuals b/profiles/default-linux/ppc/1.4/virtuals
index bf1f721f95f6..a60d9e6dc1ae 100644
--- a/profiles/default-linux/ppc/1.4/virtuals
+++ b/profiles/default-linux/ppc/1.4/virtuals
@@ -1,55 +1,12 @@
-virtual/lpr net-print/cups
-virtual/python dev-lang/python
-virtual/mta net-mail/ssmtp
-virtual/alsa media-sound/alsa-driver
-virtual/kernel sys-kernel/linux-headers
-virtual/linux-sources sys-kernel/ppc-sources
-virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
-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
-sys-apps/console-tools sys-apps/kbd
-virtual/blackbox x11-wm/blackbox
-virtual/emacs app-editors/emacs
-virtual/cron sys-apps/dcron
-sys-apps/reiserfs-utils sys-fs/reiserfsprogs
-virtual/sylpheed net-mail/sylpheed
-virtual/php dev-php/mod_php
-virtual/textbrowser net-www/links
-virtual/mda net-mail/procmail
-virtual/xft x11-base/xfree
-virtual/krb5 app-crypt/heimdal
-virtual/bootloader sys-boot/yaboot
-virtual/editor app-editors/nano
-virtual/os-headers sys-kernel/linux-headers
-virtual/modutils sys-apps/modutils
-virtual/inetd sys-apps/xinetd
-virtual/antivirus net-mail/clamav
-virtual/aspell-dict app-dicts/aspell-en
-virtual/skkserv app-i18n/skkserv
-virtual/ghc dev-lang/ghc-bin
-virtual/snmp net-analyzer/net-snmp
-virtual/imap-c-client net-libs/c-client
-virtual/flim app-emacs/flim
-virtual/semi app-emacs/semi
-virtual/tetex app-text/tetex
-virtual/quicktime media-libs/libquicktime
-virtual/bittorrent net-p2p/bittorrent
-virtual/logger app-admin/sysklogd
-virtual/cdrtools app-cdr/cdrtools
-virtual/ssh net-misc/openssh
-virtual/commonlisp dev-lisp/sbcl
-virtual/tftp net-misc/tftp-hpa
-virtual/gzip app-arch/gzip
-virtual/ghostscript app-text/ghostscript
-virtual/w3m net-www/w3m
-virtual/xemacs app-editors/xemacs
-virtual/mpg123 media-sound/mpg123
-virtual/jack media-sound/jack-audio-connection-kit
-virtual/dhcpc net-misc/dhcpcd
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.4/virtuals,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
+virtual/glu x11-base/xorg-x11
+virtual/opengl x11-base/xorg-x11
+virtual/x11 x11-base/xorg-x11
+virtual/xft x11-base/xorg-x11
+virtual/bootloader sys-boot/yaboot
+virtual/jdk dev-java/ibm-jdk-bin
+virtual/jre dev-java/ibm-jre-bin
+virtual/ghc dev-lang/ghc
+virtual/ooo app-office/openoffice
diff --git a/profiles/default-linux/ppc/2004.0/make.defaults b/profiles/default-linux/ppc/2004.0/make.defaults
index d9d21d8a5c03..7379a4466308 100644
--- a/profiles/default-linux/ppc/2004.0/make.defaults
+++ b/profiles/default-linux/ppc/2004.0/make.defaults
@@ -1,36 +1,16 @@
-# Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc.
-# System-wide defaults for the Portage system
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
ARCH="ppc"
+ACCEPT_KEYWORDS="ppc"
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-# C Compiler flags
-CFLAGS="-O2 -pipe"
-# C++ Compiler flags
-CXXFLAGS=${CFLAGS}
-
-USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg
-nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk gtk2 X qt kde
-motif opengl mozilla png truetype ppc cups foomaticdb"
-
-# The following USE should _not_ bet set on ppc as they can cause breakage
-# in some pacakges (are mostly x86 only options)
-# 3dfx 3dnow avi icc icc-pgo mmx svga sse
+CHOST="powerpc-unknown-linux-gnu"
+CFLAGS="-O2 -fno-strict-aliasing -pipe"
+CXXFLAGS="${CFLAGS}"
-ACCEPT_KEYWORDS="ppc"
+FEATURES="sandbox sfperms"
-COMPILER="gcc3"
+GRP_STAGE23_USE="berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd unicode"
+USE="alsa berkdb bitmap-fonts crypt cups dvd emboss font-server fortran gif gnome gpm gtk gtk2 ipv6 jpeg kde libwww mp3 motif mpeg ncurses nls oggvorbis opengl pam pdflib perl png python qt readline spell ssl tcpd truetype truetype-fonts type1-fonts X xml2 xv unicode zlib"
diff --git a/profiles/default-linux/ppc/2004.0/packages b/profiles/default-linux/ppc/2004.0/packages
index 79add13f8a7c..9d9849a34f3a 100644
--- a/profiles/default-linux/ppc/2004.0/packages
+++ b/profiles/default-linux/ppc/2004.0/packages
@@ -1,94 +1,7 @@
-### GENTOO/PPC 2004.0 PROFILE ###
+# Copyright 2001-2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.0/packages,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
-# Defines what has to be installed in the ppc stages.
-# Notes included at the bottom of this file. Profile
-# contact is Pieter Van den Abeele <pvdabeel@gentoo.org>
-
-# Core stuff (has version constraints)
-
-*>=dev-lang/python-2.2
-*>=sys-apps/baselayout-1.8.6.12
-*>=sys-apps/portage-2.0.49
-*>=sys-devel/binutils-2.14.90.0.6
-*>=sys-devel/gcc-3.2.3
-*>=sys-fs/devfsd-1.3.25
-*>=sys-libs/glibc-2.3.2
-
-# Without version constraints, but still required
-
-*app-arch/bzip2
-*app-arch/cpio
-*app-arch/gzip
-*app-arch/ncompress
-*app-arch/sharutils
-*app-arch/tar
-*app-shells/bash
-*app-shells/sash
-*dev-lang/perl
-*dev-libs/popt
-*dev-perl/ExtUtils-MakeMaker
-*net-ftp/ftp
-*net-misc/dhcpcd
-*net-misc/iputils
-*net-misc/rsync
-*net-misc/wget
-*sys-apps/coreutils
-*sys-apps/debianutils
-*sys-apps/diffutils
-*sys-apps/ed
-*sys-apps/eject
-*sys-apps/fbset
-*sys-apps/file
-*sys-apps/findutils
-*sys-apps/gawk
-*sys-apps/grep
-*sys-apps/groff
-*sys-apps/hdparm
-*sys-apps/kbd
-*sys-apps/less
-*sys-apps/mac-fdisk
-*sys-apps/man
-*sys-apps/man-pages
-*sys-apps/net-tools
-*sys-apps/pam-login
-*sys-apps/procps
-*sys-apps/psmisc
-*sys-apps/sed
-*sys-apps/setserial
-*sys-apps/slocate
-*sys-apps/texinfo
-*sys-apps/util-linux
-*sys-apps/which
-*sys-apps/xinetd
-*sys-devel/autoconf
-*sys-devel/automake
-*sys-devel/bc
-*sys-devel/bison
-*sys-devel/flex
-*sys-devel/gettext
-*sys-devel/libtool
-*sys-devel/m4
-*sys-devel/make
-*sys-devel/patch
-*sys-fs/e2fsprogs
*sys-fs/hfsutils
-*sys-libs/cracklib
-*sys-libs/db
-*sys-libs/gdbm
-*sys-libs/ncurses
-*sys-libs/pam
-*sys-libs/pwdb
-*sys-libs/readline
-*sys-libs/zlib
-*virtual/bootloader
-*virtual/editor
-*virtual/modutils
-*virtual/os-headers
-*virtual/ssh
-
-# Notes: python 2.3 + portage combination needed unless
-# if portage with python 2.3 support is still
-# pre release portage. Comment to be removed
-# for the release
-
-
+*sys-fs/hfsplusutils
+*sys-fs/mac-fdisk
diff --git a/profiles/default-linux/ppc/2004.0/parent b/profiles/default-linux/ppc/2004.0/parent
index 832a4b2c88df..f3229c5b9876 100644
--- a/profiles/default-linux/ppc/2004.0/parent
+++ b/profiles/default-linux/ppc/2004.0/parent
@@ -1,8 +1 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# 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/ppc/2004.0/use.mask b/profiles/default-linux/ppc/2004.0/use.mask
index 6299c6bbb183..34daa8df4394 100644
--- a/profiles/default-linux/ppc/2004.0/use.mask
+++ b/profiles/default-linux/ppc/2004.0/use.mask
@@ -1,23 +1,44 @@
# This is a list of USE flags that should not be used on PPC
-afs
3dfx
-3dnow
+acpi
+adabas
+afs
avi
+birdstep
+cmucl
+fdftk
+hdf
icc
icc-pgo
-mmx
+ifc
+lm_sensors
+real
svga
-sse
-firebird
tcc
+x86
+fmod
+#keep and eye on firebird and interbase as pair
+firebird
+interbase
-# For ppc SElinux support please use the SElinux profile
-# Maintained by Chris Pebenito <pebenito@gentoo.org>
+i8x0
+xvmc
-selinux
+# Unmask our instruction sets
+-altivec
-# HDF is currently broken on ppc, masking
-# until it is fixed
-hdf
+# Fixes bug #86787
+fusion
+
+# rar is binary-only
+rar
+
+# User Mode Linux isn't supported on ppc yet
+uml
+
+# Unmask pbbuttonsd
+-pbbuttonsd
+# GIT's ppc sha1 implementation
+-ppcsha1
diff --git a/profiles/default-linux/ppc/2004.0/virtuals b/profiles/default-linux/ppc/2004.0/virtuals
index 524083e05d6d..ec7649666a41 100644
--- a/profiles/default-linux/ppc/2004.0/virtuals
+++ b/profiles/default-linux/ppc/2004.0/virtuals
@@ -1,55 +1,9 @@
-sys-apps/console-tools sys-apps/kbd
-sys-apps/reiserfs-utils sys-fs/reiserfsprogs
-virtual/alsa media-sound/alsa-driver
-virtual/antivirus net-mail/clamav
-virtual/aspell-dict app-dicts/aspell-en
-virtual/bittorrent net-p2p/bittorrent
-virtual/blackbox x11-wm/blackbox
-virtual/bootloader sys-boot/yaboot
-virtual/cdrtools app-cdr/cdrtools
-virtual/commonlisp dev-lisp/sbcl
-virtual/cron sys-apps/dcron
-virtual/editor app-editors/nano
-virtual/emacs app-editors/emacs
-virtual/flim app-emacs/flim
-virtual/ghc dev-lang/ghc-bin
-virtual/ghostscript app-text/ghostscript
-virtual/glibc sys-libs/glibc
-virtual/glu x11-base/xfree
-virtual/glut media-libs/glut
-virtual/gzip app-arch/gzip
-virtual/imap-c-client net-libs/c-client
-virtual/imapUW net-mail/uw-imap
-virtual/imapd net-mail/courier-imap
-virtual/inetd sys-apps/xinetd
-virtual/jdk dev-java/blackdown-jdk
-virtual/jre dev-java/blackdown-jre
-virtual/kernel sys-kernel/linux-headers
-virtual/krb5 app-crypt/heimdal
-virtual/linux-sources sys-kernel/ppc-sources
-virtual/logger app-admin/sysklogd
-virtual/lpr net-print/cups
-virtual/mda net-mail/procmail
-virtual/modutils sys-apps/modutils
-virtual/mta net-mail/ssmtp
-virtual/opengl x11-base/xfree
-virtual/os-headers sys-kernel/linux-headers
-virtual/php dev-php/mod_php
-virtual/python dev-lang/python
-virtual/quicktime media-libs/libquicktime
-virtual/semi app-emacs/semi
-virtual/skkserv app-i18n/skkserv
-virtual/snmp net-analyzer/net-snmp
-virtual/ssh net-misc/openssh
-virtual/sylpheed net-mail/sylpheed
-virtual/tetex app-text/tetex
-virtual/textbrowser net-www/links
-virtual/tftp net-misc/tftp-hpa
-virtual/w3m net-www/w3m
-virtual/x11 x11-base/xfree
-virtual/xemacs app-editors/xemacs
-virtual/xft x11-base/xfree
-x11-libs/xaw x11-libs/Xaw3d
-virtual/mpg123 media-sound/mpg123
-virtual/jack media-sound/jack-audio-connection-kit
-virtual/dhcpc net-misc/dhcpcd
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.0/virtuals,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
+
+virtual/bootloader sys-boot/yaboot
+virtual/jdk dev-java/ibm-jdk-bin
+virtual/jre dev-java/ibm-jre-bin
+virtual/ghc dev-lang/ghc
+virtual/ooo app-office/openoffice
diff --git a/profiles/default-linux/ppc/2004.1/make.defaults b/profiles/default-linux/ppc/2004.1/make.defaults
index d9d21d8a5c03..538e03148208 100644
--- a/profiles/default-linux/ppc/2004.1/make.defaults
+++ b/profiles/default-linux/ppc/2004.1/make.defaults
@@ -1,36 +1,16 @@
-# Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc.
-# System-wide defaults for the Portage system
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.1/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
ARCH="ppc"
+ACCEPT_KEYWORDS="ppc"
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-# C Compiler flags
-CFLAGS="-O2 -pipe"
-# C++ Compiler flags
-CXXFLAGS=${CFLAGS}
-
-USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg
-nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk gtk2 X qt kde
-motif opengl mozilla png truetype ppc cups foomaticdb"
-
-# The following USE should _not_ bet set on ppc as they can cause breakage
-# in some pacakges (are mostly x86 only options)
-# 3dfx 3dnow avi icc icc-pgo mmx svga sse
+CHOST="powerpc-unknown-linux-gnu"
+CFLAGS="-O2 -fno-strict-aliasing -pipe"
+CXXFLAGS="${CFLAGS}"
-ACCEPT_KEYWORDS="ppc"
+FEATURES="sandbox sfperms"
-COMPILER="gcc3"
+GRP_STAGE23_USE="berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd unicode"
+USE="alsa berkdb bitmap-fonts crypt cups dvd emboss font-server fortran gif gnome gpm gtk gtk2 ipv6 jpeg kde libwww mp3 motif mpeg ncurses nls oggvorbis opengl pam pdflib perl png python qt readline spell ssl tcpd truetype truetype-fonts type1-fonts X xml2 xv unicode zlib"
diff --git a/profiles/default-linux/ppc/2004.1/packages b/profiles/default-linux/ppc/2004.1/packages
index 79add13f8a7c..64df0c3b505a 100644
--- a/profiles/default-linux/ppc/2004.1/packages
+++ b/profiles/default-linux/ppc/2004.1/packages
@@ -1,94 +1,7 @@
-### GENTOO/PPC 2004.0 PROFILE ###
+# Copyright 2001-2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.1/packages,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
-# Defines what has to be installed in the ppc stages.
-# Notes included at the bottom of this file. Profile
-# contact is Pieter Van den Abeele <pvdabeel@gentoo.org>
-
-# Core stuff (has version constraints)
-
-*>=dev-lang/python-2.2
-*>=sys-apps/baselayout-1.8.6.12
-*>=sys-apps/portage-2.0.49
-*>=sys-devel/binutils-2.14.90.0.6
-*>=sys-devel/gcc-3.2.3
-*>=sys-fs/devfsd-1.3.25
-*>=sys-libs/glibc-2.3.2
-
-# Without version constraints, but still required
-
-*app-arch/bzip2
-*app-arch/cpio
-*app-arch/gzip
-*app-arch/ncompress
-*app-arch/sharutils
-*app-arch/tar
-*app-shells/bash
-*app-shells/sash
-*dev-lang/perl
-*dev-libs/popt
-*dev-perl/ExtUtils-MakeMaker
-*net-ftp/ftp
-*net-misc/dhcpcd
-*net-misc/iputils
-*net-misc/rsync
-*net-misc/wget
-*sys-apps/coreutils
-*sys-apps/debianutils
-*sys-apps/diffutils
-*sys-apps/ed
-*sys-apps/eject
-*sys-apps/fbset
-*sys-apps/file
-*sys-apps/findutils
-*sys-apps/gawk
-*sys-apps/grep
-*sys-apps/groff
-*sys-apps/hdparm
-*sys-apps/kbd
-*sys-apps/less
-*sys-apps/mac-fdisk
-*sys-apps/man
-*sys-apps/man-pages
-*sys-apps/net-tools
-*sys-apps/pam-login
-*sys-apps/procps
-*sys-apps/psmisc
-*sys-apps/sed
-*sys-apps/setserial
-*sys-apps/slocate
-*sys-apps/texinfo
-*sys-apps/util-linux
-*sys-apps/which
-*sys-apps/xinetd
-*sys-devel/autoconf
-*sys-devel/automake
-*sys-devel/bc
-*sys-devel/bison
-*sys-devel/flex
-*sys-devel/gettext
-*sys-devel/libtool
-*sys-devel/m4
-*sys-devel/make
-*sys-devel/patch
-*sys-fs/e2fsprogs
*sys-fs/hfsutils
-*sys-libs/cracklib
-*sys-libs/db
-*sys-libs/gdbm
-*sys-libs/ncurses
-*sys-libs/pam
-*sys-libs/pwdb
-*sys-libs/readline
-*sys-libs/zlib
-*virtual/bootloader
-*virtual/editor
-*virtual/modutils
-*virtual/os-headers
-*virtual/ssh
-
-# Notes: python 2.3 + portage combination needed unless
-# if portage with python 2.3 support is still
-# pre release portage. Comment to be removed
-# for the release
-
-
+*sys-fs/hfsplusutils
+*sys-fs/mac-fdisk
diff --git a/profiles/default-linux/ppc/2004.1/parent b/profiles/default-linux/ppc/2004.1/parent
index 832a4b2c88df..f3229c5b9876 100644
--- a/profiles/default-linux/ppc/2004.1/parent
+++ b/profiles/default-linux/ppc/2004.1/parent
@@ -1,8 +1 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# 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/ppc/2004.1/use.mask b/profiles/default-linux/ppc/2004.1/use.mask
index 6299c6bbb183..7632c252b38e 100644
--- a/profiles/default-linux/ppc/2004.1/use.mask
+++ b/profiles/default-linux/ppc/2004.1/use.mask
@@ -1,23 +1,45 @@
# This is a list of USE flags that should not be used on PPC
-afs
3dfx
-3dnow
+acpi
+adabas
+afs
avi
+birdstep
+cmucl
+fdftk
+hdf
icc
icc-pgo
-mmx
+ifc
+lm_sensors
+real
svga
-sse
-firebird
tcc
+x86
+fmod
+#keep and eye on firebird and interbase as pair
+firebird
+interbase
-# For ppc SElinux support please use the SElinux profile
-# Maintained by Chris Pebenito <pebenito@gentoo.org>
+i8x0
+xvmc
+nvidia
-selinux
+# Unmask our instruction sets
+-altivec
-# HDF is currently broken on ppc, masking
-# until it is fixed
-hdf
+# Fixes bug #86787
+fusion
+
+# rar is binary-only
+rar
+
+# User Mode Linux isn't supported on ppc yet
+uml
+
+# Unmask pbbuttonsd
+-pbbuttonsd
+# GIT's ppc sha1 implementation
+-ppcsha1
diff --git a/profiles/default-linux/ppc/2004.1/virtuals b/profiles/default-linux/ppc/2004.1/virtuals
index 524083e05d6d..75d758eb2565 100644
--- a/profiles/default-linux/ppc/2004.1/virtuals
+++ b/profiles/default-linux/ppc/2004.1/virtuals
@@ -1,55 +1,9 @@
-sys-apps/console-tools sys-apps/kbd
-sys-apps/reiserfs-utils sys-fs/reiserfsprogs
-virtual/alsa media-sound/alsa-driver
-virtual/antivirus net-mail/clamav
-virtual/aspell-dict app-dicts/aspell-en
-virtual/bittorrent net-p2p/bittorrent
-virtual/blackbox x11-wm/blackbox
-virtual/bootloader sys-boot/yaboot
-virtual/cdrtools app-cdr/cdrtools
-virtual/commonlisp dev-lisp/sbcl
-virtual/cron sys-apps/dcron
-virtual/editor app-editors/nano
-virtual/emacs app-editors/emacs
-virtual/flim app-emacs/flim
-virtual/ghc dev-lang/ghc-bin
-virtual/ghostscript app-text/ghostscript
-virtual/glibc sys-libs/glibc
-virtual/glu x11-base/xfree
-virtual/glut media-libs/glut
-virtual/gzip app-arch/gzip
-virtual/imap-c-client net-libs/c-client
-virtual/imapUW net-mail/uw-imap
-virtual/imapd net-mail/courier-imap
-virtual/inetd sys-apps/xinetd
-virtual/jdk dev-java/blackdown-jdk
-virtual/jre dev-java/blackdown-jre
-virtual/kernel sys-kernel/linux-headers
-virtual/krb5 app-crypt/heimdal
-virtual/linux-sources sys-kernel/ppc-sources
-virtual/logger app-admin/sysklogd
-virtual/lpr net-print/cups
-virtual/mda net-mail/procmail
-virtual/modutils sys-apps/modutils
-virtual/mta net-mail/ssmtp
-virtual/opengl x11-base/xfree
-virtual/os-headers sys-kernel/linux-headers
-virtual/php dev-php/mod_php
-virtual/python dev-lang/python
-virtual/quicktime media-libs/libquicktime
-virtual/semi app-emacs/semi
-virtual/skkserv app-i18n/skkserv
-virtual/snmp net-analyzer/net-snmp
-virtual/ssh net-misc/openssh
-virtual/sylpheed net-mail/sylpheed
-virtual/tetex app-text/tetex
-virtual/textbrowser net-www/links
-virtual/tftp net-misc/tftp-hpa
-virtual/w3m net-www/w3m
-virtual/x11 x11-base/xfree
-virtual/xemacs app-editors/xemacs
-virtual/xft x11-base/xfree
-x11-libs/xaw x11-libs/Xaw3d
-virtual/mpg123 media-sound/mpg123
-virtual/jack media-sound/jack-audio-connection-kit
-virtual/dhcpc net-misc/dhcpcd
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.1/virtuals,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
+
+virtual/bootloader sys-boot/yaboot
+virtual/jdk dev-java/ibm-jdk-bin
+virtual/jre dev-java/ibm-jre-bin
+virtual/ghc dev-lang/ghc
+virtual/ooo app-office/openoffice
diff --git a/profiles/default-linux/ppc/2004.2/make.defaults b/profiles/default-linux/ppc/2004.2/make.defaults
index d9d21d8a5c03..80a250497bcf 100644
--- a/profiles/default-linux/ppc/2004.2/make.defaults
+++ b/profiles/default-linux/ppc/2004.2/make.defaults
@@ -1,36 +1,16 @@
-# Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc.
-# System-wide defaults for the Portage system
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.2/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="ppc"
+ACCEPT_KEYWORDS="ppc"
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-# C Compiler flags
-CFLAGS="-O2 -pipe"
-# C++ Compiler flags
-CXXFLAGS=${CFLAGS}
-
-USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg
-nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk gtk2 X qt kde
-motif opengl mozilla png truetype ppc cups foomaticdb"
-
-# The following USE should _not_ bet set on ppc as they can cause breakage
-# in some pacakges (are mostly x86 only options)
-# 3dfx 3dnow avi icc icc-pgo mmx svga sse
+CHOST="powerpc-unknown-linux-gnu"
+CFLAGS="-O2 -fno-strict-aliasing -pipe"
+CXXFLAGS="${CFLAGS}"
-ACCEPT_KEYWORDS="ppc"
+FEATURES="sandbox sfperms"
-COMPILER="gcc3"
+GRP_STAGE23_USE="berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd unicode"
+USE="alsa berkdb bitmap-fonts crypt cups dvd emboss font-server fortran gif gnome gpm gtk gtk2 ipv6 jpeg kde libwww mp3 motif mpeg ncurses nls oggvorbis opengl pam pdflib perl png python qt readline spell ssl tcpd truetype truetype-fonts type1-fonts X xml2 xv unicode zlib"
diff --git a/profiles/default-linux/ppc/2004.2/packages b/profiles/default-linux/ppc/2004.2/packages
index 79add13f8a7c..4fa139e6803a 100644
--- a/profiles/default-linux/ppc/2004.2/packages
+++ b/profiles/default-linux/ppc/2004.2/packages
@@ -1,94 +1,7 @@
-### GENTOO/PPC 2004.0 PROFILE ###
+# Copyright 2001-2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.2/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
-# Defines what has to be installed in the ppc stages.
-# Notes included at the bottom of this file. Profile
-# contact is Pieter Van den Abeele <pvdabeel@gentoo.org>
-
-# Core stuff (has version constraints)
-
-*>=dev-lang/python-2.2
-*>=sys-apps/baselayout-1.8.6.12
-*>=sys-apps/portage-2.0.49
-*>=sys-devel/binutils-2.14.90.0.6
-*>=sys-devel/gcc-3.2.3
-*>=sys-fs/devfsd-1.3.25
-*>=sys-libs/glibc-2.3.2
-
-# Without version constraints, but still required
-
-*app-arch/bzip2
-*app-arch/cpio
-*app-arch/gzip
-*app-arch/ncompress
-*app-arch/sharutils
-*app-arch/tar
-*app-shells/bash
-*app-shells/sash
-*dev-lang/perl
-*dev-libs/popt
-*dev-perl/ExtUtils-MakeMaker
-*net-ftp/ftp
-*net-misc/dhcpcd
-*net-misc/iputils
-*net-misc/rsync
-*net-misc/wget
-*sys-apps/coreutils
-*sys-apps/debianutils
-*sys-apps/diffutils
-*sys-apps/ed
-*sys-apps/eject
-*sys-apps/fbset
-*sys-apps/file
-*sys-apps/findutils
-*sys-apps/gawk
-*sys-apps/grep
-*sys-apps/groff
-*sys-apps/hdparm
-*sys-apps/kbd
-*sys-apps/less
-*sys-apps/mac-fdisk
-*sys-apps/man
-*sys-apps/man-pages
-*sys-apps/net-tools
-*sys-apps/pam-login
-*sys-apps/procps
-*sys-apps/psmisc
-*sys-apps/sed
-*sys-apps/setserial
-*sys-apps/slocate
-*sys-apps/texinfo
-*sys-apps/util-linux
-*sys-apps/which
-*sys-apps/xinetd
-*sys-devel/autoconf
-*sys-devel/automake
-*sys-devel/bc
-*sys-devel/bison
-*sys-devel/flex
-*sys-devel/gettext
-*sys-devel/libtool
-*sys-devel/m4
-*sys-devel/make
-*sys-devel/patch
-*sys-fs/e2fsprogs
*sys-fs/hfsutils
-*sys-libs/cracklib
-*sys-libs/db
-*sys-libs/gdbm
-*sys-libs/ncurses
-*sys-libs/pam
-*sys-libs/pwdb
-*sys-libs/readline
-*sys-libs/zlib
-*virtual/bootloader
-*virtual/editor
-*virtual/modutils
-*virtual/os-headers
-*virtual/ssh
-
-# Notes: python 2.3 + portage combination needed unless
-# if portage with python 2.3 support is still
-# pre release portage. Comment to be removed
-# for the release
-
-
+*sys-fs/hfsplusutils
+*sys-fs/mac-fdisk
diff --git a/profiles/default-linux/ppc/2004.2/parent b/profiles/default-linux/ppc/2004.2/parent
index 832a4b2c88df..f3229c5b9876 100644
--- a/profiles/default-linux/ppc/2004.2/parent
+++ b/profiles/default-linux/ppc/2004.2/parent
@@ -1,8 +1 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# 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/ppc/2004.2/use.mask b/profiles/default-linux/ppc/2004.2/use.mask
index 181e595545c3..7632c252b38e 100644
--- a/profiles/default-linux/ppc/2004.2/use.mask
+++ b/profiles/default-linux/ppc/2004.2/use.mask
@@ -1,25 +1,45 @@
# This is a list of USE flags that should not be used on PPC
-x86
-
-afs
3dfx
-3dnow
+acpi
+adabas
+afs
avi
+birdstep
+cmucl
+fdftk
+hdf
icc
icc-pgo
-mmx
+ifc
+lm_sensors
+real
svga
-sse
-firebird
tcc
+x86
+fmod
+#keep and eye on firebird and interbase as pair
+firebird
+interbase
-# For ppc SElinux support please use the SElinux profile
-# Maintained by Chris Pebenito <pebenito@gentoo.org>
+i8x0
+xvmc
+nvidia
-selinux
+# Unmask our instruction sets
+-altivec
-# HDF is currently broken on ppc, masking
-# until it is fixed
-hdf
+# Fixes bug #86787
+fusion
+
+# rar is binary-only
+rar
+
+# User Mode Linux isn't supported on ppc yet
+uml
+
+# Unmask pbbuttonsd
+-pbbuttonsd
+# GIT's ppc sha1 implementation
+-ppcsha1
diff --git a/profiles/default-linux/ppc/2004.2/virtuals b/profiles/default-linux/ppc/2004.2/virtuals
index 4fb43638947d..41d02dc306a8 100644
--- a/profiles/default-linux/ppc/2004.2/virtuals
+++ b/profiles/default-linux/ppc/2004.2/virtuals
@@ -1,56 +1,9 @@
-sys-apps/console-tools sys-apps/kbd
-sys-apps/reiserfs-utils sys-fs/reiserfsprogs
-virtual/alsa media-sound/alsa-driver
-virtual/antivirus net-mail/clamav
-virtual/aspell-dict app-dicts/aspell-en
-virtual/bittorrent net-p2p/bittorrent
-virtual/blackbox x11-wm/blackbox
-virtual/bootloader sys-boot/yaboot
-virtual/cdrtools app-cdr/cdrtools
-virtual/commonlisp dev-lisp/sbcl
-virtual/cron sys-apps/dcron
-virtual/editor app-editors/nano
-virtual/emacs app-editors/emacs
-virtual/flim app-emacs/flim
-virtual/ghc dev-lang/ghc-bin
-virtual/ghostscript app-text/ghostscript
-virtual/glibc sys-libs/glibc
-virtual/glu x11-base/xfree
-virtual/glut media-libs/glut
-virtual/gzip app-arch/gzip
-virtual/imap-c-client net-libs/c-client
-virtual/imapUW net-mail/uw-imap
-virtual/imapd net-mail/courier-imap
-virtual/inetd sys-apps/xinetd
-virtual/jdk dev-java/ibm-jdk-bin
-virtual/jre dev-java/ibm-jre-bin
-virtual/kernel sys-kernel/linux-headers
-virtual/krb5 app-crypt/mit-krb5
-virtual/linux-sources sys-kernel/ppc-sources
-virtual/logger app-admin/sysklogd
-virtual/lpr net-print/cups
-virtual/mda net-mail/procmail
-virtual/modutils sys-apps/modutils
-virtual/mta net-mail/ssmtp
-virtual/opengl x11-base/xfree
-virtual/os-headers sys-kernel/linux-headers
-virtual/php dev-php/mod_php
-virtual/python dev-lang/python
-virtual/quicktime media-libs/libquicktime
-virtual/semi app-emacs/semi
-virtual/skkserv app-i18n/skkserv
-virtual/snmp net-analyzer/net-snmp
-virtual/ssh net-misc/openssh
-virtual/sylpheed net-mail/sylpheed
-virtual/tetex app-text/tetex
-virtual/textbrowser net-www/links
-virtual/tftp net-misc/tftp-hpa
-virtual/w3m net-www/w3m
-virtual/x11 x11-base/xfree
-virtual/xemacs app-editors/xemacs
-virtual/xft x11-base/xfree
-x11-libs/xaw x11-libs/Xaw3d
-virtual/mpg123 media-sound/mpg123
-virtual/jack media-sound/jack-audio-connection-kit
-virtual/dhcpc net-misc/dhcpcd
-virtual/ruby dev-lang/ruby
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.2/virtuals,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
+
+virtual/bootloader sys-boot/yaboot
+virtual/jdk dev-java/ibm-jdk-bin
+virtual/jre dev-java/ibm-jre-bin
+virtual/ghc dev-lang/ghc
+virtual/ooo app-office/openoffice
diff --git a/profiles/default-linux/ppc/2004.3/make.defaults b/profiles/default-linux/ppc/2004.3/make.defaults
index ed8bdd1c20cd..a32f5c9e257d 100644
--- a/profiles/default-linux/ppc/2004.3/make.defaults
+++ b/profiles/default-linux/ppc/2004.3/make.defaults
@@ -1,12 +1,16 @@
-# Copyright 2004 Pieter Van den Abeele, Gentoo Foundation.
-# Gentoo Linux PowerPC system defaults
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.3/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
-ACCEPT_KEYWORDS="ppc"
ARCH="ppc"
-CFLAGS="-O2 -pipe"
+ACCEPT_KEYWORDS="ppc"
+
CHOST="powerpc-unknown-linux-gnu"
-CXXFLAGS=${CFLAGS}
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-MAKEOPTS="-j2"
-PLATFORM=$CHOST
-USE="dvd jpeg nls gif png truetype ppc"
+CFLAGS="-O2 -fno-strict-aliasing -pipe"
+CXXFLAGS="${CFLAGS}"
+
+FEATURES="sandbox sfperms"
+
+GRP_STAGE23_USE="berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd unicode"
+
+USE="alsa berkdb bitmap-fonts crypt cups dvd emboss font-server fortran gif gnome gpm gtk gtk2 ipv6 jpeg kde libwww mp3 motif mpeg ncurses nls oggvorbis opengl pam pdflib perl png python qt readline spell ssl tcpd truetype truetype-fonts type1-fonts X xml2 xv unicode zlib"
diff --git a/profiles/default-linux/ppc/2004.3/packages b/profiles/default-linux/ppc/2004.3/packages
index 4a4508da7a6b..8c89e94ab8a3 100644
--- a/profiles/default-linux/ppc/2004.3/packages
+++ b/profiles/default-linux/ppc/2004.3/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.3/packages,v 1.1 2005/07/06 05:16:48 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.3/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
*sys-fs/hfsutils
*sys-fs/hfsplusutils
diff --git a/profiles/default-linux/ppc/2004.3/use.mask b/profiles/default-linux/ppc/2004.3/use.mask
index de608d3dcd29..34daa8df4394 100644
--- a/profiles/default-linux/ppc/2004.3/use.mask
+++ b/profiles/default-linux/ppc/2004.3/use.mask
@@ -24,7 +24,6 @@ interbase
i8x0
xvmc
-nvidia
# Unmask our instruction sets
-altivec
@@ -37,3 +36,9 @@ rar
# User Mode Linux isn't supported on ppc yet
uml
+
+# Unmask pbbuttonsd
+-pbbuttonsd
+
+# GIT's ppc sha1 implementation
+-ppcsha1
diff --git a/profiles/default-linux/ppc/2004.3/virtuals b/profiles/default-linux/ppc/2004.3/virtuals
index 084c7f1ba4be..a5e2106bb1df 100644
--- a/profiles/default-linux/ppc/2004.3/virtuals
+++ b/profiles/default-linux/ppc/2004.3/virtuals
@@ -1 +1,9 @@
-virtual/dev-manager sys-fs/udev
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.3/virtuals,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
+
+virtual/bootloader sys-boot/yaboot
+virtual/jdk dev-java/ibm-jdk-bin
+virtual/jre dev-java/ibm-jre-bin
+virtual/ghc dev-lang/ghc
+virtual/ooo app-office/openoffice
diff --git a/profiles/default-linux/ppc/2005.0/make.defaults b/profiles/default-linux/ppc/2005.0/make.defaults
index 72cc3b4c9f29..a40e915ff4f4 100644
--- a/profiles/default-linux/ppc/2005.0/make.defaults
+++ b/profiles/default-linux/ppc/2005.0/make.defaults
@@ -1,10 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.0/make.defaults,v 1.1 2004/12/23 16:29:32 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
ARCH="ppc"
ACCEPT_KEYWORDS="ppc"
-USE="bitmap-fonts dvd gif jpeg nls png ppc truetype fortran f77"
+CHOST="powerpc-unknown-linux-gnu"
+CFLAGS="-O2 -fno-strict-aliasing -pipe"
+CXXFLAGS="${CFLAGS}"
FEATURES="sandbox sfperms"
+
+STAGE1_USE="unicode"
+GRP_STAGE23_USE="berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd unicode"
+
+USE="alsa berkdb bitmap-fonts crypt cups emboss fortran gif gnome gpm gtk gtk2 ipv6 jpeg kde libwww mp3 motif mpeg ncurses nls oggvorbis opengl pam pdflib perl png python qt readline spell ssl tcpd truetype truetype-fonts type1-fonts X xml2 xv unicode zlib"
diff --git a/profiles/default-linux/ppc/2005.0/packages b/profiles/default-linux/ppc/2005.0/packages
index c038fe56e1fd..454137c47df5 100644
--- a/profiles/default-linux/ppc/2005.0/packages
+++ b/profiles/default-linux/ppc/2005.0/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.0/packages,v 1.1 2005/07/06 05:16:48 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.0/packages,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
*sys-fs/hfsutils
*sys-fs/hfsplusutils
diff --git a/profiles/default-linux/ppc/2005.0/use.mask b/profiles/default-linux/ppc/2005.0/use.mask
index de608d3dcd29..34daa8df4394 100644
--- a/profiles/default-linux/ppc/2005.0/use.mask
+++ b/profiles/default-linux/ppc/2005.0/use.mask
@@ -24,7 +24,6 @@ interbase
i8x0
xvmc
-nvidia
# Unmask our instruction sets
-altivec
@@ -37,3 +36,9 @@ rar
# User Mode Linux isn't supported on ppc yet
uml
+
+# Unmask pbbuttonsd
+-pbbuttonsd
+
+# GIT's ppc sha1 implementation
+-ppcsha1
diff --git a/profiles/default-linux/ppc/2005.0/virtuals b/profiles/default-linux/ppc/2005.0/virtuals
index 084c7f1ba4be..55f42e60a6ff 100644
--- a/profiles/default-linux/ppc/2005.0/virtuals
+++ b/profiles/default-linux/ppc/2005.0/virtuals
@@ -1 +1,9 @@
-virtual/dev-manager sys-fs/udev
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.0/virtuals,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
+
+virtual/bootloader sys-boot/yaboot
+virtual/jdk dev-java/ibm-jdk-bin
+virtual/jre dev-java/ibm-jre-bin
+virtual/ghc dev-lang/ghc
+virtual/ooo app-office/openoffice
diff --git a/profiles/default-linux/ppc/2005.1/ppc/G3/Pegasos/virtuals b/profiles/default-linux/ppc/2005.1/ppc/G3/Pegasos/virtuals
index 846f473e12ef..e4d6550d3069 100644
--- a/profiles/default-linux/ppc/2005.1/ppc/G3/Pegasos/virtuals
+++ b/profiles/default-linux/ppc/2005.1/ppc/G3/Pegasos/virtuals
@@ -1,5 +1,5 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc/G3/Pegasos/virtuals,v 1.1 2005/07/08 23:10:27 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc/G3/Pegasos/virtuals,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
virtual/bootloader sys-boot/bootcreator
diff --git a/profiles/default-linux/ppc/2005.1/ppc/G3/make.defaults b/profiles/default-linux/ppc/2005.1/ppc/G3/make.defaults
index 0297678e0549..ba7a398aea71 100644
--- a/profiles/default-linux/ppc/2005.1/ppc/G3/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc/G3/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/ppc/2005.1/ppc/G3/make.defaults,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc/G3/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
CFLAGS="-O2 -mtune=G3 -mcpu=G3 -pipe"
CXXFLAGS="${CFLAGS}"
diff --git a/profiles/default-linux/ppc/2005.1/ppc/G4/Pegasos/virtuals b/profiles/default-linux/ppc/2005.1/ppc/G4/Pegasos/virtuals
index 10093f67d53d..42d3fc350557 100644
--- a/profiles/default-linux/ppc/2005.1/ppc/G4/Pegasos/virtuals
+++ b/profiles/default-linux/ppc/2005.1/ppc/G4/Pegasos/virtuals
@@ -1,5 +1,5 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc/G4/Pegasos/virtuals,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc/G4/Pegasos/virtuals,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
virtual/bootloader sys-boot/bootcreator
diff --git a/profiles/default-linux/ppc/2005.1/ppc/G4/make.defaults b/profiles/default-linux/ppc/2005.1/ppc/G4/make.defaults
index e017ee76c436..070dbed50b5e 100644
--- a/profiles/default-linux/ppc/2005.1/ppc/G4/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc/G4/make.defaults
@@ -1,6 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc/G4/make.defaults,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc/G4/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
CFLAGS="-O2 -mtune=G4 -mcpu=G4 -mabi=altivec -pipe"
CXXFLAGS="${CFLAGS}"
+
+STAGE1_USE="altivec unicode"
diff --git a/profiles/default-linux/ppc/2005.1/ppc/make.defaults b/profiles/default-linux/ppc/2005.1/ppc/make.defaults
index 6ad9dd10485a..6b5cc2548ff0 100644
--- a/profiles/default-linux/ppc/2005.1/ppc/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc/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/ppc/2005.1/ppc/make.defaults,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
ARCH="ppc"
ACCEPT_KEYWORDS="ppc"
@@ -12,6 +12,4 @@ CXXFLAGS="${CFLAGS}"
FEATURES="sandbox sfperms"
STAGE1_USE="unicode"
-GRP_STAGE23_USE="${STAGE1_USE} berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd"
-
-USE="${GRP_STAGE23_USE} alsa bitmap-fonts crypt cups emboss fortran gif gnome gtk gtk2 jpeg kde libwww mp3 motif mpeg oggvorbis opengl pdflib png qt spell truetype truetype-fonts type1-fonts X xprint xml2 xv zlib"
+USE="${STAGE1_USE} berkdb gpm ipv6 ncurses nls pam perl python readline ssl tcpd alsa bitmap-fonts crypt cups eds emboss fortran gif gnome gstreamer gtk gtk2 jpeg kde libwww mp3 motif mpeg ogg oggvorbis opengl pdflib png qt spell truetype truetype-fonts type1-fonts vorbis X xml2 xv zlib"
diff --git a/profiles/default-linux/ppc/2005.1/ppc/use.mask b/profiles/default-linux/ppc/2005.1/ppc/use.mask
index de608d3dcd29..c304186d250f 100644
--- a/profiles/default-linux/ppc/2005.1/ppc/use.mask
+++ b/profiles/default-linux/ppc/2005.1/ppc/use.mask
@@ -12,6 +12,7 @@ hdf
icc
icc-pgo
ifc
+ip28
lm_sensors
real
svga
@@ -24,7 +25,6 @@ interbase
i8x0
xvmc
-nvidia
# Unmask our instruction sets
-altivec
@@ -37,3 +37,9 @@ rar
# User Mode Linux isn't supported on ppc yet
uml
+
+# Unmask pbbuttonsd
+-pbbuttonsd
+
+# GIT's ppc sha1 implementation
+-ppcsha1
diff --git a/profiles/default-linux/ppc/2005.1/ppc/virtuals b/profiles/default-linux/ppc/2005.1/ppc/virtuals
index 44a17345b623..9319d9b770a6 100644
--- a/profiles/default-linux/ppc/2005.1/ppc/virtuals
+++ b/profiles/default-linux/ppc/2005.1/ppc/virtuals
@@ -1,10 +1,9 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc/virtuals,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc/virtuals,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
virtual/bootloader sys-boot/yaboot
virtual/jdk dev-java/ibm-jdk-bin
virtual/jre dev-java/ibm-jre-bin
-virtual/linux-sources sys-kernel/gentoo-sources
virtual/ghc dev-lang/ghc
virtual/ooo app-office/openoffice
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/970/make.defaults b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/970/make.defaults
index e51aee147c1e..a9c9348e94b3 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/970/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/970/make.defaults
@@ -1,6 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/970/make.defaults,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/970/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
CFLAGS="-O2 -pipe -mtune=970 -mcpu=970 -mabi=altivec"
CXXFLAGS=${CFLAGS}
+
+STAGE1_USE="altivec gcc64 unicode"
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/make.defaults b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/make.defaults
index f81abfe2abb7..422a7115abec 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/make.defaults
@@ -9,9 +9,7 @@ CXXFLAGS=${CFLAGS}
ACCEPT_KEYWORDS="${ARCH}"
-STAGE1_USE="unicode"
-GRP_STAGE23_USE="${STAGE1_USE} ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses ibm"
-
-USE="${GRP_STAGE23_USE} berkdb bitmap-fonts gif jpeg ncurses png truetype truetype-fonts type1-fonts zlib nptl"
+STAGE1_USE="gcc64 unicode"
+USE="${STAGE1_USE} ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses ibm berkdb bitmap-fonts gif jpeg ncurses png truetype truetype-fonts type1-fonts zlib"
FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/packages b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/packages
index b9513ef13421..a1b35618bd97 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/packages
+++ b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/packages
@@ -1,6 +1,6 @@
# Copyright 2003-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/packages,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/packages,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
*sys-devel/gcc-powerpc64
*sys-devel/ppc32
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power3/make.defaults b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power3/make.defaults
index f17d3dcf4ede..6a61fd7eb92e 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power3/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power3/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/ppc/2005.1/ppc64/32bit-userland/power3/make.defaults,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power3/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
CFLAGS="-O2 -pipe -mtune=power3 -mcpu=power3"
CXXFLAGS=${CFLAGS}
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power4/make.defaults b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power4/make.defaults
index 98a395a2bb40..25583802694a 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power4/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power4/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/ppc/2005.1/ppc64/32bit-userland/power4/make.defaults,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power4/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
CFLAGS="-O2 -pipe -mtune=power4 -mcpu=power4"
CXXFLAGS=${CFLAGS}
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power5/make.defaults b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power5/make.defaults
index bbf1544c081c..67e223561cfa 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power5/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power5/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/ppc/2005.1/ppc64/32bit-userland/power5/make.defaults,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/power5/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
CFLAGS="-O2 -pipe -mtune=power5 -mcpu=power5"
CXXFLAGS=${CFLAGS}
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/virtuals b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/virtuals
index 483dd10fc63d..8535b08f32c2 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/virtuals
+++ b/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/virtuals
@@ -1,10 +1,9 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/virtuals,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/32bit-userland/virtuals,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
virtual/bootloader sys-boot/yaboot
virtual/jdk dev-java/ibm-jdk-bin
virtual/jre dev-java/ibm-jre-bin
-virtual/linux-sources sys-kernel/gentoo-sources
virtual/ghc dev-lang/ghc
virtual/ooo app-office/openoffice
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/970/make.defaults b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/970/make.defaults
index a5b2ad965635..2e57d1e7372e 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/970/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/970/make.defaults
@@ -1,6 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/970/make.defaults,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/970/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
CFLAGS="-O2 -pipe -mtune=970 -mcpu=970 -mabi=altivec"
CXXFLAGS=${CFLAGS}
+
+STAGE1_USE="altivec unicode"
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/make.defaults b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/make.defaults
index d390658f8b86..7a82b66bd923 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/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/ppc/2005.1/ppc64/64bit-userland/make.defaults,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
ARCH="ppc64"
ACCEPT_KEYWORDS="ppc64"
@@ -13,9 +13,7 @@ CXXFLAGS=${CFLAGS}
ACCEPT_KEYWORDS="ppc64"
STAGE1_USE="unicode"
-GRP_STAGE23_USE="${STAGE1_USE} ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses ibm"
-
-USE="${GRP_STAGE23_USE} berkdb bitmap-fonts gif jpeg ncurses png truetype truetype-fonts type1-fonts zlib nptl"
+USE="${STAGE1_USE} ipv6 pam tcpd readline nls ssl gpm perl python ncurses ibm berkdb bitmap-fonts gif jpeg ncurses png truetype truetype-fonts type1-fonts zlib nptl"
# While this profile uses multilib functionality it is just to maintain
# some similarity across profiles this profile is truly for a singe ABI, ppc64.
@@ -26,13 +24,13 @@ MULTILIB_ABIS="ppc64"
DEFAULT_ABI="ppc64"
CFLAGS_ppc64="-m64"
-LDFLAGS_ppc64="-m elf64-powerpc"
+LDFLAGS_ppc64="-m elf64ppc"
CHOST_ppc64="powerpc64-unknown-linux-gnu"
CDEFINE_ppc64="__powerpc64__"
LIBDIR_ppc64="lib64"
CFLAGS_ppc="-m32"
-LDFLAGS_ppc="-m elf32-powerpc"
+LDFLAGS_ppc="-m elf32ppc"
CHOST_ppc="powerpc-unknown-linux-gnu"
CDEFINE_ppc="!__powerpc64__"
LIBDIR_ppc="lib32"
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/package.mask b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/package.mask
index 1529e01fc044..1f2a38ffb18e 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/package.mask
+++ b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/package.mask
@@ -1,6 +1,6 @@
# Copyright 2003-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/package.mask,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/package.mask,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
# Mask multilib ppc64 things
# Maintained by Yuta Satoh <nigoro@gentoo.org>
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/packages b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/packages
index 38ad1dcbffa2..f8f3d277a1a0 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/packages
+++ b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/packages
@@ -1,11 +1,10 @@
# Copyright 2003-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/packages,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/packages,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
# Maintained by Tom Gall <tgall@gentoo.org>
*>=sys-devel/binutils-2.15
*>=sys-devel/gcc-3.4.0-r6
-*sys-libs/libstdc++-v3
*>=sys-libs/glibc-2.3.3_pre20040529
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power3/make.defaults b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power3/make.defaults
index e5251d434b0b..5fa9c480c5e5 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power3/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power3/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/ppc/2005.1/ppc64/64bit-userland/power3/make.defaults,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power3/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
CFLAGS="-O2 -pipe -mtune=power3 -mcpu=power3"
CXXFLAGS=${CFLAGS}
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power4/make.defaults b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power4/make.defaults
index e83514d860b3..0990304f0664 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power4/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power4/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/ppc/2005.1/ppc64/64bit-userland/power4/make.defaults,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power4/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
CFLAGS="-O2 -pipe -mtune=power4 -mcpu=power4"
CXXFLAGS=${CFLAGS}
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power5/make.defaults b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power5/make.defaults
index e25764c4ef31..dcb5cae93e71 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power5/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power5/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/ppc/2005.1/ppc64/64bit-userland/power5/make.defaults,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/64bit-userland/power5/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
CFLAGS="-O2 -pipe -mtune=power5 -mcpu=power5"
CXXFLAGS=${CFLAGS}
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/multilib/make.defaults b/profiles/default-linux/ppc/2005.1/ppc64/multilib/make.defaults
index be123cceabc2..e69aa23b4268 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/multilib/make.defaults
+++ b/profiles/default-linux/ppc/2005.1/ppc64/multilib/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/ppc/2005.1/ppc64/multilib/make.defaults,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/multilib/make.defaults,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
ARCH="ppc64"
ACCEPT_KEYWORDS="ppc64"
@@ -13,9 +13,7 @@ CXXFLAGS=${CFLAGS}
ACCEPT_KEYWORDS="ppc64"
STAGE1_USE="unicode"
-GRP_STAGE23_USE="unicode ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
-
-USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png python readline ssl tcpd truetype truetype-fonts type1-fonts zlib"
+USE="${STAGE1_USE} berkdb bitmap-fonts gif gpm ipv6 jpeg nls ncurses pam perl png python readline ssl tcpd truetype truetype-fonts type1-fonts zlib"
# 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
@@ -26,13 +24,13 @@ MULTILIB_ABIS="ppc ppc64"
DEFAULT_ABI="ppc64"
CFLAGS_ppc64="-m64"
-LDFLAGS_ppc64="-m elf64-powerpc"
+LDFLAGS_ppc64="-m elf64ppc"
CHOST_ppc64="powerpc64-unknown-linux-gnu"
CDEFINE_ppc64="__powerpc64__"
LIBDIR_ppc64="lib64"
CFLAGS_ppc="-m32"
-LDFLAGS_ppc="-m elf32-powerpc"
+LDFLAGS_ppc="-m elf32ppc"
CHOST_ppc="powerpc-unknown-linux-gnu"
CDEFINE_ppc="!__powerpc64__"
LIBDIR_ppc="lib32"
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/multilib/packages b/profiles/default-linux/ppc/2005.1/ppc64/multilib/packages
index d183c93700e0..23432001366e 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/multilib/packages
+++ b/profiles/default-linux/ppc/2005.1/ppc64/multilib/packages
@@ -1,11 +1,11 @@
# Copyright 2003-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/multilib/packages,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/multilib/packages,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
*>=sys-devel/binutils-2.15.90.0.3-r4
*>=sys-devel/gcc-3.4.4
*sys-libs/libstdc++-v3
-*>=sys-libs/glibc-2.3.4.20041102-r1
+*>=sys-libs/glibc-2.3.4.20041102-r2
*>=sys-kernel/linux-headers-2.6.11
*sys-fs/mac-fdisk
*sys-fs/hfsutils
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/multilib/profile.bashrc b/profiles/default-linux/ppc/2005.1/ppc64/multilib/profile.bashrc
index b1a6a308c4a7..0ad3d6a79223 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/multilib/profile.bashrc
+++ b/profiles/default-linux/ppc/2005.1/ppc64/multilib/profile.bashrc
@@ -1,3 +1,15 @@
+# When merging some packages relevant to python, sandbox cannot access.
+# The following is the workaround of this problem.
+# FYI, I have verified that it was unnecessary in the environment where portage-2.0.51.22-r1 and sandbox-1.2.9 were installed.
+
+addpredict /usr/lib64/python2.0/
+addpredict /usr/lib64/python2.1/
+addpredict /usr/lib64/python2.2/
+addpredict /usr/lib64/python2.3/
+addpredict /usr/lib64/python2.4/
+addpredict /usr/lib64/python2.5/
+addpredict /usr/lib64/python3.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
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/use.mask b/profiles/default-linux/ppc/2005.1/ppc64/use.mask
index f29e21ca47cd..475886d66646 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/use.mask
+++ b/profiles/default-linux/ppc/2005.1/ppc64/use.mask
@@ -17,7 +17,6 @@ pda
prelude
ruby
svga
-scanner
firebird
mzscheme
chasen
@@ -30,7 +29,6 @@ jikes
junit
guile
-caps
# 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
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/virtuals b/profiles/default-linux/ppc/2005.1/ppc64/virtuals
index 0d2f5d51cd1d..8b93ba0e55d2 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/virtuals
+++ b/profiles/default-linux/ppc/2005.1/ppc64/virtuals
@@ -1,10 +1,7 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/virtuals,v 1.1 2005/07/06 05:39:35 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/virtuals,v 1.1.1.1 2005/11/30 09:48:36 chriswhite Exp $
virtual/bootloader sys-boot/yaboot-static
virtual/jdk dev-java/ibm-jdk-bin
virtual/jre dev-java/ibm-jre-bin
-virtual/linux-sources sys-kernel/gentoo-sources
-virtual/kernel sys-kernel/linux-headers
-virtual/os-headers sys-kernel/linux-headers
diff --git a/profiles/default-linux/ppc/parent b/profiles/default-linux/ppc/parent
index 832a4b2c88df..f3229c5b9876 100644
--- a/profiles/default-linux/ppc/parent
+++ b/profiles/default-linux/ppc/parent
@@ -1,8 +1 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# 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/ppc64/2004.3/make.defaults b/profiles/default-linux/ppc64/2004.3/make.defaults
index 517c0ea2836a..ca9f37d37819 100644
--- a/profiles/default-linux/ppc64/2004.3/make.defaults
+++ b/profiles/default-linux/ppc64/2004.3/make.defaults
@@ -1,9 +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/ppc64/2004.3/make.defaults,v 1.1 2005/01/03 17:58:25 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2004.3/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
-ARCH="ppc64"
-ACCEPT_KEYWORDS="ppc64"
-
-USE="unicode pam bitmap-fonts gif jpeg nls png ppc64 truetype zlib"
-FEATURES="autoconfig sandbox sfperms"
+USE="unicode pam bitmap-fonts emboss font-server gif jpeg nls png truetype truetype-fonts type1-fonts zlib"
diff --git a/profiles/default-linux/ppc64/2004.3/packages b/profiles/default-linux/ppc64/2004.3/packages
index 59491030f9d3..450e4236e718 100644
--- a/profiles/default-linux/ppc64/2004.3/packages
+++ b/profiles/default-linux/ppc64/2004.3/packages
@@ -1,11 +1,11 @@
# Copyright 2003-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2004.3/packages,v 1.1 2005/01/03 17:58:25 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2004.3/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# Maintained by Tom Gall <tgall@gentoo.org>
*>=sys-devel/binutils-2.15
*>=sys-devel/gcc-3.4.0-r6
*sys-libs/libstdc++-v3
*>=sys-libs/glibc-2.3.3_pre20040529
-
-
+*sys-fs/mac-fdisk
+*sys-fs/hfsutils
diff --git a/profiles/default-linux/ppc64/2005.0/make.defaults b/profiles/default-linux/ppc64/2005.0/make.defaults
index 8af407eadfe0..bd6f07f00f59 100644
--- a/profiles/default-linux/ppc64/2005.0/make.defaults
+++ b/profiles/default-linux/ppc64/2005.0/make.defaults
@@ -1,9 +1,20 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2005.0/make.defaults,v 1.1 2005/01/03 17:58:25 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2005.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
ARCH="ppc64"
ACCEPT_KEYWORDS="ppc64"
-USE="unicode pam bitmap-fonts gif jpeg nls png ppc64 truetype zlib"
+CHOST="powerpc64-unknown-linux-gnu"
+
+CFLAGS="-O2 -pipe"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="ppc64"
+
+STAGE1_USE="unicode"
+GRP_STAGE23_USE="unicode ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
+
+USE="unicode pam berkdb bitmap-fonts emboss gif jpeg nls ncurses perl png python readline ssl tcpd truetype truetype-fonts type1-fonts zlib"
+
FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc64/2005.0/packages b/profiles/default-linux/ppc64/2005.0/packages
index dbebd5712070..263ace4f66c2 100644
--- a/profiles/default-linux/ppc64/2005.0/packages
+++ b/profiles/default-linux/ppc64/2005.0/packages
@@ -1,11 +1,11 @@
# Copyright 2003-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2005.0/packages,v 1.1 2005/01/03 17:58:25 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2005.0/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# Maintained by Tom Gall <tgall@gentoo.org>
*>=sys-devel/binutils-2.15
*>=sys-devel/gcc-3.4.0-r6
*sys-libs/libstdc++-v3
*>=sys-libs/glibc-2.3.3_pre20040529
-
-
+*sys-fs/mac-fdisk
+*sys-fs/hfsutils
diff --git a/profiles/default-linux/ppc64/dev/2005.1/970/make.defaults b/profiles/default-linux/ppc64/dev/2005.1/970/make.defaults
index b436613a4a93..e56c9fc1754e 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/970/make.defaults
+++ b/profiles/default-linux/ppc64/dev/2005.1/970/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/ppc64/dev/2005.1/970/make.defaults,v 1.1 2005/04/08 04:41:47 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/970/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
ARCH="ppc64"
@@ -14,6 +14,6 @@ ACCEPT_KEYWORDS="ppc64"
STAGE1_USE="unicode"
GRP_STAGE23_USE="unicode ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
-USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png ppc64 python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
+USE="unicode pam berkdb bitmap-fonts emboss gif jpeg nls ncurses perl png python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc64/dev/2005.1/970/pmac/packages b/profiles/default-linux/ppc64/dev/2005.1/970/pmac/packages
index db498fb5f407..bebcc3e56bdd 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/970/pmac/packages
+++ b/profiles/default-linux/ppc64/dev/2005.1/970/pmac/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/970/pmac/packages,v 1.1 2005/04/08 04:41:47 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/970/pmac/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
*sys-fs/mac-fdisk
*sys-fs/hfsutils
diff --git a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/make.defaults b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/make.defaults
index 150aa379a9c1..fc3dd55da249 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/make.defaults
+++ b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/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/ppc64/dev/2005.1/no-multilib/make.defaults,v 1.1 2005/06/28 14:13:16 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/no-multilib/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
ARCH="ppc64"
ACCEPT_KEYWORDS="ppc64"
diff --git a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/make.defaults b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/make.defaults
index fc8f17d3517e..38da2d9aaf19 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/make.defaults
+++ b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/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/ppc64/dev/2005.1/no-multilib/multilib/make.defaults,v 1.1 2005/06/28 14:15:08 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
MULTILIB_ABIS="ppc ppc64"
DEFAULT_ABI="ppc64"
diff --git a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/packages b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/packages
index 8cdf257ce281..cdfb8184ff3d 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/packages
+++ b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/packages
@@ -1,6 +1,6 @@
# Copyright 2003-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/packages,v 1.1 2005/06/28 14:15:08 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
*>=sys-devel/binutils-2.15.90.0.3-r4
*>=sys-devel/gcc-3.4.4
diff --git a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/use.mask b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/use.mask
index 87c0c20630d2..46e92cf15911 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/use.mask
+++ b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/use.mask,v 1.1 2005/06/28 14:15:08 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/no-multilib/multilib/use.mask,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
multilib
diff --git a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/package.mask b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/package.mask
index 67f9c8a18512..795313543360 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/package.mask
+++ b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/package.mask
@@ -1,6 +1,6 @@
# Copyright 2003-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/no-multilib/package.mask,v 1.1 2005/06/28 14:13:16 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/no-multilib/package.mask,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# Mask multilib ppc64 things
diff --git a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/packages b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/packages
index ae83328dca49..49ee112afc1b 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/packages
+++ b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/no-multilib/packages,v 1.1 2005/06/28 14:13:16 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/no-multilib/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
*sys-fs/mac-fdisk
*sys-fs/hfsutils
diff --git a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/profile.bashrc b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/profile.bashrc
index b1a6a308c4a7..f922033078b1 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/profile.bashrc
+++ b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/profile.bashrc
@@ -1,3 +1,15 @@
+# When merging some packages relevant to python, sandbox cannot access.
+# The following is the workaround of this problem.
+# FYI, I have verified that it was unnecessary in the environment where portage-2.0.51.22-r1 and sandbox-1.2.9 were installed.
+
+addpredict /usr/lib64/python2.0/
+addpredict /usr/lib64/python2.1/
+addpredict /usr/lib64/python2.2/
+addpredict /usr/lib64/python2.3/
+addpredict /usr/lib64/python2.4/
+addpredict /usr/lib64/python2.5/
+addpredict /usr/lib64/python3.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
diff --git a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/use.mask b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/use.mask
index 06406bd835a0..ab96953b8a92 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/no-multilib/use.mask
+++ b/profiles/default-linux/ppc64/dev/2005.1/no-multilib/use.mask
@@ -1,6 +1,6 @@
# Copyright 2003-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/no-multilib/use.mask,v 1.1 2005/06/28 14:13:16 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/no-multilib/use.mask,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# not ibm hardware
ibm
diff --git a/profiles/default-linux/ppc64/dev/2005.1/packages b/profiles/default-linux/ppc64/dev/2005.1/packages
index af527674e921..fa16ced62e4c 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/packages
+++ b/profiles/default-linux/ppc64/dev/2005.1/packages
@@ -1,6 +1,6 @@
# Copyright 2003-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/packages,v 1.1 2005/04/08 04:41:46 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# Maintained by Tom Gall <tgall@gentoo.org>
*>=sys-devel/binutils-2.15
diff --git a/profiles/default-linux/ppc64/dev/2005.1/power3/make.defaults b/profiles/default-linux/ppc64/dev/2005.1/power3/make.defaults
index 39fb056b6c1a..cc7267f3c985 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/power3/make.defaults
+++ b/profiles/default-linux/ppc64/dev/2005.1/power3/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/ppc64/dev/2005.1/power3/make.defaults,v 1.1 2005/04/08 04:41:47 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/power3/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
ARCH="ppc64"
@@ -14,6 +14,6 @@ ACCEPT_KEYWORDS="ppc64"
STAGE1_USE="unicode"
GRP_STAGE23_USE="unicode ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
-USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png ppc64 python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
+USE="unicode pam berkdb bitmap-fonts emboss gif jpeg nls ncurses perl png python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc64/dev/2005.1/power4/make.defaults b/profiles/default-linux/ppc64/dev/2005.1/power4/make.defaults
index 4957315388c9..9e61f9961891 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/power4/make.defaults
+++ b/profiles/default-linux/ppc64/dev/2005.1/power4/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/ppc64/dev/2005.1/power4/make.defaults,v 1.1 2005/04/08 04:41:47 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/power4/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
ARCH="ppc64"
@@ -14,6 +14,6 @@ ACCEPT_KEYWORDS="ppc64"
STAGE1_USE="unicode"
GRP_STAGE23_USE="unicode ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
-USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png ppc64 python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
+USE="unicode pam berkdb bitmap-fonts emboss gif jpeg nls ncurses perl png python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc64/dev/2005.1/power5/make.defaults b/profiles/default-linux/ppc64/dev/2005.1/power5/make.defaults
index 3cf681033ad5..794752525633 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/power5/make.defaults
+++ b/profiles/default-linux/ppc64/dev/2005.1/power5/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/ppc64/dev/2005.1/power5/make.defaults,v 1.1 2005/04/08 04:41:47 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/power5/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
ARCH="ppc64"
@@ -14,6 +14,6 @@ ACCEPT_KEYWORDS="ppc64"
STAGE1_USE="unicode"
GRP_STAGE23_USE="unicode ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
-USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png ppc64 python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
+USE="unicode pam berkdb bitmap-fonts emboss gif jpeg nls ncurses perl png python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc64/dev/multilib/make.defaults b/profiles/default-linux/ppc64/dev/multilib/make.defaults
index 7856c00b8272..58f4df27fc45 100644
--- a/profiles/default-linux/ppc64/dev/multilib/make.defaults
+++ b/profiles/default-linux/ppc64/dev/multilib/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/ppc64/dev/multilib/make.defaults,v 1.1 2005/06/26 15:47:07 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/multilib/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
ARCH="ppc64"
ACCEPT_KEYWORDS="ppc64"
diff --git a/profiles/default-linux/ppc64/dev/multilib/no-multilib/make.defaults b/profiles/default-linux/ppc64/dev/multilib/no-multilib/make.defaults
index 9b73076f409b..0bf6ace6336d 100644
--- a/profiles/default-linux/ppc64/dev/multilib/no-multilib/make.defaults
+++ b/profiles/default-linux/ppc64/dev/multilib/no-multilib/make.defaults
@@ -1,5 +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/ppc64/dev/multilib/no-multilib/make.defaults,v 1.1 2005/06/27 08:16:56 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/multilib/no-multilib/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
MULTILIB_ABIS="ppc64"
diff --git a/profiles/default-linux/ppc64/dev/multilib/no-multilib/package.mask b/profiles/default-linux/ppc64/dev/multilib/no-multilib/package.mask
index bcee6485316f..b75bfb697881 100644
--- a/profiles/default-linux/ppc64/dev/multilib/no-multilib/package.mask
+++ b/profiles/default-linux/ppc64/dev/multilib/no-multilib/package.mask
@@ -1,6 +1,6 @@
# Copyright 2003-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/multilib/no-multilib/package.mask,v 1.1 2005/06/27 08:16:56 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/multilib/no-multilib/package.mask,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# Mask multilib ppc64 things
# Maintained by Yuta Satoh <nigoro@gentoo.org>
diff --git a/profiles/default-linux/ppc64/dev/multilib/packages b/profiles/default-linux/ppc64/dev/multilib/packages
index 9bae2598b38f..2dad2524066d 100644
--- a/profiles/default-linux/ppc64/dev/multilib/packages
+++ b/profiles/default-linux/ppc64/dev/multilib/packages
@@ -1,6 +1,6 @@
# Copyright 2003-2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/multilib/packages,v 1.1 2005/06/26 15:47:07 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/multilib/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
*>=sys-devel/binutils-2.15.90.0.3-r4
*>=sys-devel/gcc-3.4.4
diff --git a/profiles/default-linux/ppc64/dev/multilib/use.mask b/profiles/default-linux/ppc64/dev/multilib/use.mask
index c5183b11ee39..617b0f30afd8 100644
--- a/profiles/default-linux/ppc64/dev/multilib/use.mask
+++ b/profiles/default-linux/ppc64/dev/multilib/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/multilib/use.mask,v 1.1 2005/06/26 15:47:07 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/multilib/use.mask,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
multilib
diff --git a/profiles/default-linux/ppc64/make.defaults b/profiles/default-linux/ppc64/make.defaults
index e4ebc8506308..c41dc325afb6 100644
--- a/profiles/default-linux/ppc64/make.defaults
+++ b/profiles/default-linux/ppc64/make.defaults
@@ -1,9 +1,9 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/make.defaults,v 1.1 2005/03/05 17:14:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
ARCH="ppc64"
ACCEPT_KEYWORDS="ppc64"
-USE="unicode pam bitmap-fonts gif jpeg nls png ppc64 truetype truetype-fonts type1-fonts zlib"
+USE="unicode pam bitmap-fonts emboss gif jpeg nls png truetype truetype-fonts type1-fonts zlib"
FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc64/use.mask b/profiles/default-linux/ppc64/use.mask
index 3140a9b0df08..28e2df01c276 100644
--- a/profiles/default-linux/ppc64/use.mask
+++ b/profiles/default-linux/ppc64/use.mask
@@ -4,43 +4,30 @@
afs
acpi
3dfx
-3dnow
-3dnowex
directfb
avi
icc
icc-pgo
ifc
krb4
-mmx
-mmx2
+lm_sensors
mplayer
+pcmcia
pda
prelude
ruby
svga
-sse
-scanner
firebird
mzscheme
chasen
fdftk
mono
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
-
# should be ok
jikes
junit
guile
-uclibc
-caps
-
-# for now from xorg ... but likely not for long as this is desirable!
-dlloader
# 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
@@ -65,9 +52,25 @@ pfpro
solid
sybase
sybase-ct
+glitz
+cairo
# dietlibc
diet
-# aqua USE flag is only valid on Mac OS X
-aqua
+#pyste has untested/unkeyworded deps on ppc64
+pyste
+
+# Unmask our instruction sets
+-altivec
+
+# This one is needed because cryptsetup will not build on ppc64. This
+# useflag is used in cdrecord and can be removed once bug #90211 is fixed.
+on-the-fly-crypt
+
+# need to test libaio
+aio
+# needs some asm written
+ocaml
+# needs some research as to why it segfaults on build
+pike
diff --git a/profiles/default-linux/ppc64/virtuals b/profiles/default-linux/ppc64/virtuals
index 3a7d4a8b69e2..a38ef796754c 100644
--- a/profiles/default-linux/ppc64/virtuals
+++ b/profiles/default-linux/ppc64/virtuals
@@ -1,11 +1,8 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/virtuals,v 1.1 2005/01/03 17:58:25 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/virtuals,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
virtual/bootloader sys-boot/yaboot-static
virtual/jdk dev-java/ibm-jdk-bin
virtual/jre dev-java/ibm-jre-bin
-virtual/linux-sources sys-kernel/gentoo-dev-sources
-virtual/kernel sys-kernel/linux26-headers
-virtual/os-headers sys-kernel/linux26-headers
-virtual/dev-manager sys-fs/udev
+virtual/linux-sources sys-kernel/gentoo-sources
diff --git a/profiles/default-linux/s390/2004.3/make.defaults b/profiles/default-linux/s390/2004.3/make.defaults
index 908eaf284e36..b329bad21619 100644
--- a/profiles/default-linux/s390/2004.3/make.defaults
+++ b/profiles/default-linux/s390/2004.3/make.defaults
@@ -1,11 +1,5 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/2004.3/make.defaults,v 1.1 2004/09/21 15:13:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/2004.3/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
-
-ARCH="s390"
-
-USE="berkdb bitmap-fonts crypt cups fbcon foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline slang spell ssl tcpd truetype xprint zlib"
-
-ACCEPT_KEYWORDS="s390"
diff --git a/profiles/default-linux/s390/make.defaults b/profiles/default-linux/s390/make.defaults
index 41596a759804..3dd944ffc46d 100644
--- a/profiles/default-linux/s390/make.defaults
+++ b/profiles/default-linux/s390/make.defaults
@@ -1,11 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/make.defaults,v 1.1 2005/03/05 17:16:49 wolf31o2 Exp $
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
ARCH="s390"
+ACCEPT_KEYWORDS="s390"
-USE="berkdb bitmap-fonts crypt cups fortran f77 fbcon font-server foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline spell ssl tcpd truetype truetype-fonts type1-fonts zlib"
+CHOST="s390-ibm-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
-ACCEPT_KEYWORDS="s390"
+GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
+
+USE="${GRP_STAGE23_USE} berkdb bitmap-fonts crypt cups fortran fbcon font-server foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline spell ssl tcpd truetype truetype-fonts type1-fonts zlib"
diff --git a/profiles/default-linux/s390/packages b/profiles/default-linux/s390/packages
index 54d5403ae471..2888239a85ab 100644
--- a/profiles/default-linux/s390/packages
+++ b/profiles/default-linux/s390/packages
@@ -1,8 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/packages,v 1.1 2004/09/21 15:13:53 vapier Exp $
-
-*virtual/bootloader
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
>=sys-devel/binutils-2.13.90.0.16
>=sys-devel/gcc-3.2.3-r2
diff --git a/profiles/default-linux/s390/use.mask b/profiles/default-linux/s390/use.mask
index adf6c8a31f49..ff5734183d0b 100644
--- a/profiles/default-linux/s390/use.mask
+++ b/profiles/default-linux/s390/use.mask
@@ -1,10 +1,8 @@
# This file contains a list of useflags that cannot be used on s390.
cdr
qt
-jpeg
gpm
3dfx
-3dnow
acpi
afs
alsa
@@ -16,28 +14,23 @@ icc-pgo
informix
firebird
lirc
-mmx
oci8
-pic
sse
svga
trusted
voodoo3
wavelan
java
-X
-vim-with-x
-
-# I need to have some of the bad tcltk uses fixed, until then...
-tcltk
+java-internal
+java-external
+nptl
+hardened
# don't quite know about this one, I'll need to revisit
socks5
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
-uclibc
+# not working for now
+mzscheme
# 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
@@ -54,3 +47,29 @@ pfpro
solid
sybase
sybase-ct
+fdftk
+
+
+# masked until xorg builds
+xv
+gtk
+gtk2
+gnome
+X
+xpm
+vim-with-x
+
+# I need to have some of the bad tcltk uses fixed, until then...
+tcltk
+
+diet
+xemacs
+Xaw3d
+neXt
+lesstif
+motif
+glitz
+mono
+pike
+ocaml
+sdl
diff --git a/profiles/default-linux/s390/virtuals b/profiles/default-linux/s390/virtuals
index 57a656c72d93..485de320c593 100644
--- a/profiles/default-linux/s390/virtuals
+++ b/profiles/default-linux/s390/virtuals
@@ -1,8 +1,6 @@
-# Copyright 2001-2004 Gentoo Foundation.
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/virtuals,v 1.1 2004/09/21 15:13:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/virtuals,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
virtual/bootloader sys-apps/s390-tools
-virtual/kernel sys-kernel/development-sources
-virtual/linux-sources sys-kernel/development-sources
-virtual/os-headers sys-kernel/linux26-headers
+virtual/linux-sources sys-kernel/vanilla-sources
diff --git a/profiles/default-linux/sh/make.defaults b/profiles/default-linux/sh/make.defaults
index b77351e17e45..949722497a00 100644
--- a/profiles/default-linux/sh/make.defaults
+++ b/profiles/default-linux/sh/make.defaults
@@ -1,15 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sh/make.defaults,v 1.1 2004/10/22 21:45:00 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-
-USE="sh crypt ncurses readline ssl zlib"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sh/make.defaults,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
ARCH="sh"
ACCEPT_KEYWORDS="sh"
+CHOST="sh-unknown-linux-gnu"
+CFLAGS="-O2"
+CXXFLAGS="${CFLAGS}"
+
FEATURES="-sandbox sfperms"
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+USE="${GRP_STAGE23_USE} crypt zlib"
diff --git a/profiles/default-linux/sh/packages b/profiles/default-linux/sh/packages
index ed3952035b82..b74bcc55bc43 100644
--- a/profiles/default-linux/sh/packages
+++ b/profiles/default-linux/sh/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sh/packages,v 1.1 2004/10/22 21:45:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sh/packages,v 1.1.1.1 2005/11/30 09:48:35 chriswhite Exp $
>=sys-devel/binutils-2.13.90.0.4
>=sys-devel/gcc-3.2
diff --git a/profiles/default-linux/sh/use.mask b/profiles/default-linux/sh/use.mask
index 824b408df51c..1344925b9805 100644
--- a/profiles/default-linux/sh/use.mask
+++ b/profiles/default-linux/sh/use.mask
@@ -1,7 +1,3 @@
-
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
hardened
# Paul de Vrieze <pauldv@gentoo.org>
@@ -9,13 +5,9 @@ hardened
# this repoman will fail on apps like sys-libs/db
java
-3dnow
icc
icc-pgo
-mmx
svga
-sse
-uclibc
# 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
@@ -45,3 +37,42 @@ fdftk
djbfft
qdbm
mzscheme
+
+X
+qt
+kde
+gnome
+tcltk
+diet
+lirc
+jack
+alsa
+howl
+hal
+nas
+arts
+directfb
+xv
+gtk
+gtk2
+afs
+
+gcj
+objc
+
+kerberos
+smartcard
+
+# get to this later
+bash-completion
+on-the-fly-crypt
+doc
+pam_console
+
+emacs
+xemacs
+ldap
+
+# MATSUU Takuto <matsuu@gentoo.org>
+# Bug 111178
+mysql
diff --git a/profiles/default-linux/sh/virtuals b/profiles/default-linux/sh/virtuals
index 6e63b5ada82d..09657a795a59 100644
--- a/profiles/default-linux/sh/virtuals
+++ b/profiles/default-linux/sh/virtuals
@@ -1,7 +1 @@
-# Copyright 2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sh/virtuals,v 1.1 2004/10/22 21:45:00 vapier Exp $
-
-virtual/dev-manager sys-fs/udev
-virtual/kernel sys-kernel/development-sources
-virtual/os-headers sys-kernel/linux26-headers
+virtual/linux-sources sys-kernel/sh-sources
diff --git a/profiles/default-linux/sparc/make.defaults b/profiles/default-linux/sparc/make.defaults
index 7fa8a1be88e2..0b3037b24fd4 100644
--- a/profiles/default-linux/sparc/make.defaults
+++ b/profiles/default-linux/sparc/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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/make.defaults,v 1.1 2004/12/31 10:36:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
ARCH="sparc"
ACCEPT_KEYWORDS="${ARCH}"
diff --git a/profiles/default-linux/sparc/packages b/profiles/default-linux/sparc/packages
index ec4fb0251854..1cb2cee4a013 100644
--- a/profiles/default-linux/sparc/packages
+++ b/profiles/default-linux/sparc/packages
@@ -1,44 +1,8 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /home/cvsroot/gentoo-x86/profiles/default/packages,v 1.102
-# 2004/03/18 07:47:05 seemant Exp $
+# 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/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
-# This file extends the base packages file for the default profile that all
-# architectures will enjoy. Please note that default is what most
-# architectures
-# will have. Some will have an selinux profile (see
-# ${PORTDIR}/profiles/selinux).
-# The idea is to only create a new family of profiles when absolutely
-# necessary
+# Top-level sparc profile
# SPARC specific stuff (32 and 64 bit)
-*net-ftp/ftp
-*sys-apps/slocate
-*sys-apps/hdparm
*sys-apps/sparc-utils
-*sys-libs/gdbm
-*sys-libs/pwdb
-*sys-libs/slang
-
-# default-sparc-1.4 pkgs
->=sys-devel/binutils-2.13.90.0.16
->=sys-devel/gcc-3.2
->=sys-libs/glibc-2.3.1-r2
-<=sys-kernel/linux-headers-2.4.23
->=sys-apps/sysklogd-1.4.1
-
->=x11-base/xfree-4.2.1
-<sys-apps/shadow-5
->=sys-apps/texinfo-4.2-r1
->=sys-devel/automake-1.6.1-r5
->=sys-devel/libtool-1.4.1-r4
->=sys-libs/ncurses-5.2.20020511-r3
->=sys-libs/pam-0.75-r10
-
-# These don't make sense on sparc
-!sys-devel/bin86
-!sys-boot/lilo
-!sys-boot/grub
-
-# Get a decent editor - BROKEN
-!app-editors/levee
diff --git a/profiles/default-linux/sparc/parent b/profiles/default-linux/sparc/parent
index d5f6b3b3c012..6c754b0341f2 100644
--- a/profiles/default-linux/sparc/parent
+++ b/profiles/default-linux/sparc/parent
@@ -1,8 +1,7 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/sparc/sparc32/2004.3/deprecated b/profiles/default-linux/sparc/sparc32/2004.3/deprecated
index a80776d4d8b2..4e6a42180fcb 100644
--- a/profiles/default-linux/sparc/sparc32/2004.3/deprecated
+++ b/profiles/default-linux/sparc/sparc32/2004.3/deprecated
@@ -1,8 +1,8 @@
-default-linux/sparc/sparc32/2005.0
+default-linux/sparc/sparc32/2005.1
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/sparc/sparc32/2005.0 make.profile
+# ln -s ../usr/portage/profiles/default-linux/sparc/sparc32/2005.1 make.profile
# More information can be found at the following URLs:
# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/default-linux/sparc/sparc32/2004.3/make.defaults b/profiles/default-linux/sparc/sparc32/2004.3/make.defaults
index 0bc05d6adff2..b24e166c3752 100644
--- a/profiles/default-linux/sparc/sparc32/2004.3/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/2004.3/make.defaults
@@ -1,16 +1,7 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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/2004.3/make.defaults,v 1.1 2004/11/29 00:18:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2004.3/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
-ARCH="sparc"
-
-PROFILE_ARCH="sparc"
-
-CHOST="sparc-unknown-linux-gnu"
-PLATFORM="sparc-unknown-linux-gnu"
-
-USE="arts berkdb bitmap-fonts crypt cups fortran f77 fbcon foomaticdb gdbm gtk gtk2 imlib jpeg kde gnome libwww mikmod motif mad mpeg ncurses nls opengl pam perl png python qt readline slang spell ssl tcpd truetype X xv zlib"
-
-ACCEPT_KEYWORDS="sparc"
+USE="arts berkdb bitmap-fonts crypt cups dlloader fortran fbcon font-server foomaticdb gdbm gtk gtk2 imlib jpeg kde gnome libwww mikmod motif mad mpeg ncurses nls opengl pam perl png python qt readline slang spell ssl tcpd truetype truetype-fonts type1-fonts X xv zlib"
diff --git a/profiles/default-linux/sparc/sparc32/2004.3/parent b/profiles/default-linux/sparc/sparc32/2004.3/parent
index 74853ef4eaaf..080558533bee 100644
--- a/profiles/default-linux/sparc/sparc32/2004.3/parent
+++ b/profiles/default-linux/sparc/sparc32/2004.3/parent
@@ -1,7 +1,6 @@
-# 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 $
+# 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/2004.3/parent,v 1.1.1.1 2005/11/30 09:48:39 chriswhite 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/sparc/sparc32/2005.0/make.defaults b/profiles/default-linux/sparc/sparc32/2005.0/make.defaults
index 856d159946b4..14e27c18b95e 100644
--- a/profiles/default-linux/sparc/sparc32/2005.0/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/2005.0/make.defaults
@@ -1,7 +1,7 @@
# 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/2005.0/make.defaults,v 1.1 2005/01/11 01:27:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
-USE="arts berkdb bitmap-fonts crypt cups fortran f77 fbcon foomaticdb gdbm gtk gtk2 imlib jpeg kde gnome libwww mikmod motif mad mpeg ncurses nls opengl pam perl png python qt readline slang spell ssl tcpd truetype X xv zlib"
+USE="arts berkdb bitmap-fonts crypt cups dlloader fortran fbcon foomaticdb gdbm gif gtk gtk2 imlib jpeg kde gnome libwww mikmod motif mad mpeg ncurses nls opengl pam perl png python qt readline slang spell ssl tcpd truetype truetype-fonts type1-fonts X xv zlib"
diff --git a/profiles/default-linux/sparc/sparc32/2005.0/package.mask b/profiles/default-linux/sparc/sparc32/2005.0/package.mask
index cfd3533484e1..99b81daf59a7 100644
--- a/profiles/default-linux/sparc/sparc32/2005.0/package.mask
+++ b/profiles/default-linux/sparc/sparc32/2005.0/package.mask
@@ -1,3 +1,7 @@
+# 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/2005.0/package.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
+
# Masked until bug #60413 is fixed.
media-libs/xine-lib
@@ -53,10 +57,23 @@ media-sound/qmidiarp
media-sound/rosegarden
media-sound/seq24
media-sound/sfc
+media-sound/specimen
media-sound/supercollider
media-sound/tapiir
media-video/gephe
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# New toys enabled by the dev/ profile and linux-headers-2.6
+gnome-base/gnome-volume-manager
+gnome-extra/hal-device-manager
+sys-apps/hal
+sys-apps/pmount
+
+# This probably won't work since -bin is ultra
+dev-haskell/haddock
+dev-lang/ghc
+dev-lang/ghc-bin
+
# Jason Wever <weeve@gentoo.org>
# Masking versions of libffi that don't apply to this profile
>=dev-libs/libffi-3.4.1
diff --git a/profiles/default-linux/sparc/sparc32/2005.0/packages b/profiles/default-linux/sparc/sparc32/2005.0/packages
index 6208696d1205..ec4014529645 100644
--- a/profiles/default-linux/sparc/sparc32/2005.0/packages
+++ b/profiles/default-linux/sparc/sparc32/2005.0/packages
@@ -1,6 +1,6 @@
-# Copyright 2005 Gentoo Foundation.
+# 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/2005.0/packages,v 1.1 2005/05/24 03:39:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.0/packages,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
*>=sys-libs/glibc-2.3.1-r2
*net-misc/dhcpcd
@@ -17,6 +17,5 @@
*<sys-devel/gcc-3.4.1
# Use 2.4 linux-headers by default
--*virtual/os-headers
*<sys-kernel/linux-headers-2.5
diff --git a/profiles/default-linux/sparc/sparc32/2005.0/parent b/profiles/default-linux/sparc/sparc32/2005.0/parent
index 6170d2ad5948..41fc1c982d22 100644
--- a/profiles/default-linux/sparc/sparc32/2005.0/parent
+++ b/profiles/default-linux/sparc/sparc32/2005.0/parent
@@ -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/2005.0/parent,v 1.1 2005/01/11 01:27:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.0/parent,v 1.1.1.1 2005/11/30 09:48:38 chriswhite 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/sparc/sparc32/2005.1/make.defaults b/profiles/default-linux/sparc/sparc32/2005.1/make.defaults
index c06d17738adf..cd5582305c44 100644
--- a/profiles/default-linux/sparc/sparc32/2005.1/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/2005.1/make.defaults
@@ -1,7 +1,7 @@
# 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/2005.1/make.defaults,v 1.1 2005/06/14 14:12:45 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.1/make.defaults,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
-USE="arts berkdb bitmap-fonts crypt cups dlloader fortran fbcon foomaticdb gdbm gif gtk gtk2 imlib jpeg kde gnome libwww mikmod motif mad mpeg ncurses nls opengl pam perl png python qt readline slang spell ssl tcpd truetype truetype-fonts type1-fonts X xv zlib"
+USE="arts berkdb bitmap-fonts crypt cups dlloader eds fortran fbcon foomaticdb gdbm gif gstreamer gtk gtk2 imlib jpeg kde gnome libwww mikmod motif mad mpeg ncurses nls opengl pam perl png python qt readline slang spell ssl tcpd truetype truetype-fonts type1-fonts X xv zlib"
diff --git a/profiles/default-linux/sparc/sparc32/2005.1/package.mask b/profiles/default-linux/sparc/sparc32/2005.1/package.mask
index 855679ddf4ec..8df3e06ee997 100644
--- a/profiles/default-linux/sparc/sparc32/2005.1/package.mask
+++ b/profiles/default-linux/sparc/sparc32/2005.1/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/2005.1/package.mask,v 1.1 2005/06/14 14:12:45 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.1/package.mask,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# Masked until bug #60413 is fixed.
media-libs/xine-lib
@@ -57,10 +57,22 @@ media-sound/qmidiarp
media-sound/rosegarden
media-sound/seq24
media-sound/sfc
+media-sound/specimen
media-sound/supercollider
media-sound/tapiir
media-video/gephe
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# New toys enabled by the dev/ profile and linux-headers-2.6
+gnome-base/gnome-volume-manager
+gnome-extra/hal-device-manager
+sys-apps/hal
+sys-apps/pmount
+# This probably won't work since -bin is ultra
+dev-haskell/haddock
+dev-lang/ghc
+dev-lang/ghc-bin
+
# Jason Wever <weeve@gentoo.org>
# Masking versions of libffi that don't apply to this profile
>=dev-libs/libffi-3.4.1
diff --git a/profiles/default-linux/sparc/sparc32/2005.1/packages b/profiles/default-linux/sparc/sparc32/2005.1/packages
index b95344879207..8a26b3c0598e 100644
--- a/profiles/default-linux/sparc/sparc32/2005.1/packages
+++ b/profiles/default-linux/sparc/sparc32/2005.1/packages
@@ -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/2005.1/packages,v 1.1 2005/06/14 14:12:45 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.1/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
*>=sys-libs/glibc-2.3.1-r2
*net-misc/dhcpcd
@@ -17,6 +17,5 @@
*<sys-devel/gcc-3.4.1
# Use 2.4 linux-headers by default
--*virtual/os-headers
*<sys-kernel/linux-headers-2.5
diff --git a/profiles/default-linux/sparc/sparc32/2005.1/parent b/profiles/default-linux/sparc/sparc32/2005.1/parent
index 02065f3a3370..61fdca8e88b4 100644
--- a/profiles/default-linux/sparc/sparc32/2005.1/parent
+++ b/profiles/default-linux/sparc/sparc32/2005.1/parent
@@ -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/2005.1/parent,v 1.1 2005/06/14 14:12:45 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.1/parent,v 1.1.1.1 2005/11/30 09:48:38 chriswhite 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/sparc/sparc32/make.defaults b/profiles/default-linux/sparc/sparc32/make.defaults
index 65a7a70c26e4..32ec758f9983 100644
--- a/profiles/default-linux/sparc/sparc32/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/make.defaults
@@ -1,35 +1,17 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# System-wide defaults for the Portage system
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/make.defaults,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
-
-ARCH="sparc"
-
-# Host type
-
-CHOST=sparc-unknown-linux-gnu
-PLATFORM=sparc-unknown-linux-gnu
+# 32bit kernel, 32bit userland
+CHOST="sparc-unknown-linux-gnu"
PROFILE_ARCH="sparc"
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
+# Just sparc32 binutils for linux-headers
+CTARGETS_BINUTILS="sparc-unknown-linux-gnu"
-# C Compiler flags
+# Compiler flags
CFLAGS="-O2 -pipe"
-# C++ Compiler flags
CXXFLAGS=${CFLAGS}
-USE="arts berkdb crypt cups fbcon foomaticdb gdbm gtk gtk2 imlib jpeg kde gnome libwww mikmod motif mad mpeg
- ncurses nls opengl pam perl png python qt readline slang spell ssl tcpd truetype X xv zlib"
-
-# The following USE flags are NOT recommended for sparc32 and might cause breakage...
-# mmx, 3dnow, sse, svga, gpm,
-
-COMPILER="gcc3"
-
-ACCEPT_KEYWORDS="sparc"
-
+# Misc
+FEATURES="sandbox ccache"
diff --git a/profiles/default-linux/sparc/sparc32/parent b/profiles/default-linux/sparc/sparc32/parent
index 74853ef4eaaf..1a495ce1ab14 100644
--- a/profiles/default-linux/sparc/sparc32/parent
+++ b/profiles/default-linux/sparc/sparc32/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/parent,v 1.1.1.1 2005/11/30 09:48:38 chriswhite 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/sparc/sparc32/use.mask b/profiles/default-linux/sparc/sparc32/use.mask
index 67b2cc4778dc..3b05676279fc 100644
--- a/profiles/default-linux/sparc/sparc32/use.mask
+++ b/profiles/default-linux/sparc/sparc32/use.mask
@@ -1,38 +1,20 @@
-# This file contains a list of useflags that cannot be used on sparc.
+# nptl on sparc requires the v9 ABI which requires sun4u
+nptl
-3dfx
-3dnow
-acpi
-afs
+# Jeremy Huddleston <eradicator@gentoo.org>
+# Don't allow alsa in sparc32 because of missing drivers
alsa
-altivec
-apm
-directfb
-icc
-icc-pgo
-informix
-firebird
-lirc
-mmx
-oci8
-pic
-sse
-svga
-tcc
-trusted
-voodoo3
-wavelan
+ladcca
+# Jason Wever <weeve@gentoo.org>
+# Don't allow for some video and dvd use flags since sparc32 is too slow
+dvd
+dvdr
+mpeg
-# And arch keyword flags that don't work
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# For now, until we check it's status wrt build b0rkage and toolchain
+xine
-x86
-ppc
-alpha
-mips
-hppa
-arm
-
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
+# clisp is seriously b0rked
+clisp
diff --git a/profiles/default-linux/sparc/sparc64/2004.2/deprecated b/profiles/default-linux/sparc/sparc64/2004.2/deprecated
index 01ba1b9be885..d83b9231f0b0 100644
--- a/profiles/default-linux/sparc/sparc64/2004.2/deprecated
+++ b/profiles/default-linux/sparc/sparc64/2004.2/deprecated
@@ -1,8 +1,8 @@
-default-linux/sparc/sparc64/2005.0
+default-linux/sparc/sparc64/2005.1
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/sparc/sparc64/2005.0 make.profile
+# ln -s ../usr/portage/profiles/default-linux/sparc/sparc64/2005.1 make.profile
# More information can be found at the following URLs:
# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/default-linux/sparc/sparc64/2004.2/make.defaults b/profiles/default-linux/sparc/sparc64/2004.2/make.defaults
index 49374fe414bd..29087ed2e73a 100644
--- a/profiles/default-linux/sparc/sparc64/2004.2/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2004.2/make.defaults
@@ -1,25 +1,9 @@
-# Copyright 2004 Gentoo Foundation.
+# 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/2004.2/make.defaults,v 1.1 2004/10/01 22:07:22 kumba Exp $
-
-ARCH="sparc"
-
-# Even though this is a 64bit kernel, we use a 32-bit userland (v9)
-CHOST="sparc-unknown-linux-gnu"
-PLATFORM="sparc64-unknown-linux-gnu"
-
-# Used in ebuilds for verifying sparc64 profile
-PROFILE_ARCH="sparc64"
-
-# Compiler flags
-CFLAGS="-O2 -pipe"
-CXXFLAGS=${CFLAGS}
-
-# Misc
-FEATURES="sandbox ccache"
-ACCEPT_KEYWORDS="sparc"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/make.defaults,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# USE settings
-USE="arts avi berkdb bitmap-fonts crypt cups encode esd fbcon foomaticdb gdbm gif gtk gnome imlib jpeg kde libwww mad mikmod motif mpeg
- ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline slang sdl spell ssl tcpd truetype X xv xml2 xmms xprint zlib"
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+USE="arts avi berkdb bitmap-fonts crypt cups dlloader encode esd fortran fbcon font-server foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib"
+
+# Catalyst stage/grp USE
+GRP_STAGE23_USE="berkdb gpm gcc64 gtk2 ipv6 ncurses nls pam perl python readline ssl tcpd"
diff --git a/profiles/default-linux/sparc/sparc64/2004.2/package.mask b/profiles/default-linux/sparc/sparc64/2004.2/package.mask
index e9660f86f5fc..00073030c6a3 100644
--- a/profiles/default-linux/sparc/sparc64/2004.2/package.mask
+++ b/profiles/default-linux/sparc/sparc64/2004.2/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/package.mask,v 1.1 2005/03/07 00:09:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/package.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# Mask alsa-lib and alsa-utils so people don't accidently emerge them on a
@@ -9,3 +9,7 @@ media-libs/alsa-lib
# Jeremy Huddleston <eradicator@gentoo.org>
# Something between 2.3.3.20040420 and 2.3.4.20040619 breaks blackdown-jdk
>=sys-libs/glibc-2.3.4
+
+# Jason Wever <weeve@gentoo.org>
+# gradm requires 64 bit support, which doesn't exist in this profile
+>sys-apps/gradm-2.0.1-r1
diff --git a/profiles/default-linux/sparc/sparc64/2004.2/packages b/profiles/default-linux/sparc/sparc64/2004.2/packages
index 5bed2d4d5541..7b3613ac555f 100644
--- a/profiles/default-linux/sparc/sparc64/2004.2/packages
+++ b/profiles/default-linux/sparc/sparc64/2004.2/packages
@@ -1,14 +1,17 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/packages,v 1.1 2004/10/01 22:07:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/packages,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# sparc64 v9 32-bit userland packages
# Since we're running a sparc64 kernel w/ 32bit (v9) userland,
-# we need gcc-sparc64 for kernels
-*sys-devel/gcc-sparc64
+# we need gcc-sparc64 for kernels.
+# Only use gcc-sparc64-3.3.x for now. 3.4.x users want the gcc34 profile
+*<sys-devel/gcc-sparc64-3.4.0
-# Sometimes necessary to trick programs into thinking we're really
-# a sparc32 system.
-*sys-devel/sparc32
+# Lock to gcc-3.3.x and allow 3.4 for the testing profile only
+*<sys-devel/gcc-3.4.1
+
+# Use 2.4 linux-headers by default
+*<sys-kernel/linux-headers-2.5
diff --git a/profiles/default-linux/sparc/sparc64/2004.2/parent b/profiles/default-linux/sparc/sparc64/2004.2/parent
index 74853ef4eaaf..bb1f890fc40f 100644
--- a/profiles/default-linux/sparc/sparc64/2004.2/parent
+++ b/profiles/default-linux/sparc/sparc64/2004.2/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/parent,v 1.1.1.1 2005/11/30 09:48:38 chriswhite 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/sparc/sparc64/2004.2/use.mask b/profiles/default-linux/sparc/sparc64/2004.2/use.mask
index 860be533fe31..168efdb36e85 100644
--- a/profiles/default-linux/sparc/sparc64/2004.2/use.mask
+++ b/profiles/default-linux/sparc/sparc64/2004.2/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/use.mask,v 1.1 2005/03/09 01:22:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/use.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# Don't allow alsa in sparc64 because of broken snd-ioctl32
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/26headers/packages b/profiles/default-linux/sparc/sparc64/2004.3/26headers/packages
index 64e84f6089e1..9053cc2accea 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/26headers/packages
+++ b/profiles/default-linux/sparc/sparc64/2004.3/26headers/packages
@@ -1,8 +1,7 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/26headers/packages,v 1.1 2005/01/04 12:06:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/26headers/packages,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# We use 2.6 headers
-*<sys-kernel/linux-headers-2.5
#*<sys-kernel/linux-headers-2.7
-*virtual/os-headers
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/26headers/parent b/profiles/default-linux/sparc/sparc64/2004.3/26headers/parent
index c3979047ee2f..8be18c39bf56 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/26headers/parent
+++ b/profiles/default-linux/sparc/sparc64/2004.3/26headers/parent
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/26headers/parent,v 1.1 2005/01/04 12:06:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/26headers/parent,v 1.1.1.1 2005/11/30 09:48:38 chriswhite 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/sparc/sparc64/2004.3/26headers/virtuals b/profiles/default-linux/sparc/sparc64/2004.3/26headers/virtuals
index bbc51d0696a0..c5436546887e 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/26headers/virtuals
+++ b/profiles/default-linux/sparc/sparc64/2004.3/26headers/virtuals
@@ -1,3 +1 @@
-virtual/kernel sys-kernel/gentoo-dev-sources
-virtual/linux-sources sys-kernel/gentoo-dev-sources
-virtual/os-headers sys-kernel/linux26-headers
+virtual/linux-sources sys-kernel/gentoo-sources
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/deprecated b/profiles/default-linux/sparc/sparc64/2004.3/deprecated
index 01ba1b9be885..d83b9231f0b0 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/deprecated
+++ b/profiles/default-linux/sparc/sparc64/2004.3/deprecated
@@ -1,8 +1,8 @@
-default-linux/sparc/sparc64/2005.0
+default-linux/sparc/sparc64/2005.1
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/sparc/sparc64/2005.0 make.profile
+# ln -s ../usr/portage/profiles/default-linux/sparc/sparc64/2005.1 make.profile
# More information can be found at the following URLs:
# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/make.defaults b/profiles/default-linux/sparc/sparc64/2004.3/make.defaults
index 10aa355b13ab..9442f5e63e04 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2004.3/make.defaults
@@ -1,26 +1,9 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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/2004.3/make.defaults,v 1.1 2004/10/06 21:48:05 gustavoz Exp $
-
-ARCH="sparc"
-
-# Even though this is a 64bit kernel, we use a 32-bit userland (v9)
-CHOST="sparc-unknown-linux-gnu"
-PLATFORM="sparc64-unknown-linux-gnu"
-
-# Used in ebuilds for verifying sparc64 profile
-PROFILE_ARCH="sparc64"
-
-# Compiler flags
-CFLAGS="-O2 -pipe"
-CXXFLAGS=${CFLAGS}
-
-# Misc
-FEATURES="sandbox ccache"
-ACCEPT_KEYWORDS="sparc"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/make.defaults,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# USE settings
-USE="arts avi berkdb bitmap-fonts crypt cups encode esd fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline slang sdl spell ssl tcpd truetype X xv xml2 xmms xprint zlib"
+USE="arts avi berkdb bitmap-fonts crypt cups dlloader encode esd fortran fbcon font-server foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib"
# Catalyst stage/grp USE
GRP_STAGE23_USE="berkdb gpm gcc64 gtk2 ipv6 ncurses nls pam perl python readline ssl tcpd"
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/package.mask b/profiles/default-linux/sparc/sparc64/2004.3/package.mask
index ff9f008e6be9..78fc8afb6892 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/package.mask
+++ b/profiles/default-linux/sparc/sparc64/2004.3/package.mask
@@ -1,11 +1,55 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/package.mask,v 1.1 2005/03/07 00:09:22 eradicator Exp $
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# Mask alsa-lib and alsa-utils so people don't accidently emerge them on a
-# system with unsafe alsa drivers.
-media-sound/alsa-utils
-media-libs/alsa-lib
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/package.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# Something between 2.3.3.20040420 and 2.3.4.20040619 breaks blackdown-jdk
>=sys-libs/glibc-2.3.4
+
+# Jason Wever <weeve@gentoo.org>
+# gradm requires 64 bit support, which doesn't exist in this profile
+>sys-apps/gradm-2.0.1-r1
+
+# 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/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/jaaa
+media-sound/jamin
+media-sound/kaconnect
+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/supercollider
+media-sound/tapiir
+media-video/gephe
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/packages b/profiles/default-linux/sparc/sparc64/2004.3/packages
index d054676d3eb6..1c5a6f234898 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/packages
+++ b/profiles/default-linux/sparc/sparc64/2004.3/packages
@@ -1,13 +1,15 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/packages,v 1.1 2004/10/06 21:48:05 gustavoz Exp $
-
-# sparc64 v9 32-bit userland packages
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/packages,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Since we're running a sparc64 kernel w/ 32bit (v9) userland,
-# we need gcc-sparc64 for kernels
-*sys-devel/gcc-sparc64
+# we need gcc-sparc64 for kernels.
+# Only use gcc-sparc64-3.3.x for now. 3.4.x users want the gcc34 profile
+*<sys-devel/gcc-sparc64-3.4.0
+
+# Lock to gcc-3.3.x and allow 3.4 for the testing profile only
+*<sys-devel/gcc-3.4.1
+
+# Use 2.4 linux-headers by default
+*<sys-kernel/linux-headers-2.5
-# Sometimes necessary to trick programs into thinking we're really
-# a sparc32 system.
-*sys-devel/sparc32
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/parent b/profiles/default-linux/sparc/sparc64/2004.3/parent
index ae5349c2a8d7..9eb4810ea16a 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/parent
+++ b/profiles/default-linux/sparc/sparc64/2004.3/parent
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/parent,v 1.1 2004/10/06 21:48:05 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/parent,v 1.1.1.1 2005/11/30 09:48:38 chriswhite 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/sparc/sparc64/2004.3/use.mask b/profiles/default-linux/sparc/sparc64/2004.3/use.mask
index e322a4f13b24..79329a63c5d4 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/use.mask
+++ b/profiles/default-linux/sparc/sparc64/2004.3/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/use.mask,v 1.1 2005/03/09 01:22:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/use.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# Don't allow alsa in sparc64 because of broken snd-ioctl32
diff --git a/profiles/default-linux/sparc/sparc64/2005.0/make.defaults b/profiles/default-linux/sparc/sparc64/2005.0/make.defaults
index fcaff760a924..70e0c07da464 100644
--- a/profiles/default-linux/sparc/sparc64/2005.0/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2005.0/make.defaults
@@ -1,16 +1,9 @@
# 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/2005.0/make.defaults,v 1.1 2005/01/11 01:19:50 gustavoz Exp $
-
-# Compiler flags
-CFLAGS="-O2 -pipe"
-CXXFLAGS=${CFLAGS}
-
-# Misc
-FEATURES="sandbox ccache"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# USE settings
-USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype X xv xml2 xmms zlib"
+USE="arts avi berkdb bitmap-fonts crypt cups dlloader encode esd fortran fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib"
# Catalyst stage/grp USE
GRP_STAGE23_USE="berkdb gpm gcc64 gtk2 ipv6 ncurses nls pam perl python readline ssl tcpd"
diff --git a/profiles/default-linux/sparc/sparc64/2005.0/package.mask b/profiles/default-linux/sparc/sparc64/2005.0/package.mask
index 51e12ba4f5b2..53440c6056cd 100644
--- a/profiles/default-linux/sparc/sparc64/2005.0/package.mask
+++ b/profiles/default-linux/sparc/sparc64/2005.0/package.mask
@@ -1,11 +1,69 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/package.mask,v 1.1 2005/03/07 00:09:22 eradicator Exp $
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# Mask alsa-lib and alsa-utils so people don't accidently emerge them on a
-# system with unsafe alsa drivers.
-media-sound/alsa-utils
-media-libs/alsa-lib
+# 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/2005.0/package.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# Something between 2.3.3.20040420 and 2.3.4.20040619 breaks blackdown-jdk
>=sys-libs/glibc-2.3.4
+
+# Jason Wever <weeve@gentoo.org>
+# gradm requires 64 bit support, which doesn't exist in this profile
+>sys-apps/gradm-2.0.1-r1
+
+# 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/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/jaaa
+media-sound/jamin
+media-sound/kaconnect
+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
+
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# New toys enabled by the dev/ profile and linux-headers-2.6
+gnome-base/gnome-volume-manager
+gnome-extra/hal-device-manager
+sys-apps/hal
+sys-apps/pmount
+
+# Jason Wever <weeve@gentoo.org>
+# Masking versions of libffi that don't apply to this profile
+>=dev-libs/libffi-3.4.1
diff --git a/profiles/default-linux/sparc/sparc64/2005.0/packages b/profiles/default-linux/sparc/sparc64/2005.0/packages
index 8cbd1581e01a..bfe0f265cc88 100644
--- a/profiles/default-linux/sparc/sparc64/2005.0/packages
+++ b/profiles/default-linux/sparc/sparc64/2005.0/packages
@@ -1,8 +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/sparc/sparc64/2005.0/packages,v 1.1 2005/01/11 01:19:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/packages,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Since we're running a sparc64 kernel w/ 32bit (v9) userland,
# we need gcc-sparc64 for kernels.
# Only use gcc-sparc64-3.3.x for now. 3.4.x users want the gcc34 profile
*<sys-devel/gcc-sparc64-3.4.0
+
+# Lock to gcc-3.3.x and allow 3.4 for the testing profile only
+*<sys-devel/gcc-3.4.1
+
+# Use 2.4 linux-headers by default
+*<sys-kernel/linux-headers-2.5
+
diff --git a/profiles/default-linux/sparc/sparc64/2005.0/parent b/profiles/default-linux/sparc/sparc64/2005.0/parent
index 5f14b515006f..a0f018757a27 100644
--- a/profiles/default-linux/sparc/sparc64/2005.0/parent
+++ b/profiles/default-linux/sparc/sparc64/2005.0/parent
@@ -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/2005.0/parent,v 1.1 2005/01/11 01:19:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/parent,v 1.1.1.1 2005/11/30 09:48:38 chriswhite 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/sparc/sparc64/2005.0/use.mask b/profiles/default-linux/sparc/sparc64/2005.0/use.mask
index 971b0a5b71d1..3e0ed101054b 100644
--- a/profiles/default-linux/sparc/sparc64/2005.0/use.mask
+++ b/profiles/default-linux/sparc/sparc64/2005.0/use.mask
@@ -1,4 +1,6 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/use.mask,v 1.1 2005/03/09 01:22:06 eradicator Exp $
+# 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/2005.0/use.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# Don't allow alsa in sparc64 because of broken snd-ioctl32
diff --git a/profiles/default-linux/sparc/sparc64/2005.1/make.defaults b/profiles/default-linux/sparc/sparc64/2005.1/make.defaults
index 6b375afc1389..46c293b9af7a 100644
--- a/profiles/default-linux/sparc/sparc64/2005.1/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2005.1/make.defaults
@@ -1,9 +1,9 @@
# 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/2005.1/make.defaults,v 1.1 2005/06/14 14:08:46 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.1/make.defaults,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# USE settings
-USE="arts avi berkdb bitmap-fonts crypt cups dlloader encode esd fortran fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib"
+USE="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 ogg oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xv xml2 xmms zlib"
# Catalyst stage/grp USE
GRP_STAGE23_USE="berkdb gpm gcc64 gtk2 ipv6 ncurses nls pam perl python readline ssl tcpd"
diff --git a/profiles/default-linux/sparc/sparc64/2005.1/package.mask b/profiles/default-linux/sparc/sparc64/2005.1/package.mask
index d6b8b4f2ffc0..2728dabbe39d 100644
--- a/profiles/default-linux/sparc/sparc64/2005.1/package.mask
+++ b/profiles/default-linux/sparc/sparc64/2005.1/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/2005.1/package.mask,v 1.1 2005/06/14 14:08:46 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.1/package.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# Something between 2.3.3.20040420 and 2.3.4.20040619 breaks blackdown-jdk
@@ -52,10 +52,18 @@ media-sound/qmidiarp
media-sound/rosegarden
media-sound/seq24
media-sound/sfc
+media-sound/specimen
media-sound/supercollider
media-sound/tapiir
media-video/gephe
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# New toys enabled by the dev/ profile and linux-headers-2.6
+gnome-base/gnome-volume-manager
+gnome-extra/hal-device-manager
+sys-apps/hal
+sys-apps/pmount
+
# Jason Wever <weeve@gentoo.org>
# Masking versions of libffi that don't apply to this profile
>=dev-libs/libffi-3.4.1
diff --git a/profiles/default-linux/sparc/sparc64/2005.1/packages b/profiles/default-linux/sparc/sparc64/2005.1/packages
index 7d032ec035cc..cbe140d05dee 100644
--- a/profiles/default-linux/sparc/sparc64/2005.1/packages
+++ b/profiles/default-linux/sparc/sparc64/2005.1/packages
@@ -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/2005.1/packages,v 1.1 2005/06/14 14:08:46 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.1/packages,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Since we're running a sparc64 kernel w/ 32bit (v9) userland,
# we need gcc-sparc64 for kernels.
@@ -11,6 +11,5 @@
*<sys-devel/gcc-3.4.1
# Use 2.4 linux-headers by default
--*virtual/os-headers
*<sys-kernel/linux-headers-2.5
diff --git a/profiles/default-linux/sparc/sparc64/2005.1/parent b/profiles/default-linux/sparc/sparc64/2005.1/parent
index 5adb2d0bc31a..576fba311c78 100644
--- a/profiles/default-linux/sparc/sparc64/2005.1/parent
+++ b/profiles/default-linux/sparc/sparc64/2005.1/parent
@@ -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/2005.1/parent,v 1.1 2005/06/14 14:08:46 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.1/parent,v 1.1.1.1 2005/11/30 09:48:38 chriswhite 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/sparc/sparc64/2005.1/use.mask b/profiles/default-linux/sparc/sparc64/2005.1/use.mask
index 0e576807d3b4..5c4d5d73bfb2 100644
--- a/profiles/default-linux/sparc/sparc64/2005.1/use.mask
+++ b/profiles/default-linux/sparc/sparc64/2005.1/use.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/2005.1/use.mask,v 1.1 2005/06/14 14:08:46 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.1/use.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# Don't allow alsa in sparc64 because of broken snd-ioctl32
diff --git a/profiles/default-linux/sparc/sparc64/2006.0/make.defaults b/profiles/default-linux/sparc/sparc64/2006.0/make.defaults
index 6cac20b7165d..56e224113271 100644
--- a/profiles/default-linux/sparc/sparc64/2006.0/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2006.0/make.defaults
@@ -1,17 +1,17 @@
# Copyright 1999-2004 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/make.defaults,v 1.1 2005/09/24 18:59:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
CHOST="sparc-unknown-linux-gnu"
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"
-FAKE_TARGETS_sparc32="sparcv9-unknown-linux-gnu"
CDEFINE_sparc32="!__arch64__"
LIBDIR_sparc32="lib"
diff --git a/profiles/default-linux/sparc/sparc64/2006.0/package.mask b/profiles/default-linux/sparc/sparc64/2006.0/package.mask
index fe092b6022f6..78f8a1c8870e 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.1 2005/11/01 13:26:14 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.0/package.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Jason Wever <weeve@gentoo.org>
# gradm requires 64 bit support, which doesn't exist in this profile
@@ -8,6 +8,159 @@
# Gustavo Zacarias <gustavoz@gentoo.org>
# Java is broken for the new stuff
-# This is a work in progress
+# 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/openjnlp
+app-portage/portagemaster
+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-daemons
+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-util/checkstyle
+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
+media-gfx/aoi
+net-misc/mindterm
+www-servers/jboss
+www-servers/jetty
+www-servers/orion
+www-servers/resin
+www-servers/resin-ee
+www-servers/tomcat
diff --git a/profiles/default-linux/sparc/sparc64/2006.0/packages b/profiles/default-linux/sparc/sparc64/2006.0/packages
index c679121cd626..1409f7d56a2d 100644
--- a/profiles/default-linux/sparc/sparc64/2006.0/packages
+++ b/profiles/default-linux/sparc/sparc64/2006.0/packages
@@ -1,6 +1,6 @@
# Copyright 1999-2004 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/packages,v 1.1 2005/09/24 18:59:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.0/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
# Since we're running a sparc64 kernel w/ 32bit (v9) userland,
# we need gcc-sparc64 for kernels.
@@ -8,5 +8,5 @@
# Jeremy Huddleston <eradicator@gentoo.org>
# Earlier versions aren't patched to work with 2.6 headers
-*>sys-boot/silo-1.4.9
+*>=sys-boot/silo-1.4.9
diff --git a/profiles/default-linux/sparc/sparc64/2006.0/parent b/profiles/default-linux/sparc/sparc64/2006.0/parent
index 5366d0ff4561..a17dab7f2374 100644
--- a/profiles/default-linux/sparc/sparc64/2006.0/parent
+++ b/profiles/default-linux/sparc/sparc64/2006.0/parent
@@ -1,6 +1,6 @@
# Copyright 2004 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/parent,v 1.1 2005/09/24 18:59:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.0/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/sparc/sparc64/2006.0/use.mask b/profiles/default-linux/sparc/sparc64/2006.0/use.mask
index ca9686ca3a37..8d35a8b8e561 100644
--- a/profiles/default-linux/sparc/sparc64/2006.0/use.mask
+++ b/profiles/default-linux/sparc/sparc64/2006.0/use.mask
@@ -1,5 +1,7 @@
# 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/use.mask,v 1.1 2005/09/24 18:59:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.0/use.mask,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
+# Java and java-related stuffs
+freetts
java
diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/make.defaults b/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/make.defaults
index aa9d95104cc4..a30e2fc3b9a1 100644
--- a/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/make.defaults
@@ -1,5 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/make.defaults,v 1.1 2005/03/07 00:05:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/make.defaults,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
+CHOST="sparc64-unknown-linux-gnu"
DEFAULT_ABI="sparc64"
diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/package.mask b/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/package.mask
index 56bd596706a4..ffe2179c9762 100644
--- a/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/package.mask
+++ b/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/package.mask,v 1.1 2005/03/07 00:05:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/package.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# mask out multilib unfriendly versions. Newer ones should install to & look
@@ -22,10 +22,10 @@
<net-fs/samba-3.0.11
<net-libs/courier-authlib-0.52
<net-libs/liblockfile-1.03-r2
-<net-www/mozilla-1.7.5-r1
-<net-www/mozilla-firefox-1.0.1
+<www-client/mozilla-1.7.5-r1
<sys-apps/dbus-0.23-r2
<sys-apps/iproute2-2.6.10.20050112
<sys-devel/flex-2.5.4a-r6
<sys-libs/pam-0.77-r7
<sys-libs/pwdb-0.62-r1
+<www-client/mozilla-firefox-1.0.1
diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/parent b/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/parent
index 74853ef4eaaf..2552dc4c6540 100644
--- a/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/parent
+++ b/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/parent,v 1.1.1.1 2005/11/30 09:48:38 chriswhite 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/sparc/sparc64/dev/multilib/README b/profiles/default-linux/sparc/sparc64/dev/multilib/README
index 22ac224bdcbb..c22dfff41d56 100644
--- a/profiles/default-linux/sparc/sparc64/dev/multilib/README
+++ b/profiles/default-linux/sparc/sparc64/dev/multilib/README
@@ -6,7 +6,7 @@ Set FEATURES=-sandbox in /etc/make.conf because of a sandbox bug that is seen
when using gcc-config 1.4.0
Make sure you have the latest gcc-config baselayout and portage:
-# emerge -uv '>=sys-devel/gcc-config-1.3.11' '>=sys-apps/portage-2.1.51-r9'
+# emerge -uv '>=sys-devel/gcc-config-1.3.11' '>=sys-apps/portage-2.0.51-r9'
Delete the /usr/sparc64-unknown-linux-gnu symlink hackery:
# rm /usr/sparc64-unknown-linux-gnu
@@ -39,6 +39,7 @@ Get a stage1 sparc64 gcc:
Remove sparc32 gcc compiler and binutils from your system
# emerge unmerge \=sys-devel/gcc-<version> \=sys-devel/binutils-<version>
# rm /etc/env.d/gcc/config-sparc-unknown-linux-gnu /etc/env.d/05gcc-sparc-unknown-linux-gnu /etc/env.d/binutils/binutils/config-sparc-unknown-linux-gnu
+# rm /etc/env.d/binutils/config-sparc-unknown-linux-gnu
Use gcc-config to set your gcc
Choose the sparc64-unknown-linux-gnu one you just emerged
@@ -51,3 +52,12 @@ Use the stage1 gcc to build bootstrap multilib glibc
Now, finally emerge your multilib sandbox, full glibc and gcc
# emerge -v portage gcc glibc
+
+Now unfortunately a bunch of .las are now lying around pointing to incorrect places... Here's a kludge:
+find /usr/lib /usr/kde/*/lib /usr/qt/*/lib -name '*.la' -exec \
+ sed -i -e 's:usr/lib/gcc\(-lib\)?/sparc-unknown-linux-gnu:usr/lib/gcc/sparc64-unknown-linux-gnu:g' \
+ -e 's:/lib\(ffi\|g2c\|objc\|stdc++\|supc++\):/32/lib\1:g' \
+ -e 's:/32/32/:/32/:g' \
+ {} \;
+
+Next, get rid of the /usr/lib/gcc/sparc64-unknown-linux-gnu/<gcc version>/*.la files. They will confuse libtool. See bug #75420 for more info on this.
diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/make.defaults b/profiles/default-linux/sparc/sparc64/dev/multilib/make.defaults
index 56a436a3ada8..e180b8a46d02 100644
--- a/profiles/default-linux/sparc/sparc64/dev/multilib/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/dev/multilib/make.defaults
@@ -1,14 +1,11 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/make.defaults,v 1.1 2005/03/07 00:05:03 eradicator Exp $
-
-CHOST="sparc64-unknown-linux-gnu"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/make.defaults,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
MULTILIB_ABIS="sparc32 sparc64"
-DEFAULT_ABI="sparc32"
CFLAGS_sparc64="-m64"
-LDFLAGS_sparc64="-m elf64-sparc"
+LDFLAGS_sparc64="-m elf64_sparc"
CHOST_sparc64="sparc64-unknown-linux-gnu"
CTARGET_ALIASES_sparc64="sparc64-linux"
CDEFINE_sparc64="__arch64__"
diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask b/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask
index 7b246193920c..084ca3dc2ecc 100644
--- a/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask
+++ b/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask
@@ -1,5 +1,22 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask,v 1.1 2005/03/07 00:05:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org> 2005.03.06
# sys-devel/gcc brings in our 64bit compiler
sys-devel/gcc-sparc64
+
+# Jeremy Huddleston <eradicator@gentoo.org> 2005.03.08
+# Older perl versions don't set the correct archlib path for multilib
+# profiles where CHOST != $(get_abi_CHOST)
+<sys-devel/libperl-5.8.6
+
+# Jeremy Huddleston <eradicator@gentoo.org> 2005.03.08
+# Older postgresql versions use sparc64 ld without the $(get_abi_LDFLAGS)
+<dev-db/postgresql-7.4.7-r1
+=dev-db/postgresql-8.0.0
+=dev-db/postgresql-8.0.1
+
+# Jeremy Huddleston <eradicator@gentoo.org> 2005.08.23
+# These old versions don't work when the default toolchain target is not
+# the desired target
+=sys-devel/gcc-config-1*
+=sys-devel/binutils-config-1*
diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/packages b/profiles/default-linux/sparc/sparc64/dev/multilib/packages
index b1d54f725b56..f368c08b8455 100644
--- a/profiles/default-linux/sparc/sparc64/dev/multilib/packages
+++ b/profiles/default-linux/sparc/sparc64/dev/multilib/packages
@@ -1,7 +1,14 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/packages,v 1.1 2005/03/07 00:05:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/packages,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# sys-devel/gcc brings in our 64bit compiler
-*sys-devel/gcc-sparc64
+# Force toolchain versions that have been tested to work and are multilib aware
+*>=sys-apps/portage-2.0.51-r13
+*>=sys-devel/binutils-2.15.92.0.2-r2
+*>=sys-devel/gcc-3.4.3-r1
+*>=sys-libs/glibc-2.3.4.20050125-r1
+*app-admin/eselect-compiler
+>=sys-devel/distcc-2.18.3-r4
diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/parent b/profiles/default-linux/sparc/sparc64/dev/multilib/parent
index 74853ef4eaaf..92d417e154bf 100644
--- a/profiles/default-linux/sparc/sparc64/dev/multilib/parent
+++ b/profiles/default-linux/sparc/sparc64/dev/multilib/parent
@@ -1,8 +1,7 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/parent,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# This file describes the parent profile to this. In most cases this will
# just be the name of the parent directory
-..
+../../2006.0
diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals b/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals
index 5e9441f5aa52..5f57731a5ca5 100644
--- a/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals
+++ b/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals
@@ -1,5 +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/sparc/sparc64/dev/multilib/virtuals,v 1.1 2005/03/07 00:05:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
-virtual/linux-sources sys-kernel/gentoo-dev-sources
+virtual/linux-sources sys-kernel/gentoo-sources
diff --git a/profiles/default-linux/sparc/sparc64/make.defaults b/profiles/default-linux/sparc/sparc64/make.defaults
index 7cdcebc27628..0e489381abd2 100644
--- a/profiles/default-linux/sparc/sparc64/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/make.defaults
@@ -1,12 +1,18 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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/make.defaults,v 1.1 2004/12/31 10:29:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/make.defaults,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
-ARCH="sparc"
-ACCEPT_KEYWORDS="${ARCH}"
-
-# Even though this is a 64bit kernel, we use a 32-bit userland (v9)
+# 64bit kernel, 32bit userland
CHOST="sparc-unknown-linux-gnu"
+PROFILE_ARCH="sparc64"
# We need sparc64 binutils for linux-headers
CTARGETS_BINUTILS="sparc-unknown-linux-gnu sparc64-unknown-linux-gnu"
+STAGE1_USE="gcc64"
+
+# Compiler flags
+CFLAGS="-O2 -pipe"
+CXXFLAGS=${CFLAGS}
+
+# Misc
+FEATURES="sandbox ccache"
diff --git a/profiles/default-linux/sparc/sparc64/packages b/profiles/default-linux/sparc/sparc64/packages
index 21b2fc51c838..75b02b3b81ea 100644
--- a/profiles/default-linux/sparc/sparc64/packages
+++ b/profiles/default-linux/sparc/sparc64/packages
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/packages,v 1.1 2004/11/29 12:59:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/packages,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
# Sometimes necessary to trick programs into thinking we're really
# a sparc32 system.
diff --git a/profiles/default-linux/sparc/sparc64/parent b/profiles/default-linux/sparc/sparc64/parent
index 74853ef4eaaf..cd7d955963df 100644
--- a/profiles/default-linux/sparc/sparc64/parent
+++ b/profiles/default-linux/sparc/sparc64/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/parent,v 1.1.1.1 2005/11/30 09:48:37 chriswhite 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/sparc/sparc64/server/make.defaults b/profiles/default-linux/sparc/sparc64/server/make.defaults
index 7abe4829755c..8c45eab41cde 100644
--- a/profiles/default-linux/sparc/sparc64/server/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/server/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/sparc/sparc64/server/make.defaults,v 1.1 2005/03/30 19:38:57 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/server/make.defaults,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# USE settings
USE="acl apache2 berkdb crypt gdbm gcc64 ncurses nls pam perl python readline spell ssl tcpd xml xml2 zlib"
diff --git a/profiles/default-linux/sparc/sparc64/server/package.mask b/profiles/default-linux/sparc/sparc64/server/package.mask
index c3a8ff2e8839..10aef849302e 100644
--- a/profiles/default-linux/sparc/sparc64/server/package.mask
+++ b/profiles/default-linux/sparc/sparc64/server/package.mask
@@ -1,12 +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/server/package.mask,v 1.1 2005/03/30 19:38:57 gustavoz Exp $
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# Mask alsa-lib and alsa-utils so people don't accidently emerge them on a
-# system with unsafe alsa drivers.
-media-sound/alsa-utils
-media-libs/alsa-lib
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/server/package.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# Something between 2.3.3.20040420 and 2.3.4.20040619 breaks blackdown-jdk
@@ -16,3 +10,60 @@ media-libs/alsa-lib
# gradm requires 64 bit support, which doesn't exist in this profile
>sys-apps/gradm-2.0.1-r1
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# New toys enabled by the dev/ profile and linux-headers-2.6
+gnome-base/gnome-volume-manager
+gnome-extra/hal-device-manager
+sys-apps/hal
+sys-apps/pmount
+
+# 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/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/jaaa
+media-sound/jamin
+media-sound/kaconnect
+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
+
+# Jason Wever <weeve@gentoo.org>
+# Masking versions of libffi that don't apply to this profile
+>=dev-libs/libffi-3.4.1
diff --git a/profiles/default-linux/sparc/sparc64/server/packages b/profiles/default-linux/sparc/sparc64/server/packages
index e6896877b87f..db845550c119 100644
--- a/profiles/default-linux/sparc/sparc64/server/packages
+++ b/profiles/default-linux/sparc/sparc64/server/packages
@@ -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/server/packages,v 1.1 2005/03/30 19:38:57 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/server/packages,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Since we're running a sparc64 kernel w/ 32bit (v9) userland,
# we need gcc-sparc64 for kernels.
@@ -11,6 +11,5 @@
*<sys-devel/gcc-3.4.1
# Use 2.4 linux-headers by default
--*virtual/os-headers
*<sys-kernel/linux-headers-2.5
diff --git a/profiles/default-linux/sparc/sparc64/server/parent b/profiles/default-linux/sparc/sparc64/server/parent
index bba98778b3b9..7db044cc4b90 100644
--- a/profiles/default-linux/sparc/sparc64/server/parent
+++ b/profiles/default-linux/sparc/sparc64/server/parent
@@ -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/server/parent,v 1.1 2005/03/30 19:38:57 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/server/parent,v 1.1.1.1 2005/11/30 09:48:38 chriswhite 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/sparc/sparc64/server/use.mask b/profiles/default-linux/sparc/sparc64/server/use.mask
index 0beb7eb2d558..ce7059412254 100644
--- a/profiles/default-linux/sparc/sparc64/server/use.mask
+++ b/profiles/default-linux/sparc/sparc64/server/use.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/server/use.mask,v 1.1 2005/03/30 19:38:57 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/server/use.mask,v 1.1.1.1 2005/11/30 09:48:38 chriswhite Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# Don't allow alsa in sparc64 because of broken snd-ioctl32
diff --git a/profiles/default-linux/sparc/sparc64/use.mask b/profiles/default-linux/sparc/sparc64/use.mask
index 21254d4c1b7c..385cd0215774 100644
--- a/profiles/default-linux/sparc/sparc64/use.mask
+++ b/profiles/default-linux/sparc/sparc64/use.mask
@@ -1,6 +1,3 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/use.mask,v 1.1 2004/11/22 22:25:03 eradicator Exp $
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# Don't allow alsa in sparc64 because of broken snd-ioctl32
-alsa
-ladcca
+-vis
+hdf5
+clisp
diff --git a/profiles/default-linux/sparc/use.mask b/profiles/default-linux/sparc/use.mask
index 77ff8787662a..1dbb4e79a1b2 100644
--- a/profiles/default-linux/sparc/use.mask
+++ b/profiles/default-linux/sparc/use.mask
@@ -1,42 +1,106 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# 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/use.mask,v 1.1 2004/03/19 21:58:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/use.mask,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
# This file contains a list of useflags that cannot be used on sparc.
3dfx
-3dnow
acpi
afs
-alsa
-altivec
apm
+cle266
+cmucl
directfb
+djbfft
+dvb
+emboss
+fdftk
+glitz
+hal
+i8x0
icc
icc-pgo
+ifc
informix
-firebird
lirc
-mmx
+lm_sensors
+mmxext
+mod
+mpm-peruser
oci8
+pbs
+pcmcia
pic
-sse
+real
svga
tcc
trusted
+uml
voodoo3
wavelan
-
+wifi
+xvmc
# And arch keyword flags that don't work
-
-x86
-ppc
alpha
-mips
-hppa
+amd64
arm
+hppa
+ia64
+mips
+ppc
+ppc64
+ppc-macos
+s390
+sparc
+x86
+x86-obsd
+x86-fbsd
+
+# Asterisk use flag masking
+bri
+florz
+resperl
+zaptel
+
+# Mono doesn't work on sparc
+# eradicator@gentoo.org
+mono
+
+# pyste has untested/unkeyworded deps on sparc
+pyste
+
+# They're borked <gustavoz>
+dar32
+dar64
+
+# Seti@home is gone <gustavoz>
+seti
+
+# 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
+db2
+dbmaker
+empress
+empress-bcs
+esoob
+filepro
+frontbase
+hyperwave-api
+ingres
+libedit
+oracle7
+pfpro
+solid
+sybase
+sybase-ct
+
+# Unmask ultra1
+-ultra1
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
+pike
diff --git a/profiles/default-linux/sparc/virtuals b/profiles/default-linux/sparc/virtuals
index e634759499a0..caf544705cfb 100644
--- a/profiles/default-linux/sparc/virtuals
+++ b/profiles/default-linux/sparc/virtuals
@@ -1,54 +1,11 @@
-virtual/lpr net-print/cups
-virtual/python dev-lang/python
-virtual/mta net-mail/ssmtp
-virtual/kernel sys-kernel/linux-headers
-virtual/linux-sources sys-kernel/sparc-sources
-virtual/glibc sys-libs/glibc
-virtual/x11 x11-base/xfree
-virtual/opengl x11-base/xfree
-virtual/glu x11-base/xfree
-virtual/glut media-libs/glut
-virtual/imapUW net-mail/uw-imap
-x11-libs/xaw x11-libs/Xaw3d
-virtual/jre dev-java/blackdown-jre
-virtual/jdk dev-java/blackdown-jdk
-virtual/imapd net-mail/courier-imap
-sys-apps/console-tools sys-apps/kbd
-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 net-mail/sylpheed
-virtual/php dev-php/mod_php
-virtual/textbrowser net-www/links
-virtual/mda net-mail/procmail
-virtual/krb5 app-crypt/heimdal
-virtual/bootloader sys-boot/silo
-virtual/editor app-editors/nano
-virtual/xft x11-base/xfree
-virtual/os-headers sys-kernel/linux-headers
-virtual/ghc dev-lang/ghc-bin
-virtual/modutils sys-apps/modutils
-virtual/inetd sys-apps/xinetd
-virtual/antivirus net-mail/clamav
-virtual/aspell-dict app-dicts/aspell-en
-virtual/skkserv app-i18n/skkserv
-virtual/snmp net-analyzer/net-snmp
-virtual/imap-c-client net-libs/c-client
-virtual/flim app-emacs/flim
-virtual/semi app-emacs/semi
-virtual/tetex app-text/tetex
-virtual/quicktime media-libs/libquicktime
-virtual/bittorrent net-p2p/bittorrent
-virtual/logger app-admin/sysklogd
+# 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/virtuals,v 1.1.1.1 2005/11/30 09:48:37 chriswhite Exp $
-virtual/ssh net-misc/openssh
-virtual/commonlisp dev-lisp/cmucl dev-lisp/sbcl
-virtual/tftp net-misc/tftp-hpa
-virtual/gzip app-arch/gzip
-virtual/ghostscript app-text/ghostscript
-
-virtual/w3m net-www/w3m
-virtual/mpg123 media-sound/mpg123
-virtual/dhcpc net-misc/dhcpcd
+virtual/linux-sources sys-kernel/sparc-sources
+virtual/bootloader sys-boot/silo
+virtual/mpi sys-cluster/lam-mpi
+virtual/modutils sys-apps/module-init-tools
+virtual/dev-manager sys-fs/devfsd
+virtual/ooo app-office/openoffice-ximian
+virtual/logger app-admin/syslog-ng
diff --git a/profiles/default-linux/use.defaults b/profiles/default-linux/use.defaults
index 18ed30787e74..62263e54c6b1 100644
--- a/profiles/default-linux/use.defaults
+++ b/profiles/default-linux/use.defaults
@@ -1,6 +1,6 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/use.defaults,v 1.1 2004/03/19 23:21:54 seemant Exp $
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/use.defaults,v 1.1.1.1 2005/11/30 09:48:34 chriswhite Exp $
# Use this to add linux specific architecture independent USE flags, to
# extend the base profile's USE mappings
diff --git a/profiles/default-linux/use.mask b/profiles/default-linux/use.mask
index 13fb0be8b0c1..0cc951fd66c2 100644
--- a/profiles/default-linux/use.mask
+++ b/profiles/default-linux/use.mask
@@ -1,12 +1,44 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/use.mask,v 1.1 2004/03/19 21:58:52 seemant Exp $
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/use.mask,v 1.1.1.1 2005/11/30 09:48:34 chriswhite Exp $
# This file masks out USE flags that are simply NOT allowed in the default
# profile for any architecture. This works, for example, if a non-default
# profile (such as the selinux profiles) have a USE flag associated with
# them.
-# Chris PeBenito <pebenito@gentoo.org>
-# must use a SELinux profile
-selinux
+uclibc
+
+# USE flags only valid on Mac OS X
+aqua
+coreaudio
+
+# amd64 only:
+emul-linux-x86
+
+# sparc only:
+ultra1
+
+# x86 only
+win32codecs
+kqemu
+
+# x86/amd64 only:
+mmx
+mmx2
+sse
+sse2
+3dnow
+3dnowext
+
+# ppc only:
+altivec
+ppcsha1
+pbbuttonsd
+
+# mips only:
+n32
+n64
+
+# Only used by mips and old amd64 profiles
+multilib
diff --git a/profiles/default-linux/virtuals b/profiles/default-linux/virtuals
index e1c59245aa36..56c6361e41e8 100644
--- a/profiles/default-linux/virtuals
+++ b/profiles/default-linux/virtuals
@@ -1,11 +1,10 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/virtuals,v 1.1 2004/03/19 21:58:52 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/virtuals,v 1.1.1.1 2005/11/30 09:48:34 chriswhite Exp $
# Use this virtuals file to either overload the base profile's defined
# virtuals, or add virtuals that are specific to this family of profiles
-virtual/dev-manager sys-fs/devfsd
-virtual/kernel sys-kernel/linux
+virtual/alsa sys-kernel/gentoo-sources
+virtual/linux-sources sys-kernel/gentoo-sources
virtual/os-headers sys-kernel/linux-headers
-virtual/modutils sys-apps/modutils
diff --git a/profiles/default-linux/x86/2004.0/deprecated b/profiles/default-linux/x86/2004.0/deprecated
index babd6b5be3fa..94ca3e6236ae 100644
--- a/profiles/default-linux/x86/2004.0/deprecated
+++ b/profiles/default-linux/x86/2004.0/deprecated
@@ -1,16 +1,19 @@
-default-linux/x86/2005.0
+default-linux/x86/2005.1
+# Gentoo has switched to 2.6 as the defaults for headers/kernels. If you wish
+# to use 2.4 headers/kernels, then you should do the following to upgrade:
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/x86/2005.0 make.profile
+# ln -s ../usr/portage/profiles/default-linux/x86/2005.1/2.4 make.profile
-# Gentoo has switched to 2.6 as the defaults for headers/kernels. If you wish
-# to use 2.4 headers/kernels, then you should do the following to upgrade:
+# If you wish to use the default 2.6 kernel, do the following:
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/x86/2005.0/2.4 make.profile
+# ln -s ../usr/portage/profiles/default-linux/x86/2005.1 make.profile
# More information can be found at the following URLs:
# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
# http://www.gentoo.org/doc/en/migration-to-2.6.xml
+
+# This profile will be deleted after November 30th, 2005.
diff --git a/profiles/default-linux/x86/2004.0/make.defaults b/profiles/default-linux/x86/2004.0/make.defaults
index e225e9e34ed9..08f467b7dd67 100644
--- a/profiles/default-linux/x86/2004.0/make.defaults
+++ b/profiles/default-linux/x86/2004.0/make.defaults
@@ -1,25 +1,7 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.0/make.defaults,v 1.1 2004/03/19 21:58:52 seemant Exp $
-
-# System-wide defaults for the gcc 3.2 Portage system (2004.0)
-
-
-#Experimental: trying to use these USE variables to build up from stage 2->3
-#thus eliminating the inherent fragility of using USE for this
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
-# Please avoid enabling things by default in here if possible. Understand any
-# implications with core packages. For example, if "java" is in USE and db
-# has a conditional dependency on java (which it does,) then a JDK will be
-# pulled in during *emerge system*!
-
-USE="x86 oss apm arts avi berkdb crypt cups encode foomaticdb gdbm gif gpm gtk gtk2 imlib
-jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis
-opengl pam pdflib png python qt quicktime readline sdl slang spell ssl
-svga tcpd truetype X xml2 xmms xv zlib"
-
-ARCH="x86"
-COMPILER="gcc3"
-ACCEPT_KEYWORDS="x86"
+USE="oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode font-server foomaticdb fortran gdbm gif gnome gpm gtk gtk2 imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib perl png python qt quicktime readline sdl slang spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
diff --git a/profiles/default-linux/x86/2004.0/packages b/profiles/default-linux/x86/2004.0/packages
index b7a106d3af0f..09acf13c83ed 100644
--- a/profiles/default-linux/x86/2004.0/packages
+++ b/profiles/default-linux/x86/2004.0/packages
@@ -1,6 +1,6 @@
-# Copyright 2001-2004 Gentoo Technologies, Inc.
+# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.0/packages,v 1.1 2004/03/19 21:58:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.0/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
@@ -19,7 +19,4 @@
>=sys-devel/gcc-3.2
>=sys-libs/glibc-2.2.5
->=x11-base/xfree-4.1.0-r12
-
>=app-admin/sysklogd-1.4.1
-<sys-apps/shadow-5
diff --git a/profiles/default-linux/x86/2004.0/parent b/profiles/default-linux/x86/2004.0/parent
index 7e1425523ba0..af468035a3cb 100644
--- a/profiles/default-linux/x86/2004.0/parent
+++ b/profiles/default-linux/x86/2004.0/parent
@@ -1,7 +1,7 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.0/parent,v 1.1 2004/03/19 21:58:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.0/parent,v 1.1.1.1 2005/11/30 09:48:39 chriswhite 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/x86/2004.2/deprecated b/profiles/default-linux/x86/2004.2/deprecated
index babd6b5be3fa..94ca3e6236ae 100644
--- a/profiles/default-linux/x86/2004.2/deprecated
+++ b/profiles/default-linux/x86/2004.2/deprecated
@@ -1,16 +1,19 @@
-default-linux/x86/2005.0
+default-linux/x86/2005.1
+# Gentoo has switched to 2.6 as the defaults for headers/kernels. If you wish
+# to use 2.4 headers/kernels, then you should do the following to upgrade:
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/x86/2005.0 make.profile
+# ln -s ../usr/portage/profiles/default-linux/x86/2005.1/2.4 make.profile
-# Gentoo has switched to 2.6 as the defaults for headers/kernels. If you wish
-# to use 2.4 headers/kernels, then you should do the following to upgrade:
+# If you wish to use the default 2.6 kernel, do the following:
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/x86/2005.0/2.4 make.profile
+# ln -s ../usr/portage/profiles/default-linux/x86/2005.1 make.profile
# More information can be found at the following URLs:
# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
# http://www.gentoo.org/doc/en/migration-to-2.6.xml
+
+# This profile will be deleted after November 30th, 2005.
diff --git a/profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults b/profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults
index 603a4433c1f6..918ce7248dac 100644
--- a/profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults
+++ b/profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults
@@ -1,19 +1,7 @@
-# Copyright 2002-2004 Gentoo Foundation.
-# System-wide defaults for the >=gcc 3.2 Portage system
-
-#Experimental: trying to use these USE variables to build up from stage 2->3
-#thus eliminating the inherent fragility of using USE for this
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults,v 1.1.1.1 2005/11/30 09:48:40 chriswhite Exp $
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
-# Please avoid enabling things by default in here if possible. Understand any
-# implications with core packages. For example, if "java" is in USE and db
-# has a conditional dependency on java (which it does,) then a JDK will be
-# pulled in during *emerge system*!
-
-USE="x86 oss apm arts avi berkdb crypt cups encode foomaticdb gdbm gif gpm imlib jpeg libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib"
-
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
+USE="oss apm arts avi berkdb crypt cups emboss encode foomaticdb gdbm gif gpm imlib jpeg libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib"
diff --git a/profiles/default-linux/x86/2004.2/gcc34/2.6/packages b/profiles/default-linux/x86/2004.2/gcc34/2.6/packages
index e0bb7f85c8c7..a80f50a656b8 100644
--- a/profiles/default-linux/x86/2004.2/gcc34/2.6/packages
+++ b/profiles/default-linux/x86/2004.2/gcc34/2.6/packages
@@ -1 +1,2 @@
>=sys-kernel/linux26-headers-2.6.6-r1
+>=sys-kernel/linux-headers-2.6.6-r1
diff --git a/profiles/default-linux/x86/2004.2/gcc34/2.6/parent b/profiles/default-linux/x86/2004.2/gcc34/2.6/parent
index 4091cdad663c..488ad4af5658 100644
--- a/profiles/default-linux/x86/2004.2/gcc34/2.6/parent
+++ b/profiles/default-linux/x86/2004.2/gcc34/2.6/parent
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/gcc34/2.6/parent,v 1.1 2004/08/16 23:07:05 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/gcc34/2.6/parent,v 1.1.1.1 2005/11/30 09:48:40 chriswhite 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/x86/2004.2/gcc34/2.6/virtuals b/profiles/default-linux/x86/2004.2/gcc34/2.6/virtuals
index afa193e3d736..f012f1cf9cb7 100644
--- a/profiles/default-linux/x86/2004.2/gcc34/2.6/virtuals
+++ b/profiles/default-linux/x86/2004.2/gcc34/2.6/virtuals
@@ -1,4 +1 @@
-virtual/kernel sys-kernel/linux26-headers
-virtual/os-headers sys-kernel/linux26-headers
-virtual/linux-sources sys-kernel/gentoo-dev-sources
-virtual/modutils sys-apps/module-init-tools
+virtual/linux-sources sys-kernel/gentoo-sources
diff --git a/profiles/default-linux/x86/2004.2/gcc34/make.defaults b/profiles/default-linux/x86/2004.2/gcc34/make.defaults
index c49a0dfac988..5d2737b395de 100644
--- a/profiles/default-linux/x86/2004.2/gcc34/make.defaults
+++ b/profiles/default-linux/x86/2004.2/gcc34/make.defaults
@@ -1,20 +1,7 @@
-# Copyright 2002-2004 Gentoo Foundation.
-# System-wide defaults for the >=gcc 3.2 Portage system
-
-#Experimental: trying to use these USE variables to build up from stage 2->3
-#thus eliminating the inherent fragility of using USE for this
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/gcc34/make.defaults,v 1.1.1.1 2005/11/30 09:48:40 chriswhite Exp $
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
-# Please avoid enabling things by default in here if possible. Understand any
-# implications with core packages. For example, if "java" is in USE and db
-# has a conditional dependency on java (which it does,) then a JDK will be
-# pulled in during *emerge system*!
-
-USE="x86 oss apm arts avi berkdb crypt cups encode foomaticdb gdbm gif gpm imlib jpeg libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib"
-
-ARCH="x86"
-COMPILER="gcc3"
-ACCEPT_KEYWORDS="x86"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
+USE="oss apm arts avi berkdb crypt cups emboss encode foomaticdb gdbm gif gpm imlib jpeg libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib"
diff --git a/profiles/default-linux/x86/2004.2/gcc34/packages b/profiles/default-linux/x86/2004.2/gcc34/packages
index c75e7f23b114..8ea11e5aa6e2 100644
--- a/profiles/default-linux/x86/2004.2/gcc34/packages
+++ b/profiles/default-linux/x86/2004.2/gcc34/packages
@@ -31,75 +31,12 @@
# prevents the user from shooting himself/herself in the foot by installing a
# wacky version.
-*>=sys-apps/baselayout-1.10.1
-*>=sys-apps/portage-2.0.50-r8
-*>=sys-devel/binutils-2.14.90.0.8-r1
-*>=sys-devel/gcc-3.3.3
-*>=sys-libs/glibc-2.3.4.20040605
-*virtual/modutils
-*virtual/os-headers
-*virtual/logger
-*dev-lang/python
+>=sys-apps/baselayout-1.9.4-r3
+>=sys-apps/portage-2.0.50-r8
+>=sys-devel/binutils-2.14.90.0.8-r1
+>=sys-devel/gcc-3.3.3
+>=sys-libs/glibc-2.3.4.20040605
-
-# sash - static shell for system recovery
-*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/coreutils
-*sys-apps/debianutils
-*sys-apps/diffutils
-*sys-fs/e2fsprogs
-*sys-apps/ed
-*sys-apps/fbset
-*sys-apps/file
-*sys-apps/findutils
-*sys-apps/slocate
-*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/shadow-5
-*sys-apps/pam-login
-*app-arch/sharutils
-*app-arch/tar
-*>=sys-apps/texinfo-4.6
-*sys-apps/util-linux
-*sys-apps/which
-*>=sys-devel/autoconf-2.59-r4
-*>=sys-devel/automake-1.8.5-r1
-*sys-devel/bc
-*sys-devel/bin86
-*sys-devel/bison
-*sys-devel/flex
-*>=sys-devel/libtool-1.5.2-r5
-*sys-devel/m4
-*sys-devel/make
-*sys-devel/patch
-*sys-libs/cracklib
-*sys-libs/db
-*>=sys-libs/ncurses-5.4-r2
-*>=sys-libs/pam-0.77-r1
-*sys-libs/pwdb
-*sys-libs/readline
-*sys-libs/zlib
-*virtual/ssh
-*virtual/dev-manager
-*>=sys-kernel/linux26-headers-2.6.6-r1
+>=sys-apps/texinfo-4.6
+>=sys-libs/ncurses-5.2.20020112a
+>=sys-libs/pam-0.77
diff --git a/profiles/default-linux/x86/2004.2/gcc34/parent b/profiles/default-linux/x86/2004.2/gcc34/parent
index 5376f80b42ba..8496be457062 100644
--- a/profiles/default-linux/x86/2004.2/gcc34/parent
+++ b/profiles/default-linux/x86/2004.2/gcc34/parent
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/gcc34/parent,v 1.1 2004/08/16 22:57:02 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/gcc34/parent,v 1.1.1.1 2005/11/30 09:48:40 chriswhite 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/x86/2004.2/make.defaults b/profiles/default-linux/x86/2004.2/make.defaults
index a24d883ab8d5..8535f42295a6 100644
--- a/profiles/default-linux/x86/2004.2/make.defaults
+++ b/profiles/default-linux/x86/2004.2/make.defaults
@@ -1,25 +1,7 @@
-# Copyright 2002 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/make.defaults,v 1.1 2004/07/13 19:26:17 beejay Exp $
-
-# System-wide defaults for the gcc 3.2 Portage system (2004.0)
-
-
-#Experimental: trying to use these USE variables to build up from stage 2->3
-#thus eliminating the inherent fragility of using USE for this
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/make.defaults,v 1.1.1.1 2005/11/30 09:48:40 chriswhite Exp $
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
-# Please avoid enabling things by default in here if possible. Understand any
-# implications with core packages. For example, if "java" is in USE and db
-# has a conditional dependency on java (which it does,) then a JDK will be
-# pulled in during *emerge system*!
-
-USE="x86 oss apm arts avi berkdb crypt cups encode foomaticdb gdbm gif gpm gtk gtk2 imlib
-jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis
-opengl pam pdflib png python qt quicktime readline sdl slang spell ssl
-svga tcpd truetype X xml2 xmms xv zlib"
-
-ARCH="x86"
-COMPILER="gcc3"
-ACCEPT_KEYWORDS="x86"
+USE="oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran font-server foomaticdb gdbm gif gnome gpm gtk gtk2 imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib perl png python qt quicktime readline sdl slang spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
diff --git a/profiles/default-linux/x86/2004.2/packages b/profiles/default-linux/x86/2004.2/packages
index 5ac012cb39e6..4e79822d9c82 100644
--- a/profiles/default-linux/x86/2004.2/packages
+++ b/profiles/default-linux/x86/2004.2/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/packages,v 1.1 2004/07/13 19:26:17 beejay Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/packages,v 1.1.1.1 2005/11/30 09:48:40 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
@@ -19,7 +19,4 @@
>=sys-devel/gcc-3.2
>=sys-libs/glibc-2.2.5
-virtual/x11
-
>=app-admin/sysklogd-1.4.1
-<sys-apps/shadow-5
diff --git a/profiles/default-linux/x86/2004.2/parent b/profiles/default-linux/x86/2004.2/parent
index 73cea26394de..4191b75114b4 100644
--- a/profiles/default-linux/x86/2004.2/parent
+++ b/profiles/default-linux/x86/2004.2/parent
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/parent,v 1.1 2004/07/13 19:26:17 beejay Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/parent,v 1.1.1.1 2005/11/30 09:48:39 chriswhite 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/x86/2004.3/deprecated b/profiles/default-linux/x86/2004.3/deprecated
index babd6b5be3fa..94ca3e6236ae 100644
--- a/profiles/default-linux/x86/2004.3/deprecated
+++ b/profiles/default-linux/x86/2004.3/deprecated
@@ -1,16 +1,19 @@
-default-linux/x86/2005.0
+default-linux/x86/2005.1
+# Gentoo has switched to 2.6 as the defaults for headers/kernels. If you wish
+# to use 2.4 headers/kernels, then you should do the following to upgrade:
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/x86/2005.0 make.profile
+# ln -s ../usr/portage/profiles/default-linux/x86/2005.1/2.4 make.profile
-# Gentoo has switched to 2.6 as the defaults for headers/kernels. If you wish
-# to use 2.4 headers/kernels, then you should do the following to upgrade:
+# If you wish to use the default 2.6 kernel, do the following:
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/x86/2005.0/2.4 make.profile
+# ln -s ../usr/portage/profiles/default-linux/x86/2005.1 make.profile
# More information can be found at the following URLs:
# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
# http://www.gentoo.org/doc/en/migration-to-2.6.xml
+
+# This profile will be deleted after November 30th, 2005.
diff --git a/profiles/default-linux/x86/2004.3/make.defaults b/profiles/default-linux/x86/2004.3/make.defaults
index af8ba26b60fd..50e910259f88 100644
--- a/profiles/default-linux/x86/2004.3/make.defaults
+++ b/profiles/default-linux/x86/2004.3/make.defaults
@@ -1,20 +1,7 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.3/make.defaults,v 1.1 2004/09/21 20:35:31 wolf31o2 Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.3/make.defaults,v 1.1.1.1 2005/11/30 09:48:40 chriswhite Exp $
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
-# Please avoid enabling things by default in here if possible. Understand any
-# implications with core packages. For example, if "java" is in USE and db
-# has a conditional dependency on java (which it does,) then a JDK will be
-# pulled in during *emerge system*!
-
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xprint xv zlib"
-
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"
-
-FEATURES="sandbox sfperms"
+USE="oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran font-server foomaticdb gdbm gif gnome gpm gtk gtk2 imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib perl png python qt quicktime readline sdl spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
diff --git a/profiles/default-linux/x86/2004.3/package.mask b/profiles/default-linux/x86/2004.3/package.mask
index 4fe71a354361..928d3e1b41da 100644
--- a/profiles/default-linux/x86/2004.3/package.mask
+++ b/profiles/default-linux/x86/2004.3/package.mask
@@ -1,2 +1,3 @@
# needs gcc-3.3.3
=dev-lang/gpc-20040516
+~dev-libs/libffi-3.3.3
diff --git a/profiles/default-linux/x86/2004.3/packages b/profiles/default-linux/x86/2004.3/packages
index c789eaa3ffd7..1b791e915d1b 100644
--- a/profiles/default-linux/x86/2004.3/packages
+++ b/profiles/default-linux/x86/2004.3/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.3/packages,v 1.1 2004/09/21 20:35:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.3/packages,v 1.1.1.1 2005/11/30 09:48:40 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
@@ -19,7 +19,4 @@
>=sys-devel/gcc-3.3.4-r1
>=sys-libs/glibc-2.3.3.20040420-r1
-virtual/x11
-
>=app-admin/sysklogd-1.4.1
-<sys-apps/shadow-5
diff --git a/profiles/default-linux/x86/2004.3/parent b/profiles/default-linux/x86/2004.3/parent
index 20c57d4cbe96..a81e0abedb60 100644
--- a/profiles/default-linux/x86/2004.3/parent
+++ b/profiles/default-linux/x86/2004.3/parent
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.3/parent,v 1.1 2004/09/21 20:35:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.3/parent,v 1.1.1.1 2005/11/30 09:48:40 chriswhite 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/x86/2005.0/2.4/deprecated b/profiles/default-linux/x86/2005.0/2.4/deprecated
index ffb277969741..09f3f4ee31b4 100644
--- a/profiles/default-linux/x86/2005.0/2.4/deprecated
+++ b/profiles/default-linux/x86/2005.0/2.4/deprecated
@@ -1,6 +1,10 @@
-default-linux/x86/2004.3
+default-linux/x86/no-nptl/2.4
+# This profile is now deprecated, as it is tied to a specific release. All 2.4
+# profiles under the default-linux tree for x86 are now going to be handled by
+# a single profile.
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/x86/2004.0 make.profile
-# This is an in-development, experimental profile. Do not use it.
+# ln -s ../usr/portage/profiles/default-linux/x86/no-nptl/2.4 make.profile
+
+# This profile will be deleted after December 31st, 2005.
diff --git a/profiles/default-linux/x86/2005.0/2.4/packages b/profiles/default-linux/x86/2005.0/2.4/packages
index 0bd02cb5eb32..a0812d569518 100644
--- a/profiles/default-linux/x86/2005.0/2.4/packages
+++ b/profiles/default-linux/x86/2005.0/2.4/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/2.4/packages,v 1.1 2004/12/03 14:36:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/2.4/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
@@ -11,17 +11,17 @@
# You can also add files to the base system itself if you prefix them with a
# *
-<ac-sources-2.5
-<ck-sources-2.5
-<gentoo-sources-2.5
-<grsec-sources-2.5
-<hardened-sources-2.5
-<openmosix-sources-2.5
-<rsbac-sources-2.5
-<uclinux-sources-2.5
-<usermode-sources-2.5
-<vanilla-sources-2.5
-<win4lin-sources-2.5
-<xbox-sources-2.5
+<sys-kernel/ac-sources-2.5
+<sys-kernel/ck-sources-2.5
+<sys-kernel/gentoo-sources-2.5
+<sys-kernel/grsec-sources-2.5
+<sys-kernel/hardened-sources-2.5
+<sys-kernel/openmosix-sources-2.5
+<sys-kernel/rsbac-sources-2.5
+<sys-kernel/uclinux-sources-2.5
+<sys-kernel/usermode-sources-2.5
+<sys-kernel/vanilla-sources-2.5
+<sys-kernel/win4lin-sources-2.5
+<sys-kernel/xbox-sources-2.5
-<linux-headers-2.5
+<sys-kernel/linux-headers-2.5
diff --git a/profiles/default-linux/x86/2005.0/2.4/parent b/profiles/default-linux/x86/2005.0/2.4/parent
index bd2dbf78e0ff..66be0fd2e8af 100644
--- a/profiles/default-linux/x86/2005.0/2.4/parent
+++ b/profiles/default-linux/x86/2005.0/2.4/parent
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/2.4/parent,v 1.1 2004/12/03 14:36:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/2.4/parent,v 1.1.1.1 2005/11/30 09:48:39 chriswhite 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/x86/2005.0/2.4/use.mask b/profiles/default-linux/x86/2005.0/2.4/use.mask
index ecf1b1df9af6..6be0256cafbb 100644
--- a/profiles/default-linux/x86/2005.0/2.4/use.mask
+++ b/profiles/default-linux/x86/2005.0/2.4/use.mask
@@ -1,5 +1,5 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/2.4/use.mask,v 1.1 2005/09/16 12:29:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/2.4/use.mask,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
nptl nptlonly
diff --git a/profiles/default-linux/x86/2005.0/2.4/virtuals b/profiles/default-linux/x86/2005.0/2.4/virtuals
index 5d48d3352993..29e48b0c1af3 100644
--- a/profiles/default-linux/x86/2005.0/2.4/virtuals
+++ b/profiles/default-linux/x86/2005.0/2.4/virtuals
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/2.4/virtuals,v 1.1 2004/12/03 14:36:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/2.4/virtuals,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# This file is used to either override or extend the parent profile's
# virtuals mappings. In this case, this is for ARCHITECTURE SPECIFIC
@@ -9,5 +9,4 @@
virtual/dev-manager sys-fs/devfsd
# These will be removed once the headers and sources are merged
-virtual/os-headers sys-kernel/linux-headers
virtual/linux-sources sys-kernel/gentoo-sources
diff --git a/profiles/default-linux/x86/2005.0/make.defaults b/profiles/default-linux/x86/2005.0/make.defaults
index cc364df9296e..da30e68edbde 100644
--- a/profiles/default-linux/x86/2005.0/make.defaults
+++ b/profiles/default-linux/x86/2005.0/make.defaults
@@ -1,20 +1,5 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/make.defaults,v 1.1 2004/12/03 14:37:17 wolf31o2 Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
-
-# Please avoid enabling things by default in here if possible. Understand any
-# implications with core packages. For example, if "java" is in USE and db
-# has a conditional dependency on java (which it does,) then a JDK will be
-# pulled in during *emerge system*!
-
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode fortran f77 foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl spell ssl svga tcpd truetype X xml2 xmms xv zlib"
-
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"
-
-FEATURES="sandbox sfperms"
+USE="alsa apm arts avi berkdb bitmap-fonts crypt cups eds emboss encode fortran foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls ogg oggvorbis opengl oss pam pdflib perl png python qt quicktime readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis X xml2 xmms xv zlib"
diff --git a/profiles/default-linux/x86/2005.0/packages b/profiles/default-linux/x86/2005.0/packages
index 71889c8d69dd..546c6459978e 100644
--- a/profiles/default-linux/x86/2005.0/packages
+++ b/profiles/default-linux/x86/2005.0/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/packages,v 1.1 2004/12/03 14:37:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
@@ -16,18 +16,3 @@
>=sys-devel/binutils-2.14.90.0.8-r1
>=sys-devel/gcc-3.3.4-r1
>=sys-libs/glibc-2.3.3.20040420-r1
-
->=ac-sources-2.5
->=ck-sources-2.5
->=gentoo-sources-2.5
->=grsec-sources-2.5
->=hardened-sources-2.5
->=openmosix-sources-2.5
->=rsbac-sources-2.5
->=uclinux-sources-2.5
->=usermode-sources-2.5
->=vanilla-sources-2.5
->=win4lin-sources-2.5
->=xbox-sources-2.5
-
->=linux-headers-2.5
diff --git a/profiles/default-linux/x86/2005.0/parent b/profiles/default-linux/x86/2005.0/parent
index 32e52e7dd93b..e3a5fdd0619f 100644
--- a/profiles/default-linux/x86/2005.0/parent
+++ b/profiles/default-linux/x86/2005.0/parent
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/parent,v 1.1 2004/12/03 14:37:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/parent,v 1.1.1.1 2005/11/30 09:48:39 chriswhite 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/x86/2005.1/2.4/deprecated b/profiles/default-linux/x86/2005.1/2.4/deprecated
index 4aaaa550170c..09f3f4ee31b4 100644
--- a/profiles/default-linux/x86/2005.1/2.4/deprecated
+++ b/profiles/default-linux/x86/2005.1/2.4/deprecated
@@ -1,11 +1,10 @@
-default-linux/x86/2005.0
+default-linux/x86/no-nptl/2.4
+# This profile is now deprecated, as it is tied to a specific release. All 2.4
+# profiles under the default-linux tree for x86 are now going to be handled by
+# a single profile.
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/x86/2005.0/2.4 make.profile
+# ln -s ../usr/portage/profiles/default-linux/x86/no-nptl/2.4 make.profile
-# *** WARNING ***
-# This is a development profile. This means that this profile is not stable or
-# suitable for general use. This profile *will* change and could possibly be
-# the cause of system breakage. You will *not* be supported if using this
-# profile!
+# This profile will be deleted after December 31st, 2005.
diff --git a/profiles/default-linux/x86/2005.1/2.4/packages b/profiles/default-linux/x86/2005.1/2.4/packages
index b3de91d77618..e1cda3bcf324 100644
--- a/profiles/default-linux/x86/2005.1/2.4/packages
+++ b/profiles/default-linux/x86/2005.1/2.4/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.1/2.4/packages,v 1.1 2005/06/03 14:08:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.1/2.4/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
diff --git a/profiles/default-linux/x86/2005.1/2.4/parent b/profiles/default-linux/x86/2005.1/2.4/parent
index 0313d911d830..f31c33c3ca45 100644
--- a/profiles/default-linux/x86/2005.1/2.4/parent
+++ b/profiles/default-linux/x86/2005.1/2.4/parent
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.1/2.4/parent,v 1.1 2005/06/03 14:08:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.1/2.4/parent,v 1.1.1.1 2005/11/30 09:48:39 chriswhite 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/x86/2005.1/2.4/use.mask b/profiles/default-linux/x86/2005.1/2.4/use.mask
index d352c8814e10..8b35410659b6 100644
--- a/profiles/default-linux/x86/2005.1/2.4/use.mask
+++ b/profiles/default-linux/x86/2005.1/2.4/use.mask
@@ -1,5 +1,5 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.1/2.4/use.mask,v 1.1 2005/09/16 12:30:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.1/2.4/use.mask,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
nptl nptlonly
diff --git a/profiles/default-linux/x86/2005.1/2.4/virtuals b/profiles/default-linux/x86/2005.1/2.4/virtuals
index e315cc16b3e0..801d1740c4e5 100644
--- a/profiles/default-linux/x86/2005.1/2.4/virtuals
+++ b/profiles/default-linux/x86/2005.1/2.4/virtuals
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.1/2.4/virtuals,v 1.1 2005/06/03 14:08:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.1/2.4/virtuals,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# This file is used to either override or extend the parent profile's
# virtuals mappings. In this case, this is for ARCHITECTURE SPECIFIC
diff --git a/profiles/default-linux/x86/2005.1/make.defaults b/profiles/default-linux/x86/2005.1/make.defaults
index 2db276efac0a..45d197baeb2c 100644
--- a/profiles/default-linux/x86/2005.1/make.defaults
+++ b/profiles/default-linux/x86/2005.1/make.defaults
@@ -1,5 +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/x86/2005.1/make.defaults,v 1.1 2005/06/03 14:09:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.1/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
-GRP_STAGE23_USE="bonobo esd gtkhtml mozilla ruby tcltk ldap dvd dvdr cdr socks5 fbcon"
+USE="alsa apm arts avi bitmap-fonts cups eds emboss encode fortran foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ogg oggvorbis opengl oss pdflib png qt quicktime sdl spell truetype truetype-fonts type1-fonts vorbis X xml2 xmms xv"
diff --git a/profiles/default-linux/x86/2005.1/packages b/profiles/default-linux/x86/2005.1/packages
index 646b31432cb4..80d2e3b51fd5 100644
--- a/profiles/default-linux/x86/2005.1/packages
+++ b/profiles/default-linux/x86/2005.1/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.1/packages,v 1.1 2005/06/03 14:09:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.1/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
@@ -11,8 +11,7 @@
# You can also add files to the base system itself if you prefix them with a
# *
->dev-lang/gpc-2.1
->=sys-apps/baselayout-1.9.4-r6
->=sys-devel/binutils-2.14.90.0.8-r1
+>=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/x86/2005.1/parent b/profiles/default-linux/x86/2005.1/parent
index b78491f4bff5..937e90f1111d 100644
--- a/profiles/default-linux/x86/2005.1/parent
+++ b/profiles/default-linux/x86/2005.1/parent
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.1/parent,v 1.1 2005/06/03 14:09:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.1/parent,v 1.1.1.1 2005/11/30 09:48:39 chriswhite 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/x86/dev/2006.0/make.defaults b/profiles/default-linux/x86/dev/2006.0/make.defaults
index 1d327c6352d3..86a8de04b39c 100644
--- a/profiles/default-linux/x86/dev/2006.0/make.defaults
+++ b/profiles/default-linux/x86/dev/2006.0/make.defaults
@@ -1,5 +1,9 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2006.0/make.defaults,v 1.1 2005/11/02 15:22:56 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2006.0/make.defaults,v 1.1.1.1 2005/11/30 09:48:40 chriswhite Exp $
+
+# This is currently commented so that the stage1 tarball can also be used to
+# build no-nptl systems.
+#STAGE1_USE="nptl"
USE="alsa apm arts avi bitmap-fonts cups eds emboss encode fortran foomaticdb gdbm gif gnome gpm gstreamer gtk gtk2 imlib jpeg kde libg++ libwww mad mikmod motif mp3 mpeg nptl ogg oggvorbis opengl oss pdflib png qt quicktime sdl spell truetype truetype-fonts type1-fonts vorbis X xml2 xmms xv"
diff --git a/profiles/default-linux/x86/dev/2006.0/packages b/profiles/default-linux/x86/dev/2006.0/packages
index 71ac6f27bd63..5b30cd0fd7f6 100644
--- a/profiles/default-linux/x86/dev/2006.0/packages
+++ b/profiles/default-linux/x86/dev/2006.0/packages
@@ -1,6 +1,6 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2006.0/packages,v 1.1 2005/11/02 15:22:56 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2006.0/packages,v 1.1.1.1 2005/11/30 09:48:40 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
diff --git a/profiles/default-linux/x86/dev/2006.0/parent b/profiles/default-linux/x86/dev/2006.0/parent
index 52fe944ed020..1cae2e09c834 100644
--- a/profiles/default-linux/x86/dev/2006.0/parent
+++ b/profiles/default-linux/x86/dev/2006.0/parent
@@ -1,7 +1,7 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2006.0/parent,v 1.1 2005/11/02 15:22:56 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/dev/2006.0/parent,v 1.1.1.1 2005/11/30 09:48:40 chriswhite 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/x86/gcc2/make.defaults b/profiles/default-linux/x86/gcc2/make.defaults
index 3b2a8bd93e04..21b6b51f60e0 100644
--- a/profiles/default-linux/x86/gcc2/make.defaults
+++ b/profiles/default-linux/x86/gcc2/make.defaults
@@ -1,13 +1,5 @@
-# Copyright 2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc2/make.defaults,v 1.1 2004/03/19 21:58:52 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc2/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
-# System-wide defaults for the Portage system (1.0)
-
-USE="x86 oss 3dnow apm arts avi berkdb crypt cups encode gdbm gif gpm gtk imlib
-java jpeg kde libg++ libwww mikmod mmx motif mpeg ncurses nls
-oggvorbis opengl pam pdflib png python qt quicktime readline sdl
-slang spell ssl svga tcpd truetype X xml2 xmms xv"
-
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"
+USE="oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran font-server gdbm gif gpm gtk imlib java jpeg kde libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv"
diff --git a/profiles/default-linux/x86/gcc2/package.mask b/profiles/default-linux/x86/gcc2/package.mask
index c01df2f2bf33..a0b77bec4342 100644
--- a/profiles/default-linux/x86/gcc2/package.mask
+++ b/profiles/default-linux/x86/gcc2/package.mask
@@ -1,10 +1,8 @@
-# Copyright 2001-2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /home/cvsroot/gentoo-x86/profiles/default/x86/2004.0/packages,v
-# 1.2 2004/03/18 00:16:43 seemant Exp $
-
-# This mask affects only THIS profile!
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc2/package.mask,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
+>=sys-kernel/linux-headers-2.5
sys-fs/ntfsprogs
media-video/cinelerra
diff --git a/profiles/default-linux/x86/gcc2/packages b/profiles/default-linux/x86/gcc2/packages
index 30284e281550..7d7420d5ccf7 100644
--- a/profiles/default-linux/x86/gcc2/packages
+++ b/profiles/default-linux/x86/gcc2/packages
@@ -1,7 +1,6 @@
-# Copyright 2001-2004 Gentoo Technologies, Inc.
+# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /home/cvsroot/gentoo-x86/profiles/default/x86/2004.0/packages,v
-# 1.2 2004/03/18 00:16:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc2/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
@@ -13,14 +12,12 @@
# *
-=sys-devel/gcc-2.95.3-r8
+~sys-devel/gcc-2.95.3
~sys-libs/glibc-2.2.5
# sash - static shell for system recovery
>=sys-apps/texinfo-4.2-r1
->=sys-devel/automake-1.6.1-r5
-<sys-libs/readline-4.2
#these ones have the new rc6 style init scripts
>=sys-libs/gpm-1.19.3-r5
@@ -28,26 +25,25 @@
#does not build with gcc-2.x
<media-video/transcode-0.6.12
-sys-fs/ntfsprogs
<app-arch/rar-3.2.0
<dev-util/ddd-3.3.6
>=sys-apps/xinetd-2.3.3-r6
>=net-fs/samba-2.2.2-r6
->=sys-apps/at-3.1.8-r6
+>=sys-process/at-3.1.8-r6
>=app-admin/fcron-1.1.1-r6
>=app-admin/metalog-0.6-r6
>=app-admin/mon-0.38.20-r6
>=app-admin/syslog-ng-1.4.12-r6
>=net-www/apache-1.3.20-r6
->=net-analyzer/ucd-snmp-4.1.2-r6
+>=net-analyzer/net-snmp-5.1.1
>=net-ftp/oftpd-0.3.6-r6
>=net-ftp/proftpd-1.2.4-r6
>=net-misc/dhcp-3.0_rc12-r6
>=net-misc/bind-9.1.3-r6
>=net-misc/netkit-timed-0.17-r6
>=net-misc/pdnsd-1.1.6-r6
->=net-mail/exim-3.32-r6
+>=mail-mta/exim-3.32-r6
>=net-misc/fakeidentd-1.4-r6
>=net-nds/openldap-1.2.12-r6
>=net-nds/portmap-5b-r6
@@ -58,29 +54,17 @@ sys-fs/ntfsprogs
>=net-print/cups-1.1.10-r6
>=sys-apps/apmd-3.0.1-r6
>=net-misc/portsentry-1.1-r6
->=sys-apps/noflushd-2.4-r6
+>=sys-block/noflushd-2.4-r6
>=app-text/dictd-1.5.5-r6
>=net-fs/samba-winbind-20010329-r6
>=net-www/wwwoffle-2.6d-r6
>=net-www/squid-2.4.2s-r6
>=net-dialup/ppp-2.4.1-r6
-=app-sci/octave-2.0*
-~media-video/cinelerra
-
-#GNUStep stuff works in gcc-3 only
-~dev-util/gnustep-back
-~dev-util/gnustep-base
-~dev-util/gnustep-gui
-~dev-util/gnustep-guile
-~dev-util/gnustep-make
+=sci-mathematics/octave-2.0*
# Needs gcc-3
-dev-libs/elfutils
-~sys-devel/prelink
<=app-arch/rpm-4.1
<=games-emulation/fceultra-0.90
-<=sys-apps/attr-2.4.1
# Needs >=readline-4.2
<media-sound/cdcd-0.6.4
-<net-nds/openldap-2.0.27
diff --git a/profiles/default-linux/x86/gcc2/packages.build b/profiles/default-linux/x86/gcc2/packages.build
index a698448c61e2..6f590cfce069 100644
--- a/profiles/default-linux/x86/gcc2/packages.build
+++ b/profiles/default-linux/x86/gcc2/packages.build
@@ -1,7 +1,3 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc2/packages.build,v 1.1 2004/03/19 21:58:52 seemant Exp $
-
-# This file inherits from the parent profiles as well. The packages listed
-# in this file enumerate those which are needed to build a stage 1 based on
-# this profile.
+sys-devel/autoconf
+sys-devel/automake
+sys-devel/libtool
diff --git a/profiles/default-linux/x86/gcc2/parent b/profiles/default-linux/x86/gcc2/parent
index a5abdd90876b..f52e0519141d 100644
--- a/profiles/default-linux/x86/gcc2/parent
+++ b/profiles/default-linux/x86/gcc2/parent
@@ -1,8 +1,8 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc2/parent,v 1.1 2004/03/19 21:58:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc2/parent,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# This file describes the parent profile to this. In most cases this will
# just be the name of the parent directory
-default
+..
diff --git a/profiles/default-linux/x86/gcc31/deprecated b/profiles/default-linux/x86/gcc31/deprecated
index babd6b5be3fa..94ca3e6236ae 100644
--- a/profiles/default-linux/x86/gcc31/deprecated
+++ b/profiles/default-linux/x86/gcc31/deprecated
@@ -1,16 +1,19 @@
-default-linux/x86/2005.0
+default-linux/x86/2005.1
+# Gentoo has switched to 2.6 as the defaults for headers/kernels. If you wish
+# to use 2.4 headers/kernels, then you should do the following to upgrade:
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/x86/2005.0 make.profile
+# ln -s ../usr/portage/profiles/default-linux/x86/2005.1/2.4 make.profile
-# Gentoo has switched to 2.6 as the defaults for headers/kernels. If you wish
-# to use 2.4 headers/kernels, then you should do the following to upgrade:
+# If you wish to use the default 2.6 kernel, do the following:
# emerge -n '>=sys-apps/portage-2.0.51'
# cd /etc/
# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/x86/2005.0/2.4 make.profile
+# ln -s ../usr/portage/profiles/default-linux/x86/2005.1 make.profile
# More information can be found at the following URLs:
# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
# http://www.gentoo.org/doc/en/migration-to-2.6.xml
+
+# This profile will be deleted after November 30th, 2005.
diff --git a/profiles/default-linux/x86/gcc31/make.defaults b/profiles/default-linux/x86/gcc31/make.defaults
index d04987640bf4..2757e93a8f10 100644
--- a/profiles/default-linux/x86/gcc31/make.defaults
+++ b/profiles/default-linux/x86/gcc31/make.defaults
@@ -1,18 +1,5 @@
-# Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header:
-# /home/cvsroot/gentoo-x86/profiles/default/x86/2004.0/make.defaults,v 1.3
-# 2004/03/18 00:16:43 seemant Exp $
-
-# System-wide defaults for the gcc 3 Portage system (1.0)
-
-
-USE="x86 oss 3dnow apm arts avi berkdb crypt cups encode gdbm gif gpm gtk imlib
-java jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis
-opengl pam pdflib png python qt quicktime readline sdl slang spell ssl
-svga tcpd truetype X xml2 xmms xv zlib"
-
-ARCH="x86"
-COMPILER="gcc3"
-ACCEPT_KEYWORDS="x86"
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc31/make.defaults,v 1.1.1.1 2005/11/30 09:48:40 chriswhite Exp $
+USE="oss apm arts avi berkdb bitmap=fonts crypt cups emboss encode fortran gdbm gif gpm gtk imlib java jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib"
diff --git a/profiles/default-linux/x86/gcc31/packages b/profiles/default-linux/x86/gcc31/packages
index fdeea5fb86ed..3f88e2b97fc8 100644
--- a/profiles/default-linux/x86/gcc31/packages
+++ b/profiles/default-linux/x86/gcc31/packages
@@ -1,7 +1,6 @@
-# Copyright 2001-2004 Gentoo Technologies, Inc.
+# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /home/cvsroot/gentoo-x86/profiles/default/x86/2004.0/packages,v
-# 1.2 2004/03/18 00:16:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc31/packages,v 1.1.1.1 2005/11/30 09:48:40 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
@@ -21,7 +20,7 @@
!dev-lang/gpc
-*sys-libs/gdbm
+*sys-libs/gdbm
~sys-devel/binutils-2.12.90.0.7
<sys-devel/gcc-3.2_pre
@@ -29,27 +28,26 @@
<sys-libs/db-3.2.10
>=sys-libs/pam-0.75-r9
->=sys-devel/automake-1.6.1-r5
>=sys-libs/gpm-1.19.3-r5
>=sys-apps/isapnptools-1.23-r6
->=sys-apps/dcron-2.7-r6
+>=sys-process/dcron-2.7-r6
>=sys-apps/xinetd-2.3.3-r6
>=net-fs/samba-2.2.2-r6
->=sys-apps/at-3.1.8-r6
+>=sys-process/at-3.1.8-r6
>=app-admin/fcron-1.1.1-r6
>=app-admin/metalog-0.6-r6
>=app-admin/mon-0.38.20-r6
>=app-admin/syslog-ng-1.4.12-r6
>=net-www/apache-1.3.20-r6
->=net-analyzer/ucd-snmp-4.1.2-r6
+>=net-analyzer/net-snmp-5.1.1
>=net-ftp/oftpd-0.3.6-r6
>=net-ftp/proftpd-1.2.4-r6
>=net-misc/dhcp-3.0_rc12-r6
>=net-misc/bind-9.1.3-r6
>=net-misc/netkit-timed-0.17-r6
>=net-misc/pdnsd-1.1.6-r6
->=net-mail/exim-3.32-r6
+>=mail-mta/exim-3.32-r6
>=net-misc/fakeidentd-1.4-r6
>=net-nds/openldap-1.2.12-r6
>=net-nds/portmap-5b-r6
@@ -64,9 +62,9 @@
<net-misc/ntp-4.1.71-r6
>=sys-apps/apmd-3.0.1-r6
-#>=net-mail/postfix-20010228.5-r6
+#>=mail-mta/postfix-20010228.5-r6
>=net-misc/portsentry-1.1-r6
->=sys-apps/noflushd-2.4-r6
+>=sys-block/noflushd-2.4-r6
>=app-text/dictd-1.5.5-r6
>=net-fs/samba-winbind-20010329-r6
>=net-www/wwwoffle-2.6d-r6
@@ -76,4 +74,4 @@
# ickle 0.2.2 breaks with gcc3. lost history, permissions and dates.
>=net-im/ickle-0.3.0
->=app-sci/octave-2.1
+>=sci-mathematics/octave-2.1
diff --git a/profiles/default-linux/x86/gcc31/parent b/profiles/default-linux/x86/gcc31/parent
index 16b20d012215..89414d38bc5e 100644
--- a/profiles/default-linux/x86/gcc31/parent
+++ b/profiles/default-linux/x86/gcc31/parent
@@ -1,8 +1,8 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc31/parent,v 1.1 2004/03/19 21:58:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc31/parent,v 1.1.1.1 2005/11/30 09:48:40 chriswhite Exp $
# This file describes the parent profile to this. In most cases this will
# just be the name of the parent directory
-default
+..
diff --git a/profiles/default-linux/x86/make.defaults b/profiles/default-linux/x86/make.defaults
index 5a85b0db4a9b..e4e3e59d6d06 100644
--- a/profiles/default-linux/x86/make.defaults
+++ b/profiles/default-linux/x86/make.defaults
@@ -1,66 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/make.defaults,v 1.1 2004/12/22 02:37:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
-GRP_STAGE23_USE="
-acl
-berkdb
-gpm
-ipv6
-ncurses
-nls
-pam
-perl
-python
-readline
-ssl
-tcpd
-"
-
-# Please avoid enabling things by default in here if possible. Understand
-# any implications with core packages. For example, if "java" is in USE and
-# db has a conditional dependency on java (which it does,) then a JDK will be
-# pulled in during *emerge system*!
-
-USE="${GRP_STAGE23_USE}
-apm
-arts
-avi
-berkdb
-crypt
-cups
-encode
-foomaticdb
-fortran
-gdbm
-gif
-gnome gtk gtk2
-gpm
-jpeg
-kde qt
-libwww
-mad
-mikmod
-motif
-mpeg
-oggvorbis
-opengl
-pdflib
-png
-quicktime
-oss
-sdl
-spell
-svga
-truetype
-X
-xml2
-xmms
-xv
-zlib
-"
+# All extra USE/etc should be specified in sub-profiles.
+# DO NOT POLLUTE USE ON THIS PROFILE.
ARCH="x86"
ACCEPT_KEYWORDS="x86"
+CHOST="i686-pc-linux-gnu"
+CFLAGS="-O2 -mcpu=i686 -pipe"
+CXXFLAGS="${CFLAGS}"
+
FEATURES="sandbox sfperms"
+
+USE="berkdb crypt ipv6 ncurses nls pam perl python readline ssl tcpd zlib"
diff --git a/profiles/default-linux/x86/packages b/profiles/default-linux/x86/packages
index a23e2fe56fcb..1c40f48a2f74 100644
--- a/profiles/default-linux/x86/packages
+++ b/profiles/default-linux/x86/packages
@@ -1,7 +1,6 @@
-# Copyright 2001-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /home/cvsroot/gentoo-x86/profiles/default/x86/2004.0/packages,v
-# 1.2 2004/03/18 00:16:43 seemant Exp $
+# Copyright 2001-2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# For instructions on how this file works (as an inclusion mask, primarily),
# please refer to ${PORTDIR}/profiles/base/packages
@@ -12,11 +11,4 @@
# You can also add files to the base system itself if you prefix them with a
# *
-
-*sys-devel/bin86
-*sys-libs/pwdb
-
>=sys-devel/binutils-2.13.90.0.4
->=sys-devel/libtool-1.4.1-r4
-<sys-apps/shadow-5
->=x11-base/xfree-4.1.0-r2
diff --git a/profiles/default-linux/x86/parent b/profiles/default-linux/x86/parent
index d5f6b3b3c012..486faf9312c7 100644
--- a/profiles/default-linux/x86/parent
+++ b/profiles/default-linux/x86/parent
@@ -1,8 +1,7 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/parent,v 1.1.1.1 2005/11/30 09:48:39 chriswhite 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/x86/use.mask b/profiles/default-linux/x86/use.mask
index 146636b57e2c..ed3e6b7cb548 100644
--- a/profiles/default-linux/x86/use.mask
+++ b/profiles/default-linux/x86/use.mask
@@ -1,9 +1,24 @@
-# Copyright 2004 Gentoo Technologies, Inc.
+# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/use.mask,v 1.1 2004/03/19 21:58:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/use.mask,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# This file masks out USE flags that are simply NOT allowed in the default
-# profile for any architecture. This works, for example, if a non-default
-# profile (such as the selinux profiles) have a USE flag associated with
-# them.
+# x86 profile. This works, for example, if another architecture's
+# profile have a USE flag associated with (such as altivec, mmx, etc).
+# Unmask x86 instruction sets
+-mmx
+-mmx2
+-mmxext
+-sse
+-sse2
+-3dnow
+-3dnowext
+-win32codecs
+-kqemu
+
+# Unmask nvidia XvMC support
+-nvidia
+
+# Unmask dev-db/oracle-instantclient-basic support
+-oci8-instant-client
diff --git a/profiles/default-linux/x86/virtuals b/profiles/default-linux/x86/virtuals
index e5d7b865b0b0..6ab1877de39e 100644
--- a/profiles/default-linux/x86/virtuals
+++ b/profiles/default-linux/x86/virtuals
@@ -1,10 +1,9 @@
-# Copyright 2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/virtuals,v 1.1 2004/03/19 21:58:52 seemant Exp $
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/virtuals,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# This file is used to either override or extend the parent profile's
# virtuals mappings. In this case, this is for ARCHITECTURE SPECIFIC
# mappings
-virtual/bootloader sys-boot/grub
-virtual/linux-sources sys-kernel/gentoo-sources
+virtual/bootloader sys-boot/grub
diff --git a/profiles/default-linux/x86/xbox/make.defaults b/profiles/default-linux/x86/xbox/make.defaults
index b07ccabea783..9e5ca6afc6db 100644
--- a/profiles/default-linux/x86/xbox/make.defaults
+++ b/profiles/default-linux/x86/xbox/make.defaults
@@ -1,21 +1,9 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/make.defaults,v 1.1 2004/10/25 12:46:49 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/make.defaults,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
-# Please avoid enabling things by default in here if possible. Understand any
-# implications with core packages. For example, if "java" is in USE and db
-# has a conditional dependency on java (which it does,) then a JDK will be
-# pulled in during *emerge system*!
+USE="oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran font-server foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode f77 foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xprint xv zlib"
-
-ARCH="x86"
PROFILE_ARCH="xbox"
-ACCEPT_KEYWORDS="x86"
-
-FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/x86/xbox/packages b/profiles/default-linux/x86/xbox/packages
index ee8f245e1871..7c522096b6dc 100644
--- a/profiles/default-linux/x86/xbox/packages
+++ b/profiles/default-linux/x86/xbox/packages
@@ -1,8 +1,9 @@
# Copyright 2001-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/packages,v 1.1 2004/10/25 12:46:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/packages,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
# version specific stuff for xbox support
>=app-misc/lirc-0.7.0_pre6
->=x11-base/xfree-4.3.0-r6
+>=x11-base/xorg-x11-4.3.0-r6
>=media-sound/alsa-driver-1.0.5a
+>=x11-base/xorg-6.8.0-r2
diff --git a/profiles/default-linux/x86/xbox/parent b/profiles/default-linux/x86/xbox/parent
index 74853ef4eaaf..0a7b7b4fc2fc 100644
--- a/profiles/default-linux/x86/xbox/parent
+++ b/profiles/default-linux/x86/xbox/parent
@@ -1,7 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/parent,v 1.1.1.1 2005/11/30 09:48:39 chriswhite 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/x86/xbox/virtuals b/profiles/default-linux/x86/xbox/virtuals
index 440b1fd539a6..a170fe70a5a4 100644
--- a/profiles/default-linux/x86/xbox/virtuals
+++ b/profiles/default-linux/x86/xbox/virtuals
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/virtuals,v 1.1 2004/10/25 12:46:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/virtuals,v 1.1.1.1 2005/11/30 09:48:39 chriswhite Exp $
virtual/linux-sources sys-kernel/xbox-sources
virtual/bootloader sys-boot/cromwell