summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/default-darwin')
-rw-r--r--profiles/default-darwin/macos/10.3/package.mask58
-rw-r--r--profiles/default-darwin/macos/10.3/package.provided27
-rw-r--r--profiles/default-darwin/macos/10.3/packages1
-rw-r--r--profiles/default-darwin/macos/10.3/profile.bashrc7
-rw-r--r--profiles/default-darwin/macos/10.3/use.mask31
-rw-r--r--profiles/default-darwin/macos/10.4/make.defaults10
-rw-r--r--profiles/default-darwin/macos/10.4/package.mask31
-rw-r--r--profiles/default-darwin/macos/10.4/package.provided131
-rw-r--r--profiles/default-darwin/macos/10.4/profile.bashrc17
-rw-r--r--profiles/default-darwin/macos/10.4/use.mask33
-rw-r--r--profiles/default-darwin/macos/make.defaults11
-rw-r--r--profiles/default-darwin/macos/progressive/make.defaults11
-rw-r--r--profiles/default-darwin/macos/progressive/package.provided91
-rw-r--r--profiles/default-darwin/macos/progressive/packages28
-rw-r--r--profiles/default-darwin/macos/progressive/profile.bashrc19
-rw-r--r--profiles/default-darwin/macos/progressive/virtuals1
-rw-r--r--profiles/default-darwin/macos/use.mask87
-rw-r--r--profiles/default-darwin/macos/virtuals17
-rw-r--r--profiles/default-darwin/make.defaults27
-rw-r--r--profiles/default-darwin/od/packages.build21
-rw-r--r--profiles/default-darwin/package.mask3
-rw-r--r--profiles/default-darwin/packages12
-rw-r--r--profiles/default-darwin/use.mask36
-rw-r--r--profiles/default-darwin/virtuals32
24 files changed, 525 insertions, 217 deletions
diff --git a/profiles/default-darwin/macos/10.3/package.mask b/profiles/default-darwin/macos/10.3/package.mask
index 38f479403f21..a9878f9889e4 100644
--- a/profiles/default-darwin/macos/10.3/package.mask
+++ b/profiles/default-darwin/macos/10.3/package.mask
@@ -1,12 +1,60 @@
##
-# These packages overwrite collision-protected files
+# These packages will, or depend on packages that will overwrite
+# collision-protected files
##
-
-
+app-arch/zip
+app-arch/unzip
+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-lang/parrot
+dev-lang/perl
+dev-lang/python
+dev-libs/libprelude
+dev-libs/libxml2
+dev-perl/XML-Parser
+dev-util/intltool
+dev-util/guile
+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
+sys-apps/texinfo
+sys-devel/gcc-apple
+sys-devel/autoconf
+sys-devel/autoconf-wrapper
+sys-devel/automake
+sys-devel/automake-wrapper
+sys-devel/bison
+sys-devel/flex
+sys-devel/libperl
+sys-libs/com_err
+sys-libs/ncurses
+x11-libs/gtk+
##
# end collision-protect
##
+# 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
+# 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
-#masked until the save problem is fixed.
-app-editors/nano \ No newline at end of file
+# Ruby 1.8.2 compiles, but it contains a security bug. We cannot
+# compile 1.8.3 because it needs autoconf 2.59 which we don't have
+dev-lang/ruby
diff --git a/profiles/default-darwin/macos/10.3/package.provided b/profiles/default-darwin/macos/10.3/package.provided
index 56c563fdfb92..1a5205cd18a8 100644
--- a/profiles/default-darwin/macos/10.3/package.provided
+++ b/profiles/default-darwin/macos/10.3/package.provided
@@ -1,28 +1,32 @@
app-admin/sudo-1.6.6
app-arch/bzip2-1.0.2
+app-arch/cpio-2.6
app-arch/gzip-1.2.4
app-arch/tar-1.13.25
app-arch/unzip-5.20
-app-crypt/mit-krb5
+app-arch/zip-2.1
+app-crypt/mit-krb5-1.4
app-editors/emacs-21.2
+app-editors/pico-0.0.1
app-editors/vim-6.2
app-misc/screen-3.09.15
app-misc/srm-1.2.6
app-shells/bash-2.05b-r2
app-shells/tcsh-6.12
app-shells/zsh-4.1.1
-app-text/enscript-1.6.3
+app-text/enscript-1.6.1
app-text/rcs-5.7
app-text/texi2html-1.57
-dev-db/mysql-4.0.18
+dev-java/ant-core-1.6.1
dev-java/javascriptcore-96
-dev-java/sun-j2sdk-1.4.2
+dev-java/jikes-1.18
+dev-java/sun-jdk-1.4.2.08
dev-lang/objc4-235
dev-lang/perl-5.8.1
-dev-lang/python-2.3
dev-lang/python-2.3.3
dev-lang/ruby-1.6.8
dev-lang/tcl-8.4
+dev-lang/tk-8.4
dev-libs/icu-3.13
dev-libs/libedit-20020225
dev-libs/libiconv-1.9
@@ -33,7 +37,7 @@ dev-php/php-4.3.2
dev-tcltk/expect-5.32
dev-util/cscope-15.3
dev-util/cvs-1.10
-dev-util/diffstat-1.26
+dev-util/diffstat-1.25
dev-util/gperf-2.7.2
dev-util/headerdoc-7.4.8
dev-util/jam-2.2
@@ -77,7 +81,6 @@ net-www/apache-2.0.49
net-www/apache_mod_hfs_apple-5
net-www/jboss-3.2.3
net-www/mod_dav-1.0.3
-net-www/mod_perl-1.26
net-www/mod_rendezvous_apple-8
net-www/mod_ssl-2.8.16
sys-apps/diffutils-2.5.7
@@ -89,12 +92,11 @@ sys-apps/gawk-2.8
sys-apps/grep-2.4.2
sys-apps/groff-1.18.1
sys-apps/less-378
-sys-apps/lsof-4.68
+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/vixie-cron-3.0.1
sys-apps/xinetd-2.0.0
sys-devel/autoconf-2.57
sys-devel/automake-1.6.3
@@ -103,9 +105,9 @@ sys-devel/bison-1.28
sys-devel/distcc-2.0.2
sys-devel/flex-2.5.4a
sys-devel/gcc-3.3.1495
-sys-devel/gdb-5.3-20030128
+sys-devel/gdb-5.3
sys-devel/gnuserv-2
-sys-devel/libtool-2.4.4
+sys-devel/libtool-1.5.10-r4
sys-devel/m4-1.4
sys-devel/make-3.79
sys-devel/patch-2.5.8
@@ -116,4 +118,7 @@ sys-libs/pam-1.9
sys-libs/pam-modules-13
sys-libs/yacc-1.1.4
sys-libs/zlib-1.1.4
+sys-process/lsof-4.68
+sys-process/vixie-cron-3.0.1
+www-apache/mod_perl-1.26
x11-base/apple-xfree-4.3
diff --git a/profiles/default-darwin/macos/10.3/packages b/profiles/default-darwin/macos/10.3/packages
index 748fee321b0f..93bae51d04d6 100644
--- 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.3/profile.bashrc b/profiles/default-darwin/macos/10.3/profile.bashrc
index 1fd68017cf90..31237cedf218 100644
--- a/profiles/default-darwin/macos/10.3/profile.bashrc
+++ b/profiles/default-darwin/macos/10.3/profile.bashrc
@@ -1,9 +1,12 @@
+export MACOSX_DEPLOYMENT_TARGET="10.3"
+
# <usata@gentoo.org> (23 Sep 2004)
# /usr/X11R6 is not in our PATH
export PATH="${PATH}:/usr/X11R6/bin"
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/X11R6/lib/pkgconfig"
-export MACOSX_DEPLOYMENT_TARGET="10.3"
alias libtool=glibtool
alias libtoolize=glibtoolize
-alias sed=gsed \ No newline at end of file
+export LIBTOOLIZE="glibtoolize"
+
+[ -x /usr/bin/gsed ] && alias sed=gsed
diff --git a/profiles/default-darwin/macos/10.3/use.mask b/profiles/default-darwin/macos/10.3/use.mask
index 0adca5a91d4d..b5fe382061be 100644
--- a/profiles/default-darwin/macos/10.3/use.mask
+++ b/profiles/default-darwin/macos/10.3/use.mask
@@ -1,20 +1,33 @@
-# Add USE flags that don't work on Mac OS X here
+# tcl ebuild overwrites Apple's tcl, so we mask it (dev-lang/ruby)
+tcltk
+
+# Collision-protect
+a52
+
+# readline collides with the Apple system install
+readline
+
+# guile depends on readline
+guile
# gtk+ pulls in XML-Parser with USE="nls xml", so Perl issue should
# be resolved first before keywording them
gtk
gtk2
-
+perl
# imlib depends on gtk+-1
imlib
+# rxvt-unicode's tabs requires dev-perl/gtk2-perl
+tabs
-perl
+# wxwindows needs wxGTK which in turn needs gtk+
+wxwindows
-# tcl ebuild overwrites Apple's tcl, so we mask it (dev-lang/ruby)
-tcltk
+# see GCC man-page (-static): "This option will not work on Mac OS X..."
+static
-# needs a lot of packages ported before its usable.
-xemacs
+# pulls libidn, which has problems with java-config
+idn
-# this is going to be a hard thing to port, if even doable
-mpi
+# OSX has pam, but openvpn doesn't compile against it (yet?)
+pam
diff --git a/profiles/default-darwin/macos/10.4/make.defaults b/profiles/default-darwin/macos/10.4/make.defaults
index 6285aacc17ed..733f60ec07a9 100644
--- a/profiles/default-darwin/macos/10.4/make.defaults
+++ b/profiles/default-darwin/macos/10.4/make.defaults
@@ -1,9 +1 @@
-# Copyright 2004 Pieter Van den Abeele, Gentoo Foundation
-# System-wide defaults for the Portage system
-
-# emerge portage-prefpane to make managing your make.conf file easy
-# The make.defaults file should never be changed
-
-ARCH="ppc"
-ACCEPT_KEYWORDS="ppc-macos"
-USE="ppc-macos"
+FEATURES="collision-protect"
diff --git a/profiles/default-darwin/macos/10.4/package.mask b/profiles/default-darwin/macos/10.4/package.mask
index 435f8adca669..4eedfdbc1d3d 100644
--- a/profiles/default-darwin/macos/10.4/package.mask
+++ b/profiles/default-darwin/macos/10.4/package.mask
@@ -1,17 +1,28 @@
##
-# These packages will, or depend on packages that will overwrite collision-protected files
+# These packages will, or depend on packages that will overwrite
+# collision-protected files
##
app-arch/zip
app-arch/unzip
app-editors/nano
app-editors/vim-core
+app-editors/vim
+>=app-portage/esearch-0.7.1
app-shells/bash
app-shells/zsh
-dev-libs/libprelude
+dev-db/sqlite
+dev-lang/perl
+dev-lang/python
+dev-lang/ruby
dev-libs/libxml2
+dev-perl/XML-Parser
+dev-util/intltool
+dev-util/guile
media-libs/a52dec
net-misc/curl
+net-misc/rsync
sys-apps/diffutils
+sys-apps/gawk
sys-apps/grep
sys-apps/texinfo
sys-devel/gcc-apple
@@ -21,10 +32,26 @@ sys-devel/automake
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+
##
# 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 112b011ffdad..5674ff92b986 100644
--- a/profiles/default-darwin/macos/10.4/package.provided
+++ b/profiles/default-darwin/macos/10.4/package.provided
@@ -1,19 +1,130 @@
-# gongloo: Still working through the things that have been updated from 10.3, but what follows is a list of where I got up to.
app-admin/sudo-1.6.8
+app-arch/bzip2-1.0.2
+app-arch/cpio-2.6
app-arch/gzip-1.3.5
-app-arch/tar-1.14
+app-arch/tar-1.13.25
app-arch/unzip-5.51
-app-editors/emacs-21.2.1
-app-misc/screen-4.00.02
-app-misc/srm-1.2.8
+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
+app-shells/bash-2.05b-r2
+app-shells/tcsh-6.12
app-shells/zsh-4.2.3
-app-text/texi2html-1.70
+app-text/enscript-1.6.1
+app-text/rcs-5.7
+app-text/texi2html-1.57
+dev-db/mysql-4.1.10a
+dev-java/ant-core-1.6.2
+dev-java/javascriptcore-96
+dev-java/jikes-1.22
+dev-java/sun-jdk-1.4.2.08
+dev-lang/objc4-235
dev-lang/perl-5.8.6
dev-lang/python-2.3.5
dev-lang/ruby-1.8.2
-dev-libs/libiconv-2.0
+dev-lang/tcl-8.4.7
+dev-lang/tk-8.4.7
+dev-libs/icu-3.2
+dev-libs/libedit-2.6.9
+dev-libs/libiconv-1.9
dev-libs/libxml2-2.6.16
-dev-php/php-4.3.10
+dev-libs/libxslt-1.1.11
+dev-libs/openssl-0.9.7b
+dev-perl/mod_perl-1.3
+dev-perl/wxperl-0.22
+dev-php/mod_php-4.3.11
+dev-php/php-4.3.11
+dev-python/wxpython-2.5.3.1
+dev-tcltk/expect-5.32
+dev-util/cscope-15.5
dev-util/cvs-1.11.18
-media-libs/freetype-2.1.4
-sys-devel/gdb-6.1.20040303
+dev-util/diffstat-1.34
+dev-util/gperf-3.0.1
+dev-util/headerdoc-7.4.8
+dev-util/jam-2.2
+dev-util/yacc-1.9
+mail-client/squirrelmail-1.4.1
+mail-filter/procmail-3.21
+mail-mta/postfix-2.0.8
+media-gfx/gimp-print-5.0.0_beta2
+media-libs/fontconfig-1.0.1
+media-libs/freetype-2.1.1
+net-analyzer/net_snmp-5.0.8
+net-analyzer/netcat-110
+net-analyzer/netinfo-324
+net-analyzer/network_cmds-176
+net-analyzer/tcpdump-3.8
+net-dialup/ppp-142
+net-dns/bind-9.2.2
+net-dns/bind-tools-9.2.2
+net-firewall/ipfirewall-17
+net-fs/samba-3.0.2
+net-ftp/lukemftp-3
+net-ftp/lukemftpd-8
+net-ftp/ntfs-8
+net-libs/libpcap-0.8
+net-libs/libtelnet-5
+net-mail/cyrus-imapd-2.1.13
+net-mail/fetchmail-6.2.5
+net-mail/mail_cmds-15
+net-mail/mailman-2.1.4
+net-misc/curl-7.13.1
+net-misc/efax-0.9a
+net-misc/gsasl-2.1.1
+net-misc/mdnsresponder-107
+net-misc/openssh-3.8.1_p1
+net-misc/rsync-2.6.3
+net-nds/openldap-2.1.22
+net-nds/portmap-8.1
+net-ntp/ntp-4.1.0
+net-print/cups-1.1.20
+net-www/apache-1.3.33
+net-www/apache-2.0.53
+net-www/jboss-3.2.3
+net-www/mod_dav-1.0.3
+net-www/mod_php-4.3.10
+net-www/mod_ssl-2.8.16
+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
+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
+sys-devel/autoconf-2.59
+sys-devel/automake-1.6.3
+sys-devel/bc-1.05
+sys-devel/bison-1.28
+sys-devel/distcc-2.0.2
+sys-devel/flex-2.5.4a
+sys-devel/gcc-3.3.1809
+sys-devel/gcc-4.0.4061
+sys-devel/gdb-6.1
+sys-devel/gnuserv-2
+sys-devel/libtool-1.5.10-r4
+sys-devel/m4-1.4
+sys-devel/make-3.80
+sys-devel/patch-2.5.8
+sys-libs/db-4.2.52.1
+sys-libs/db-6
+sys-libs/ncurses-8.1
+sys-libs/pam-1.9
+sys-libs/pam-modules-13
+sys-libs/yacc-1.1.4
+sys-libs/zlib-1.2.2
+sys-process/lsof-4.68
+sys-process/vixie-cron-3.0.1
+www-servers/jboss-3.2.3
+x11-base/apple-xfree-4.4
diff --git a/profiles/default-darwin/macos/10.4/profile.bashrc b/profiles/default-darwin/macos/10.4/profile.bashrc
index 7d0846872d68..13a7311386fc 100644
--- a/profiles/default-darwin/macos/10.4/profile.bashrc
+++ b/profiles/default-darwin/macos/10.4/profile.bashrc
@@ -1,5 +1,18 @@
-export MACOSX_DEPLOYMENT_TARGET="10.4"
+export MACOSX_DEPLOYMENT_TARGET=10.4
+
+# <usata@gentoo.org> (23 Sep 2004)
+# /usr/X11R6 is not in our PATH
+export PATH="${PATH}:/usr/X11R6/bin"
+export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/X11R6/lib/pkgconfig"
+# Needed for autoreconf to work properly
+export LIBTOOLIZE="glibtoolize"
+
+# add Python.framework dirs to path
+[ -d /System/Library/Frameworks/Python.framework/Versions/Current/bin ] && \
+export PATH="${PATH}:/System/Library/Frameworks/Python.framework/Versions/Current/bin"
+[ -d /Library/Frameworks/Python.framework/Versions/Current/bin ] && \
+export PATH="${PATH}:/Library/Frameworks/Python.framework/Versions/Current/bin"
alias libtool=glibtool
alias libtoolize=glibtoolize
-alias sed=gsed
+[ -x /usr/bin/gsed ] && alias sed=gsed
diff --git a/profiles/default-darwin/macos/10.4/use.mask b/profiles/default-darwin/macos/10.4/use.mask
index 5294f541c2ef..10bab76866bd 100644
--- a/profiles/default-darwin/macos/10.4/use.mask
+++ b/profiles/default-darwin/macos/10.4/use.mask
@@ -1,2 +1,35 @@
# tcl ebuild overwrites Apple's tcl, so we mask it (dev-lang/ruby)
tcltk
+
+# Collision-protect
+a52
+
+# readline collides with the Apple system install
+readline
+
+# guile depends on readline
+guile
+
+# gtk+ pulls in XML-Parser with USE="nls xml", so Perl issue should
+# be resolved first before keywording them
+gtk
+gtk2
+perl
+
+# imlib depends on gtk+-1
+imlib
+
+# rxvt-unicode's tabs requires dev-perl/gtk2-perl
+tabs
+
+# wxwindows needs wxGTK which in turn needs gtk+
+wxwindows
+
+# see GCC man-page (-static): "This option will not work on Mac OS X..."
+static
+
+# pulls libidn, which has problems with java-config
+idn
+
+# OSX has pam, but openvpn doesn't compile against it (yet?)
+pam
diff --git a/profiles/default-darwin/macos/make.defaults b/profiles/default-darwin/macos/make.defaults
index bd5a2d3e61fa..af8425fe3a05 100644
--- a/profiles/default-darwin/macos/make.defaults
+++ b/profiles/default-darwin/macos/make.defaults
@@ -1,10 +1,9 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# System-wide defaults for the Portage system
-
-# The make.defaults file should never be changed
+# System-wide defaults for all ppc-macos profiles
ARCH="ppc"
-ACCEPT_KEYWORDS="ppc-macos"
-USE="ppc-macos" \ No newline at end of file
+ACCEPT_KEYWORDS="ppc-macos"
+USE="opengl ppc-macos"
+
diff --git a/profiles/default-darwin/macos/progressive/make.defaults b/profiles/default-darwin/macos/progressive/make.defaults
index cf0567bbf0bd..237e449af71a 100644
--- a/profiles/default-darwin/macos/progressive/make.defaults
+++ b/profiles/default-darwin/macos/progressive/make.defaults
@@ -2,7 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# System-wide defaults for all ppc-macos progressive profiles
-
-USE="bitmap-fonts dvd gif jpeg ldap nls pam png truetype truetype-fonts type1-fonts unicode"
-
-FEATURES="-collision-protect fakeroot -sandbox userpriv"
+ARCH=ppc
+CHOST=powerpc-apple-darwin8
+KERNEL=Darwin
+ELIBC=Darwin
+USERLAND=Darwin
+USE="ppc-macos"
+FEATURES="-collision-protect -fakeroot -sandbox -userpriv"
diff --git a/profiles/default-darwin/macos/progressive/package.provided b/profiles/default-darwin/macos/progressive/package.provided
index 0ffe7da35505..3082c1079484 100644
--- a/profiles/default-darwin/macos/progressive/package.provided
+++ b/profiles/default-darwin/macos/progressive/package.provided
@@ -1,49 +1,51 @@
-app-admin/sudo-1.6.6
+app-admin/sudo-1.6.8
app-arch/bzip2-1.0.2
app-arch/cpio-2.6
-app-arch/gzip-1.2.4
+app-arch/gzip-1.3.5
app-arch/tar-1.13.25
-app-arch/unzip-5.20
-app-crypt/mit-krb5
+app-arch/unzip-5.51
+app-crypt/mit-krb5-1.4
app-editors/emacs-21.2
app-editors/pico-0.0.1
app-editors/vim-6.2
-app-misc/screen-3.09.15
+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.1.1
-app-text/enscript-1.6.3
+app-text/enscript-1.6.1
app-text/rcs-5.7
app-text/texi2html-1.57
-dev-db/mysql-4.0.18
+dev-db/mysql-4.1.10a
dev-java/javascriptcore-96
-dev-java/sun-j2sdk-1.4.2
+dev-java/sun-jdk-1.5
dev-lang/objc4-235
-dev-lang/perl-5.8.1
-dev-lang/python-2.3
-dev-lang/python-2.3.3
-dev-lang/ruby-1.6.8
-dev-lang/tcl-8.4
-dev-libs/icu-3.13
-dev-libs/libedit-20020225
+dev-lang/perl-5.8.6
+dev-lang/python-2.3.5
+dev-lang/ruby-1.8.2
+dev-lang/tcl-8.4.7
+dev-lang/tk-8.4.7
+dev-libs/icu-3.2
+dev-libs/libedit-2.6.9
dev-libs/libiconv-1.9
-dev-libs/libxml2-2.6.7
+dev-libs/libxml2-2.6.16
+dev-libs/libxslt-1.1.11
dev-libs/openssl-0.9.7b
+dev-perl/wxperl-0.22
+dev-perl/mod_perl-1.3
dev-php/mod_php-4.2
dev-php/php-4.3.2
+dev-python/wxpython-2.5.3.1
dev-tcltk/expect-5.32
-dev-util/cscope-15.3
-dev-util/cvs-1.10
-dev-util/diffstat-1.26
-dev-util/gperf-2.7.2
+dev-util/cscope-15.5
+dev-util/cvs-1.11.18
+dev-util/diffstat-1.3.4
+dev-util/gperf-3.0.1
dev-util/headerdoc-7.4.8
dev-util/jam-2.2
dev-util/yacc-1.9
mail-client/squirrelmail-1.4.1
mail-filter/procmail-3.21
mail-mta/postfix-2.0.8
-media-gfx/gimp_print-4.2.5
+media-gfx/gimp-print-5.0.0_beta2
media-libs/fontconfig-1.0.1
media-libs/freetype-2.1.1
net-analyzer/net_snmp-5.0.8
@@ -65,51 +67,49 @@ net-mail/cyrus-imapd-2.1.13
net-mail/fetchmail-6.2.5
net-mail/mail_cmds-15
net-mail/mailman-2.1.4
-net-misc/curl-7.10.2
+net-misc/curl-7.13.1
net-misc/efax-0.9a
net-misc/gsasl-2.1.1
net-misc/mdnsresponder-58
-net-misc/openssh-3.6.1_p1
-net-misc/rsync-2.5.7
+net-misc/openssh-3.8.1
+net-misc/rsync-2.6.3
net-nds/openldap-2.1.22
net-nds/portmap-8.1
net-ntp/ntp-4.1.0
net-print/cups-1.1.20
-net-www/apache-2.0.49
-net-www/apache_mod_hfs_apple-5
+net-www/apache-1.3.33
+net-www/apache-2.0.54-r10
net-www/jboss-3.2.3
net-www/mod_dav-1.0.3
-net-www/mod_perl-1.26
-net-www/mod_rendezvous_apple-8
+net-www/mod_php-4.3.10
net-www/mod_ssl-2.8.16
-sys-apps/diffutils-2.5.7
sys-apps/diffutils-2.5.8
sys-apps/ed-0.2-r3
-sys-apps/file-4.02
+sys-apps/file-4.10
sys-apps/findutils-4.1.7
-sys-apps/gawk-2.8
-sys-apps/grep-2.4.2
-sys-apps/groff-1.18.1
-sys-apps/less-378
-sys-apps/lsof-4.68
+sys-apps/grep-2.5.1
+sys-apps/groff-1.19.1
+sys-apps/less-382
+sys-process/lsof-4.68
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/vixie-cron-3.0.1
+sys-process/vixie-cron-3.0.1
sys-apps/xinetd-2.0.0
-sys-devel/autoconf-2.57
+sys-devel/autoconf-2.59
sys-devel/automake-1.6.3
sys-devel/bc-1.05
sys-devel/bison-1.28
sys-devel/distcc-2.0.2
sys-devel/flex-2.5.4a
-sys-devel/gcc-3.3.1495
-sys-devel/gdb-5.3-20030128
+sys-devel/gcc-3.3.1809
+sys-devel/gcc-4.0.4061
+sys-devel/gdb-6.1
sys-devel/gnuserv-2
-sys-devel/libtool-2.4.4
+sys-devel/libtool-1.5
sys-devel/m4-1.4
-sys-devel/make-3.79
+sys-devel/make-3.80
sys-devel/patch-2.5.8
sys-libs/db-1.85-r2
sys-libs/db-6
@@ -117,5 +117,6 @@ sys-libs/ncurses-8.1
sys-libs/pam-1.9
sys-libs/pam-modules-13
sys-libs/yacc-1.1.4
-sys-libs/zlib-1.1.4
-x11-base/apple-xfree-4.3
+sys-libs/zlib-1.2.2
+www-servers/jboss-3.2.3
+x11-base/apple-xfree-4.4
diff --git a/profiles/default-darwin/macos/progressive/packages b/profiles/default-darwin/macos/progressive/packages
index 3f3cc75c9b19..5fd8b565b9bf 100644
--- a/profiles/default-darwin/macos/progressive/packages
+++ b/profiles/default-darwin/macos/progressive/packages
@@ -1,8 +1,34 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-darwin/macos/progressive/packages,v 1.1.1.1 2005/11/30 09:48:41 chriswhite Exp $
### Gentoo for Mac OS X Progressive profile ###
# Things we want emerge system to install for all Progressive profiles
+# placeholder until they are in the main tree, just in the overlay for now.
+#*sys-devel/architecture-darwin
+#*sys-devel/iokituser
+#*sys-devel/pb-makefiles
+#*sys-devel/pbx-jamfiles
+#*sys-devel/project-makefiles
+#*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/profile.bashrc b/profiles/default-darwin/macos/progressive/profile.bashrc
index c52c9a04a335..47d4d136af5f 100644
--- a/profiles/default-darwin/macos/progressive/profile.bashrc
+++ b/profiles/default-darwin/macos/progressive/profile.bashrc
@@ -1 +1,18 @@
-export MACOSX_DEPLOYMENT_TARGET="10.3" \ No newline at end of file
+export MACOSX_DEPLOYMENT_TARGET="10.4"
+
+# <usata@gentoo.org> (23 Sep 2004)
+# /usr/X11R6 is not in our PATH
+export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/X11R6/lib/pkgconfig"
+
+# add Python.framework dirs to path
+[ -d /System/Library/Frameworks/Python.framework/Versions/Current/bin ] && \
+export PATH="${PATH}:/System/Library/Frameworks/Python.framework/Versions/Current/bin"
+[ -d /Library/Frameworks/Python.framework/Versions/Current/bin ] && \
+export PATH="${PATH}:/Library/Frameworks/Python.framework/Versions/Current/bin"
+
+alias libtool=glibtool
+alias libtoolize=glibtoolize
+export LIBTOOLIZE="glibtoolize"
+
+[ -x /usr/bin/gsed ] && alias sed=gsed
+
diff --git a/profiles/default-darwin/macos/progressive/virtuals b/profiles/default-darwin/macos/progressive/virtuals
index 3d8184cf24ab..e05c33cc21d9 100644
--- 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
diff --git a/profiles/default-darwin/macos/use.mask b/profiles/default-darwin/macos/use.mask
index c189eb2ec303..28a8cd725040 100644
--- a/profiles/default-darwin/macos/use.mask
+++ b/profiles/default-darwin/macos/use.mask
@@ -1,73 +1,20 @@
# Add USE flags that don't work on Mac OS X here
-# these will more than likely never work on os x
-3dnow
-3dnowex
-alsa
-gpm
-jack-tmpfs
-mmx
-mmx2
-oss
-rtc
-v4l
-v4l2
-
-# these are still a ways off
-acl
-arts
-kde
-gnome
-
-# mach does not need caps
-caps
-
-# Skipping docs for now
-doc
-
-# tcl ebuild overwrites Apple's tcl, so we mask it (dev-lang/ruby)
-tcltk
-
-# gtk+ pulls in XML-Parser with USE="nls xml", so Perl issue should
-# be resolved first before keywording them
-gtk
-gtk2
-
-# masking these until we get deps sorted out
-mikmod
-xmms
-
-# net-misc/dante fails to compile, so we mask it until we succeed
-# (dev-lang/ruby, net-misc/lftp)
-socks5
-
-# 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
-directfb
-empress
-empress-bcs
-esoob
-fbcon
-filepro
-frontbase
-hyperwave
-informix
-ingres
-oci8
-oracle7
-pfpro
-selinux
-solid
-svga
-sybase
-sybase-ct
-
-djbfft
+# needs a lot of packages ported before its usable.
+xemacs
+smartcard
+
+# Requires non-apple hardware, so at least until x86-macos, we won't be able to test these.
+i8x0
+matrox
+
+# Masked until we can get these ported.
+dts
+dvb
+ieee1394
+lirc
+live
+mpi
+mysql
perl
+sasl
diff --git a/profiles/default-darwin/macos/virtuals b/profiles/default-darwin/macos/virtuals
index 89adf682b855..fb7139d51f87 100644
--- a/profiles/default-darwin/macos/virtuals
+++ b/profiles/default-darwin/macos/virtuals
@@ -1,18 +1,17 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-darwin/macos/virtuals,v 1.1.1.1 2005/11/30 09:48:41 chriswhite Exp $
-# Use this virtuals file to either override the base profile's defined
-# virtuals, or add virtuals that are specific to this family of profiles
+# Use this virtuals file to either override the Darwin base profile's defined
+# virtuals, or add virtuals that are specific to the Mac OS X profiles
-virtual/bootloader sys-boot/bootx
-virtual/commonlisp dev-lisp/sbcl
-virtual/kernel sys-libs/libsystem
-virtual/libc sys-libs/libsystem
-virtual/logger app-admin/sysklogd
+virtual/commonlisp dev-lisp/clisp
virtual/mta mail-mta/postfix
virtual/glu x11-base/apple-xfree
virtual/x11 x11-base/apple-xfree
virtual/xft x11-base/apple-xfree
virtual/opengl x11-base/apple-xfree
-virtual/blackbox x11-wm/fluxbox \ No newline at end of file
+virtual/blackbox x11-wm/fluxbox
+virtual/jdk dev-java/sun-jdk
+virtual/jre dev-java/sun-jdk
+sys-apps/coreutils sys-apps/coreutils-darwin
diff --git a/profiles/default-darwin/make.defaults b/profiles/default-darwin/make.defaults
index 4f44481bd3d3..08d59e27f904 100644
--- a/profiles/default-darwin/make.defaults
+++ b/profiles/default-darwin/make.defaults
@@ -1,6 +1,23 @@
-# System-wide defaults for a basic darwin system
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
-# 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*! \ No newline at end of file
+# System-wide defaults for all Darwin profiles
+# This file should rarely need to be changed
+
+# ccache settings for avoiding /root
+CCACHE_DIR="/var/root/.ccache"
+CFLAGS="-O2 -pipe"
+CXXFLAGS=${CFLAGS}
+MAKEOPTS="-j2"
+PLATFORM=$CHOST
+
+FETCHCOMMAND="/usr/bin/curl -f --connect-timeout 15 -# -o \${DISTDIR}/\${FILE} \${URI}"
+RESUMECOMMAND="/usr/bin/curl -f --connect-timeout 15 -# -C - -o \${DISTDIR}/\${FILE} \${URI}"
+
+FEATURES="-sandbox -userpriv"
+
+USE="emboss"
+USE_EXPAND="LINGUAS USERLAND KERNEL ELIBC"
+USERLAND="Darwin"
+KERNEL="Darwin"
+ELIBC="Darwin"
diff --git a/profiles/default-darwin/od/packages.build b/profiles/default-darwin/od/packages.build
index fb3ba6ec218a..47298deb0fb2 100644
--- a/profiles/default-darwin/od/packages.build
+++ b/profiles/default-darwin/od/packages.build
@@ -1,6 +1,6 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-darwin/od/packages.build,v 1.1.1.1 2005/11/30 09:48:41 chriswhite Exp $
# This file describes the packages needed to build an OpenDarwin stage 1
@@ -33,7 +33,22 @@ sys-devel/cctools-extras
sys-devel/flex
sys-devel/gcc
sys-devel/gettext
+sys-devel/jam
sys-devel/make
sys-devel/patch
-sys-libs/glibc
-sys-libs/libstreams \ No newline at end of file
+sys-devel/pb_makefiles
+sys-devel/pbx_jamfiles
+sys-devel/project_makefiles
+sys-kernel/xnu-headers
+sys-libs/csu
+sys-libs/keymgr
+sys-libs/libc
+sys-libs/libinfo
+sys-libs/libinfo-headers
+sys-libs/libkvm
+sys-libs/libm
+sys-libs/libstreams
+sys-libs/libsystem
+sys-libs/libwrappers
+sys-libs/libnotify
+sys-libs/usernotification \ No newline at end of file
diff --git a/profiles/default-darwin/package.mask b/profiles/default-darwin/package.mask
index c8fd65d1f9ce..8b137891791f 100644
--- a/profiles/default-darwin/package.mask
+++ b/profiles/default-darwin/package.mask
@@ -1,4 +1 @@
-# ndimiduk@gentoo.org
-# masked until i can get the tests to pass or the patch gets merged upstream
-dev-libs/libsigsegv
diff --git a/profiles/default-darwin/packages b/profiles/default-darwin/packages
index 0ea643141abc..6a82ebc56fcb 100644
--- a/profiles/default-darwin/packages
+++ b/profiles/default-darwin/packages
@@ -1,11 +1,13 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-darwin/packages,v 1.1.1.1 2005/11/30 09:48:41 chriswhite Exp $
-### Gentoo for Darwin profile ###
+### Gentoo/Darwin profile ###
-# Things we want emerge system to install
+# Things we want emerge system to install for all Darwin profiles
-*net-misc/wget
+*sys-apps/sed
*virtual/editor
-*sys-apps/sed \ No newline at end of file
+
+# we use curl for now
+-*net-misc/wget
diff --git a/profiles/default-darwin/use.mask b/profiles/default-darwin/use.mask
index 530ee4cb58d0..9745a9d8dff7 100644
--- a/profiles/default-darwin/use.mask
+++ b/profiles/default-darwin/use.mask
@@ -1,28 +1,29 @@
-# Add USE flags that don't work on Darwin here
+# Add USE flags that don't work on Darwin/OpenDarwin/OS X here
# these will more than likely never work on darwin
3dfx
3dnow
-3dnowex
+3dnowext
acpi
alsa
apm
+cap
caps
directfb
-divx4linux
djbfft
+emul-linux-x86
fbcon
fdftk
+fmod
+ggi
gpm
hardened
icc
icc-pgo
mmx
mmx2
-mzscheme
+on-the-fly-crypt # requires device-mapper
oss
-qdbm
-selinux
solid
sse
sse2
@@ -32,22 +33,28 @@ sybase-ct
rtc
uclibc
voodoo3
+pvm
v4l
v4l2
# need porting
acl
+apache2
arts
+cjk
doc
+esd
firebird
-fmod
gnome
-gtk
-gtk2
jack-tmpfs
kde
+libcaca
mikmod
mono
+mzscheme
+nas
+on-the-fly-crypt
+qdbm
socks5
xmms
@@ -71,4 +78,13 @@ ingres
oci8
oracle7
pfpro
-solid \ No newline at end of file
+solid
+
+# masks for x11-libs/qt
+nas
+odbc
+postgres
+
+# breaks clisp builds
+fastcgi
+
diff --git a/profiles/default-darwin/virtuals b/profiles/default-darwin/virtuals
index c5b2bb47c897..11af8110f094 100644
--- a/profiles/default-darwin/virtuals
+++ b/profiles/default-darwin/virtuals
@@ -1,9 +1,31 @@
-# Copyright 2004 Gentoo Foundation.
+# Copyright 2005 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-darwin/virtuals,v 1.1.1.1 2005/11/30 09:48:41 chriswhite Exp $
+# virtual/os-headers should actually be sys-kernel/xnu
+# but we have to wait until its in the tree
+
+virtual/aspell-dict app-dicts/aspell-en
+virtual/baselayout sys-apps/baselayout-darwin
virtual/bootloader sys-boot/bootx
-virtual/kernel sys-libs/libsystem
-virtual/libc sys-libs/libsystem
+virtual/commonlisp dev-lisp/sbcl
+virtual/cron sys-process/vixie-cron
+virtual/dhcpcd net-misc/dhcpcd
+virtual/editor app-editors/nano
+virtual/httpd-php dev-php/mod_php
+virtual/inetd sys-apps/xinetd
+virtual/krb5 app-crypt/mit-krb5
+virtual/libc sys-libs/libsystem
virtual/logger app-admin/sysklogd
-virtual/os-headers sys-libs/libsystem \ No newline at end of file
+virtual/lpr net-print/cups
+virtual/mda mail-filter/procmail
+virtual/mta mail-mta/postfix
+virtual/os-headers sys-libs/libsystem
+virtual/php dev-php/mod_php
+virtual/python dev-lang/python
+virtual/ruby dev-lang/ruby
+virtual/ssh net-misc/openssh
+virtual/tetex app-text/tetex
+virtual/textbrowser www-client/links
+virtual/w3m www-client/w3m
+virtual/emacs app-editors/emacs