darwin profile cleanup

9 files changed, 62 insertions, 89 deletions

diff --git a/profiles/default-darwin/macos/10.3/profile.bashrc b/profiles/default-darwin/macos/10.3/profile.bashrc
index 1fd68017cf90..b1d8a5493a0c 100644
--- a/profiles/default-darwin/macos/10.3/profile.bashrc
+++ b/profiles/default-darwin/macos/10.3/profile.bashrc
@@ -1,8 +1,9 @@
+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
diff --git a/profiles/default-darwin/macos/10.4/profile.bashrc b/profiles/default-darwin/macos/10.4/profile.bashrc
index 7d0846872d68..8cda367b2dda 100644
--- a/profiles/default-darwin/macos/10.4/profile.bashrc
+++ b/profiles/default-darwin/macos/10.4/profile.bashrc
@@ -2,4 +2,4 @@ export MACOSX_DEPLOYMENT_TARGET="10.4"
 
 alias libtool=glibtool
 alias libtoolize=glibtoolize
-alias sed=gsed
+alias sed=gsed
\ No newline at end of file
diff --git a/profiles/default-darwin/macos/packages b/profiles/default-darwin/macos/packages
index 48bf24384df9..787e38c25df7 100644
--- a/profiles/default-darwin/macos/packages
+++ b/profiles/default-darwin/macos/packages
@@ -1,9 +1,7 @@
-### Gentoo for Mac OS X profile ###
-
-# Maintained by Pieter Van den Abeele <pvdabeel@gentoo.org> 
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
 
-# Things we want emerge system to install
+### Gentoo for Mac OS X profile ###
 
-*net-misc/wget
-*virtual/editor
-*sys-apps/sed
\ No newline at end of file
+# Packages we want emerge system to install in addition to default-darwin/packages
\ No newline at end of file
diff --git a/profiles/default-darwin/macos/use.mask b/profiles/default-darwin/macos/use.mask
index c189eb2ec303..3a891424c851 100644
--- a/profiles/default-darwin/macos/use.mask
+++ b/profiles/default-darwin/macos/use.mask
@@ -1,73 +1,11 @@
 # 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
 perl
+
+# tcl ebuild overwrites Apple's tcl, so we mask it (dev-lang/ruby)
+tcltk
\ No newline at end of file
diff --git a/profiles/default-darwin/macos/virtuals b/profiles/default-darwin/macos/virtuals
index 89adf682b855..8c6f24ffd188 100644
--- a/profiles/default-darwin/macos/virtuals
+++ b/profiles/default-darwin/macos/virtuals
@@ -2,17 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header:
 
-# 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/mta	     	mail-mta/postfix
-virtual/glu		x11-base/apple-xfree
-virtual/x11		x11-base/apple-xfree
-virtual/xft		x11-base/apple-xfree
+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
diff --git a/profiles/default-darwin/od/packages.build b/profiles/default-darwin/od/packages.build
new file mode 100644
index 000000000000..fb3ba6ec218a
--- /dev/null
+++ b/profiles/default-darwin/od/packages.build
@@ -0,0 +1,39 @@
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
+
+# This file describes the packages needed to build an OpenDarwin stage 1
+
+app-arch/bzip2
+app-arch/gzip
+app-arch/tar
+app-editors/nano
+app-shells/bash
+dev-lang/python
+net-misc/rsync
+net-misc/wget
+sys-apps/baselayout-darwin
+sys-apps/bootstrap_cmds
+sys-apps/coreutils
+sys-apps/debianutils
+sys-apps/diffutils
+sys-apps/file
+sys-apps/findutils
+sys-apps/gawk
+sys-apps/grep
+sys-apps/less
+sys-apps/net-tools
+sys-apps/portage
+sys-apps/sed
+sys-apps/texinfo
+sys-devel/binutils
+sys-devel/bison
+sys-devel/cctools
+sys-devel/cctools-extras
+sys-devel/flex
+sys-devel/gcc
+sys-devel/gettext
+sys-devel/make
+sys-devel/patch
+sys-libs/glibc
+sys-libs/libstreams
\ No newline at end of file
diff --git a/profiles/default-darwin/packages b/profiles/default-darwin/packages
index 0ea643141abc..0c7d5dea7f2e 100644
--- a/profiles/default-darwin/packages
+++ b/profiles/default-darwin/packages
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: 
 
-### 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
 *virtual/editor
diff --git a/profiles/default-darwin/use.mask b/profiles/default-darwin/use.mask
index 530ee4cb58d0..430f54c081ca 100644
--- a/profiles/default-darwin/use.mask
+++ b/profiles/default-darwin/use.mask
@@ -1,4 +1,4 @@
-# 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
@@ -13,6 +13,7 @@ divx4linux
 djbfft
 fbcon
 fdftk
+fmod
 gpm
 hardened
 icc
@@ -40,10 +41,7 @@ acl
 arts
 doc
 firebird
-fmod
 gnome
-gtk
-gtk2
 jack-tmpfs
 kde
 mikmod
diff --git a/profiles/default-darwin/virtuals b/profiles/default-darwin/virtuals
index c5b2bb47c897..a231da974a6c 100644
--- a/profiles/default-darwin/virtuals
+++ b/profiles/default-darwin/virtuals
@@ -2,6 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header:
 
+# virtual/kernel and virtual/os-headers should actually be sys-kernel/xnu
+# but we have to wait until its in the tree
+
 virtual/bootloader	sys-boot/bootx
 virtual/kernel		sys-libs/libsystem
 virtual/libc	   	sys-libs/libsystem