cleanup

6 files changed, 53 insertions, 101 deletions

diff --git a/profiles/default-ppc-2004.1/make.defaults b/profiles/default-ppc-2004.1/make.defaults
index eef49c456ab3..ed8bdd1c20cd 100644
--- a/profiles/default-ppc-2004.1/make.defaults
+++ b/profiles/default-ppc-2004.1/make.defaults
@@ -1,31 +1,12 @@
-# Copyright 2000 Daniel Robbins, Gentoo Foundation.
-# System-wide defaults for the Portage system
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+# Copyright 2004 Pieter Van den Abeele, Gentoo Foundation.
+# Gentoo Linux PowerPC system defaults
 
+ACCEPT_KEYWORDS="ppc"
 ARCH="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 -fno-strict-aliasing"
-# C++ Compiler flags
+CFLAGS="-O2 -pipe"
+CHOST="powerpc-unknown-linux-gnu"
 CXXFLAGS=${CFLAGS}
-
-USE="bitmap-fonts xprint 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
-
-ACCEPT_KEYWORDS="ppc"
+FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
+MAKEOPTS="-j2"
+PLATFORM=$CHOST
+USE="dvd jpeg nls gif png truetype ppc"
diff --git a/profiles/default-ppc-2004.1/packages b/profiles/default-ppc-2004.1/packages
index 0b5cb9b3d7c0..a1676d207479 100644
--- a/profiles/default-ppc-2004.1/packages
+++ b/profiles/default-ppc-2004.1/packages
@@ -1,19 +1,6 @@
-### GENTOO/PPC 2004.0 PROFILE ###
+### GENTOO/PPC 2004.2 PROFILE ###
 
-# 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-libs/glibc-2.3.2
-
-# Without version constraints, but still required
+# Defines what is in emerge system
 
 *app-arch/bzip2
 *app-arch/cpio
@@ -23,13 +10,12 @@
 *app-arch/tar
 *app-shells/bash
 *dev-lang/perl
-*dev-libs/popt
-*dev-perl/ExtUtils-MakeMaker
-*net-ftp/ftp
+*dev-lang/python
 *net-misc/dhcpcd
 *net-misc/iputils
 *net-misc/rsync
 *net-misc/wget
+*sys-apps/baselayout
 *sys-apps/coreutils
 *sys-apps/debianutils
 *sys-apps/diffutils
@@ -48,6 +34,7 @@
 *sys-apps/man-pages
 *sys-apps/net-tools
 *sys-apps/pam-login
+*sys-apps/portage
 *sys-apps/procps
 *sys-apps/psmisc
 *sys-apps/sed
@@ -56,12 +43,13 @@
 *sys-apps/texinfo
 *sys-apps/util-linux
 *sys-apps/which
-*sys-apps/xinetd
 *sys-devel/autoconf
 *sys-devel/automake
 *sys-devel/bc
+*sys-devel/binutils
 *sys-devel/bison
 *sys-devel/flex
+*sys-devel/gcc
 *sys-devel/gettext
 *sys-devel/libtool
 *sys-devel/m4
@@ -69,9 +57,12 @@
 *sys-devel/patch
 *sys-fs/e2fsprogs
 *sys-fs/hfsutils
+*sys-fs/hfsplusutils
+*sys-fs/lvm2
 *sys-libs/cracklib  
 *sys-libs/db
 *sys-libs/gdbm  
+*sys-libs/glibc
 *sys-libs/ncurses     
 *sys-libs/pam
 *sys-libs/pwdb      
diff --git a/profiles/default-ppc-2004.1/packages.build b/profiles/default-ppc-2004.1/packages.build
index a68cc6c6fa07..f6444c7ef8bf 100644
--- a/profiles/default-ppc-2004.1/packages.build
+++ b/profiles/default-ppc-2004.1/packages.build
@@ -6,7 +6,7 @@ app-arch/bzip2
 sys-apps/debianutils
 sys-apps/diffutils
 sys-apps/file
-sys-apps/fileutils
+sys-apps/coreutils
 sys-apps/findutils
 sys-apps/gawk
 sys-apps/grep
@@ -15,7 +15,6 @@ sys-apps/portage
 sys-apps/sed
 sys-apps/sh-utils
 app-arch/tar
-sys-apps/textutils
 sys-devel/binutils
 sys-devel/bison
 sys-devel/flex
diff --git a/profiles/default-ppc-2004.1/use.defaults b/profiles/default-ppc-2004.1/use.defaults
index e35dde7323ca..fd5dcbda48df 100644
--- a/profiles/default-ppc-2004.1/use.defaults
+++ b/profiles/default-ppc-2004.1/use.defaults
@@ -42,5 +42,3 @@ tcltk		dev-lang/tcl dev-lang/tk
 tcpd		sys-apps/tcp-wrappers
 tetex		app-text/tetex
 ungif		media-libs/ungif
