Cleaned up version.

3 files changed, 109 insertions, 269 deletions

diff --git a/profiles/default-linux/ppc/1.2/packages b/profiles/default-linux/ppc/1.2/packages
index 9ab6c4430546..fa1e7848234f 100644
--- a/profiles/default-linux/ppc/1.2/packages
+++ b/profiles/default-linux/ppc/1.2/packages
@@ -1,106 +1,37 @@
-# IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
-
-# 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
-#
+# PPC 1.2 PROFILE - Pieter Van den Abeele <pvdabeel@gentoo.org>
+# ---------------
 
 # 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
 
+# gcc-2.95 specific profile, updating binutils, gcc or glibc is not possible
+
 *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
+*=sys-libs/glibc-2.2.5
 
-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-arch/bzip2
+*app-arch/cpio
+*app-arch/gzip
+*app-arch/sharutils
+*app-arch/tar
+*app-editors/vim 
+*app-shells/bash
 *app-shells/sash
 *dev-lang/perl
+*dev-lang/python
 *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
@@ -110,31 +41,28 @@ net-misc/rsync
 *sys-apps/gawk
 *sys-apps/grep
 *sys-apps/groff
-*app-arch/gzip
 *sys-apps/hdparm
+*sys-apps/kbd
 *sys-apps/less
+*sys-apps/mac-fdisk
 *sys-apps/man
 *sys-apps/man-pages
 *sys-apps/modutils
 *sys-apps/net-tools
-*sys-apps/xinetd
+*sys-apps/pam-login
 *sys-apps/procps
 *sys-apps/psmisc
 *sys-apps/raidtools
-*sys-fs/reiserfsprogs
 *sys-apps/sed
 *sys-apps/setserial
+*sys-apps/texinfo
 *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-apps/xinetd
 *sys-devel/autoconf
-*>=sys-devel/automake-1.6.1-r5
+*sys-devel/automake
 *sys-devel/bc
 *sys-devel/bison
 *sys-devel/flex
@@ -143,96 +71,20 @@ net-misc/rsync
 *sys-devel/m4
 *sys-devel/make
 *sys-devel/patch
+*sys-fs/devfsd
+*sys-fs/e2fsprogs
+*sys-fs/hfsutils
+*sys-fs/reiserfsprogs
 *sys-libs/cracklib  
-*<sys-libs/db-3.2.10
+*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/bootloader
+*virtual/editor
 *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
-
+net-misc/netkit-telnetd
+net-misc/rsync
diff --git a/profiles/default-linux/ppc/1.2/use.defaults b/profiles/default-linux/ppc/1.2/use.defaults
index 482a5d1b679d..934d88fe6756 100644
--- a/profiles/default-linux/ppc/1.2/use.defaults
+++ b/profiles/default-linux/ppc/1.2/use.defaults
@@ -1,57 +1,46 @@
-#gif
-#mmx
-#3dnow
-#odbc
-#fbcon		
-#oss
-#libg++
-#objprelink
-#nls
-#mitshm
-#sse
-xinerama
-gnome-libs	gnome-base/gnome-libs
-directfb	dev-libs/DirectFB
-ungif		media-libs/ungif
-gtkhtml		gnome-extra/gtkhtml
+X		x11-base/xfree
+aalib		media-libs/aalib	
 alsa		media-libs/alsa-lib
-gdbm		sys-libs/gdbm
-berkdb		sys-libs/db
-slang		sys-libs/slang
-readline	sys-libs/readline
 arts		kde-base/kdelibs
-tetex		app-text/tetex
-aalib		media-libs/aalib	
-nas		media-libs/nas
+berkdb		sys-libs/db
 bonobo		gnome-base/bonobo
-svga		media-libs/svgalib
+cdr		app-cdr/cdrtools
+directfb	dev-libs/DirectFB
+esd		media-sound/esound
+gdbm		sys-libs/gdbm
 ggi		media-libs/libggi
-tcltk		dev-lang/tcl dev-lang/tk
-java		virtual/jre
+gnome		gnome-base/gnome
+gnome-libs	gnome-base/gnome-libs
+gpm		sys-libs/gpm
+gtk		x11-libs/gtk+
+gtkhtml		gnome-extra/gtkhtml
 guile		dev-util/guile
-ruby		dev-lang/ruby
+imlib		media-libs/imlib
+java		virtual/jre
+kde		kde-base/kde
+ldap		net-nds/openldap
+libwww		net-libs/libwww
+motif		x11-libs/openmotif
+mozilla		net-www/mozilla
 mysql		dev-db/mysql
-postgres	dev-db/postgresql
-X		x11-base/xfree
-sdl		media-libs/libsdl
-gpm		sys-libs/gpm
-tcpd		sys-apps/tcp-wrappers
+nas		media-libs/nas
+oggvorbis	media-libs/libvorbis
+opengl		virtual/opengl
 pam		sys-libs/pam
-libwww		net-libs/libwww
-ssl		dev-libs/openssl
 perl		dev-lang/perl
+postgres	dev-db/postgresql
 python		dev-lang/python
-esd		media-sound/esound
-imlib		media-libs/imlib
-oggvorbis	media-libs/libvorbis
-gnome		gnome-base/gnome
-gtk		x11-libs/gtk+
 qt		x11-libs/qt
-kde		kde-base/kde
-motif		x11-libs/openmotif
-opengl		virtual/opengl
-mozilla		net-www/mozilla
-ldap		net-nds/openldap
-snmp		net-analyzer/ucd-snmp
-cdr		app-cdr/cdrtools
+readline	sys-libs/readline
+ruby		dev-lang/ruby
 scanner		media-gfx/sane-backends
+sdl		media-libs/libsdl
+slang		sys-libs/slang
+snmp		net-analyzer/ucd-snmp
+ssl		dev-libs/openssl
+svga		media-libs/svgalib
+tcltk		dev-lang/tcl dev-lang/tk
+tcpd		sys-apps/tcp-wrappers
+tetex		app-text/tetex
+ungif		media-libs/ungif
+xinerama
diff --git a/profiles/default-linux/ppc/1.2/virtuals b/profiles/default-linux/ppc/1.2/virtuals
index 4bb1f6d5ee59..08a3e1941de4 100644
--- a/profiles/default-linux/ppc/1.2/virtuals
+++ b/profiles/default-linux/ppc/1.2/virtuals
@@ -1,50 +1,49 @@
-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
+sys-apps/console-tools  	sys-apps/kbd
+sys-apps/reiserfs-utils 	sys-fs/reiserfsprogs
+virtual/alsa			media-sound/alsa-driver    
+virtual/aspell-dict		app-dicts/aspell-en
+virtual/bittorrent		net-p2p/bittorrent
+virtual/blackbox		x11-wm/blackbox
 virtual/bootloader		sys-boot/yaboot
+virtual/cron			sys-apps/dcron
+virtual/dhcpc			net-misc/dhcpcd
 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/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/mpg123			media-sound/mpg123
+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/w3m			net-www/w3m
-virtual/mpg123		media-sound/mpg123
-virtual/dhcpc		net-misc/dhcpcd
+virtual/x11			x11-base/xfree
+virtual/xft			x11-base/xfree
+x11-libs/xaw			x11-libs/Xaw3d