mask rsync and com_err for collision-protect. Fixup base packages for progressive.

diff --git a/profiles/default-darwin/macos/10.3/package.mask b/profiles/default-darwin/macos/10.3/package.mask
index 78f1ac2cf7da3134cdfc8d1a5401276c543bcfc3..a9878f9889e4ebe7dd810de5532cd4def218967b 100644 (file)
--- a/profiles/default-darwin/macos/10.3/package.mask
+++ b/profiles/default-darwin/macos/10.3/package.mask
@@ -10,6 +10,9 @@ 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-lang/parrot
 dev-lang/perl
 dev-lang/python
@@ -22,6 +25,7 @@ dev-util/subversion
 >=mail-client/mutt-1.5.11
 media-libs/a52dec
 net-misc/curl
+net-misc/rsync
 sys-apps/diffutils
 sys-apps/gawk
 sys-apps/grep
@@ -34,17 +38,13 @@ sys-devel/automake-wrapper
 sys-devel/bison
 sys-devel/flex
 sys-devel/libperl
-sys-libs/ncurse
+sys-libs/com_err
+sys-libs/ncurses
 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.3.  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

diff --git a/profiles/default-darwin/macos/10.3/packages b/profiles/default-darwin/macos/10.3/packages
index 748fee321b0f10c31e4c98fd48bde402580ee22a..93bae51d04d62174774a5c3a147f1a82c90a7a53 100644 (file)
--- a/profiles/default-darwin/macos/10.3/packages
+++ b/profiles/default-darwin/macos/10.3/packages
@@ -1 +1,2 @@
+-*app-arch/cpio
 *sys-apps/freebsd-stat

diff --git a/profiles/default-darwin/macos/10.4/package.mask b/profiles/default-darwin/macos/10.4/package.mask
index f0f1bf6d84a0ec3d4a130b6f5e058aba931284b2..4eedfdbc1d3d37518aeb28486374b62806378f01 100644 (file)
--- a/profiles/default-darwin/macos/10.4/package.mask
+++ b/profiles/default-darwin/macos/10.4/package.mask
@@ -20,6 +20,7 @@ dev-util/intltool
 dev-util/guile
 media-libs/a52dec
 net-misc/curl
+net-misc/rsync
 sys-apps/diffutils
 sys-apps/gawk
 sys-apps/grep
@@ -32,6 +33,7 @@ sys-devel/automake-wrapper
 sys-devel/bison
 sys-devel/flex
 sys-devel/libperl
+sys-libs/com_err
 sys-libs/ncurses
 sys-libs/readline
 x11-libs/gtk+

diff --git a/profiles/default-darwin/macos/progressive/make.defaults b/profiles/default-darwin/macos/progressive/make.defaults
index 3f618d41a9f827421adcc337933718186850e6c7..237e449af71a7ffc905f99b243dc526fc0043736 100644 (file)
--- a/profiles/default-darwin/macos/progressive/make.defaults
+++ b/profiles/default-darwin/macos/progressive/make.defaults
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # System-wide defaults for all ppc-macos progressive profiles
-
+ARCH=ppc
+CHOST=powerpc-apple-darwin8
 KERNEL=Darwin
 ELIBC=Darwin
 USERLAND=Darwin

diff --git a/profiles/default-darwin/macos/progressive/package.provided b/profiles/default-darwin/macos/progressive/package.provided
index aa6bd7b5d66e94480054900d579639df4320f78b..3082c107948423ee28df9495d8f5f18ab3d330ea 100644 (file)
--- a/profiles/default-darwin/macos/progressive/package.provided
+++ b/profiles/default-darwin/macos/progressive/package.provided
@@ -10,9 +10,7 @@ app-editors/pico-0.0.1
 app-editors/vim-6.2
 app-misc/screen-4.0.2
 app-misc/srm-1.2.6
-app-shells/bash-2.05b-r2
 app-shells/tcsh-6.12
-app-shells/zsh-4.2.3
 app-text/enscript-1.6.1
 app-text/rcs-5.7
 app-text/texi2html-1.57
@@ -89,7 +87,6 @@ sys-apps/diffutils-2.5.8
 sys-apps/ed-0.2-r3
 sys-apps/file-4.10
 sys-apps/findutils-4.1.7
-sys-apps/gawk-2.8
 sys-apps/grep-2.5.1
 sys-apps/groff-1.19.1
 sys-apps/less-382

diff --git a/profiles/default-darwin/macos/progressive/packages b/profiles/default-darwin/macos/progressive/packages
index 157b2f82f5324fa0893c2d717796f7fdb9756048..c6f723f8e3bfa3cf5e2f0bcdc629a5dd6d488484 100644 (file)
--- a/profiles/default-darwin/macos/progressive/packages
+++ b/profiles/default-darwin/macos/progressive/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-darwin/macos/progressive/packages,v 1.3 2005/08/14 21:02:59 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-darwin/macos/progressive/packages,v 1.4 2005/10/13 02:40:02 kito Exp $
 
 ### Gentoo for Mac OS X Progressive profile ###
 
@@ -14,3 +14,21 @@
 #*sys-apps/file-darwin
 #*sys-apps/shellcmds-darwin
 
+## Begin Linux specific packages
+-*sys-apps/coreutils
+-*sys-apps/kbd
+-*sys-apps/man
+-*sys-apps/man-pages
+-*sys-apps/net-tools
+-*sys-process/procps
+-*sys-process/psmisc
+-*net-misc/iputils
+-*sys-apps/shadow
+-*sys-apps/which
+-*sys-devel/binutils
+-*sys-fs/e2fsprogs
+-*sys-libs/cracklib
+-*sys-fs/udev
+-*virtual/dev-manager
+-*virtual/modutils
+## End Linux specific packages

diff --git a/profiles/default-darwin/macos/progressive/virtuals b/profiles/default-darwin/macos/progressive/virtuals
index 3d8184cf24ab3141577ebc373f0b851076ed10b3..e05c33cc21d9b39744f4a3c369cdfc342c6efea1 100644 (file)
--- a/profiles/default-darwin/macos/progressive/virtuals
+++ b/profiles/default-darwin/macos/progressive/virtuals
@@ -1 +1,2 @@
 virtual/jdk    dev-java/sun-jdk
+virtual/dev-manager