-
-
diff --git a/profiles/default-ppc-2004.1/use.mask b/profiles/default-ppc-2004.1/use.mask
index f0b44aa93277..d4ec46f0c450 100644
--- a/profiles/default-ppc-2004.1/use.mask
+++ b/profiles/default-ppc-2004.1/use.mask
@@ -1,50 +1,35 @@
-# This is a list of USE flags that should not be used on PPC
-
+3dfx
 3dnow
 3dnowex
 acpi
+adabas
 afs
 avi
+birdstep
+db2
+dbmaker
+esoob
+fdftk
+filepro
+firebird
+fmod
 hdf
+hyperwave
 icc
 icc-pgo
 ifc
+informix
+ingres
 mmx
 mmx2
+pfpro
 selinux
+solid
 sse
 sse2
 svga
+sybase
+sybase-ct
 tcc
-x86 
 uclibc
-firebird
-fmod
 uml
-fdftk
-
-
-# media-libs/glide-v3 requires some extra work on ppc
-3dfx
-
-#mask until sys-cluster/lam-mpi is tested on ppc
-mpi
-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
-db2
-dbmaker
-esoob
-filepro
-hyperwave
-informix
-ingres
-pfpro
-solid
-sybase
-sybase-ct
diff --git a/profiles/default-ppc-2004.1/virtuals b/profiles/default-ppc-2004.1/virtuals
index 17125ff94fca..7ad8963795d9 100644
--- a/profiles/default-ppc-2004.1/virtuals
+++ b/profiles/default-ppc-2004.1/virtuals
@@ -1,65 +1,63 @@
-virtual/w3m             www-client/w3m
-sys-apps/reiserfs-utils sys-fs/reiserfsprogs
 virtual/alsa	        media-sound/alsa-driver    
 virtual/antivirus	app-antivirus/clamav
 virtual/aspell-dict	app-dicts/aspell-en
 virtual/bittorrent	net-p2p/bittorrent
 virtual/blackbox	x11-wm/blackbox
+virtual/blas		app-sci/blas-atlas
 virtual/bootloader	sys-boot/yaboot
 virtual/cdrtools	app-cdr/cdrtools
 virtual/commonlisp	dev-lisp/sbcl
 virtual/cron	    	sys-apps/dcron
+virtual/dev-manager	sys-fs/devfsd
+virtual/dhcpc		net-misc/dhcpcd
 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/libc	   	sys-libs/glibc
 virtual/glu	     	x11-base/xorg-x11
 virtual/glut	    	media-libs/glut
+virtual/gsasl		net-libs/libgsasl
 virtual/gzip		app-arch/gzip
+virtual/httpd-php	dev-php/mod_php
 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/jack		media-sound/jack-audio-connection-kit
 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/lapack		app-sci/lapack-atlas
+virtual/libc	   	sys-libs/glibc
+virtual/linux-sources   sys-kernel/gentoo-dev-sources
 virtual/logger		app-admin/sysklogd
 virtual/lpr	     	net-print/cups
+virtual/m3		dev-lang/cm3
 virtual/mailx		mail-client/mailx
 virtual/mda		mail-filter/procmail
 virtual/modutils 	sys-apps/module-init-tools
+virtual/mpg123		media-sound/mpg123
 virtual/mta	     	mail-mta/ssmtp
 virtual/opengl	  	x11-base/xorg-x11
 virtual/os-headers	sys-kernel/linux-headers
 virtual/php	     	dev-php/mod_php
-virtual/httpd-php				dev-php/mod_php
 virtual/python	  	dev-lang/python
 virtual/quicktime	media-libs/libquicktime
+virtual/ruby		dev-lang/ruby
 virtual/semi		app-emacs/semi
 virtual/skkserv		app-i18n/skkserv
 virtual/snmp		net-analyzer/net-snmp
+virtual/squeak-image	dev-lang/squeak-fullimage
 virtual/ssh		net-misc/openssh
 virtual/sylpheed	mail-client/sylpheed
 virtual/tetex		app-text/tetex
 virtual/textbrowser	net-www/links
 virtual/tftp		net-misc/tftp-hpa
+virtual/w3m		www-client/w3m
+virtual/w3m		www-client/w3m
 virtual/x11		x11-base/xorg-x11
 virtual/xemacs		app-editors/xemacs
-virtual/xft	     x11-base/xorg-x11
-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
-virtual/squeak-image	dev-lang/squeak-fullimage
-virtual/dev-manager	sys-fs/devfsd
-virtual/blas		app-sci/blas-atlas
-virtual/lapack		app-sci/lapack-atlas
-virtual/gsasl		net-libs/libgsasl
-virtual/m3			dev-lang/cm3
-virtual/w3m		www-client/w3m
+virtual/xft	     	x11-base/xorg-x11