Little more profile cleanup.

4 files changed, 9 insertions, 16 deletions

diff --git a/profiles/default-darwin/macos/10.4/package.mask b/profiles/default-darwin/macos/10.4/package.mask
index 4eedfdbc1d3d..950f16b1cf01 100644
--- a/profiles/default-darwin/macos/10.4/package.mask
+++ b/profiles/default-darwin/macos/10.4/package.mask
@@ -2,14 +2,18 @@
 # These packages will, or depend on packages that will overwrite
 # collision-protected files 
 ##
-app-arch/zip
+app-arch/cpio
 app-arch/unzip
+app-arch/zip
 app-editors/nano
 app-editors/vim-core
 app-editors/vim
 >=app-portage/esearch-0.7.1
 app-shells/bash
 app-shells/zsh
+app-vim/phpdocs
+app-vim/gentoo-syntax
+app-vim/taglist
 dev-db/sqlite
 dev-lang/perl
 dev-lang/python
@@ -22,6 +26,7 @@ media-libs/a52dec
 net-misc/curl
 net-misc/rsync
 sys-apps/diffutils
+sys-apps/freebsd-stat
 sys-apps/gawk
 sys-apps/grep
 sys-apps/texinfo
@@ -41,17 +46,6 @@ x11-libs/gtk+
 # end collision-protect
 ##
 
-# These packages depend on packages that would violate collision-protect
-app-vim/phpdocs
-app-vim/gentoo-syntax
-app-vim/taglist
-
-# Cpio is provided by Apple on 10.4.  The Gentoo binary is installed to
-# a separate location so the package does not cause a collision.
-# Nonetheless, cpio is part of System, and we don't want it pulled in
-# for users of this profile.
-app-arch/cpio
-
 # libidn needs java-config.  This one is not yet ported, so as long as
 # thre is no solution for that it is masked
 net-dns/libidn
diff --git a/profiles/default-darwin/macos/10.4/package.provided b/profiles/default-darwin/macos/10.4/package.provided
index 81a22d082873..dfeba1e808f2 100644
--- a/profiles/default-darwin/macos/10.4/package.provided
+++ b/profiles/default-darwin/macos/10.4/package.provided
@@ -8,7 +8,6 @@ app-arch/zip-2.3
 app-crypt/mit-krb5-1.4
 app-editors/emacs-21.2
 app-editors/nano-1.2.4
-app-editors/pico-0.0.1
 app-editors/vim-6.2
 app-misc/screen-4.0.2
 app-misc/srm-1.2.6
@@ -36,6 +35,7 @@ dev-libs/libiconv-1.9
 dev-libs/libxml2-2.6.16
 dev-libs/libxslt-1.1.11
 dev-libs/openssl-0.9.7b
+dev-libs/cyrus-sasl-2.1.18
 dev-perl/mod_perl-1.3
 dev-perl/wxperl-0.22
 dev-php/mod_php-4.3.11
@@ -99,7 +99,6 @@ sys-apps/groff-1.19.1
 sys-apps/less-382
 sys-apps/man-1.5
 sys-apps/miscfiles-1.3-r1
-sys-apps/sed-4.0.7
 sys-apps/tcp-wrappers-7.6-r8
 sys-apps/texinfo-4.6
 sys-apps/xinetd-2.0.0
diff --git a/profiles/default-darwin/macos/progressive/make.defaults b/profiles/default-darwin/macos/progressive/make.defaults
index 237e449af71a..ad1f5e3c25cd 100644
--- a/profiles/default-darwin/macos/progressive/make.defaults
+++ b/profiles/default-darwin/macos/progressive/make.defaults
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # System-wide defaults for all ppc-macos progressive profiles
+ACCEPT_KEYWORDS="~ppc-macos"
 ARCH=ppc
 CHOST=powerpc-apple-darwin8
 KERNEL=Darwin
diff --git a/profiles/default-darwin/use.mask b/profiles/default-darwin/use.mask
index 9745a9d8dff7..7b89fb811ba9 100644
--- a/profiles/default-darwin/use.mask
+++ b/profiles/default-darwin/use.mask
@@ -53,7 +53,7 @@ mikmod
 mono
 mzscheme
 nas
-on-the-fly-crypt
+pike
 qdbm
 socks5
 xmms
@@ -81,7 +81,6 @@ pfpro
 solid
 
 # masks for x11-libs/qt
-nas
 odbc
 postgres