Masks for perl/gtk+ on macos collision-protect profiles. Add python framework paths to profile.bashrc for things like scons. Also continue the lies and change to libtool-1.5.10-r4 in package.provided.

9 files changed, 52 insertions, 13 deletions

diff --git a/profiles/default-darwin/macos/10.3/package.mask b/profiles/default-darwin/macos/10.3/package.mask
index ac5f1376c09f..90fa75b6f469 100644
--- a/profiles/default-darwin/macos/10.3/package.mask
+++ b/profiles/default-darwin/macos/10.3/package.mask
@@ -11,9 +11,12 @@ dev-lang/perl
 dev-lang/python
 dev-libs/libprelude
 dev-libs/libxml2
+dev-perl/XML-Parser
+dev-util/intltool
 media-libs/a52dec
 net-misc/curl
 sys-apps/diffutils
+sys-apps/gawk
 sys-apps/grep
 sys-apps/texinfo
 sys-devel/gcc-apple
@@ -25,7 +28,7 @@ sys-devel/bison
 sys-devel/flex
 sys-devel/libperl
 sys-libs/ncurse
-
+x11-libs/gtk+
 ##
 # end collision-protect
 ##
diff --git a/profiles/default-darwin/macos/10.3/package.provided b/profiles/default-darwin/macos/10.3/package.provided
index 5b2740b1e995..0408c93dd902 100644
--- a/profiles/default-darwin/macos/10.3/package.provided
+++ b/profiles/default-darwin/macos/10.3/package.provided
@@ -107,7 +107,7 @@ sys-devel/flex-2.5.4a
 sys-devel/gcc-3.3.1495
 sys-devel/gdb-5.3.20030128 
 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
diff --git a/profiles/default-darwin/macos/10.3/use.mask b/profiles/default-darwin/macos/10.3/use.mask
index 57093db96afb..964b73bc35e4 100644
--- a/profiles/default-darwin/macos/10.3/use.mask
+++ b/profiles/default-darwin/macos/10.3/use.mask
@@ -3,3 +3,16 @@ tcltk
 
 # Collision-protect
 a52
+
+# 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
+
+# wxwindows needs wxGTK which in turn needs gtk+
+wxwindows
+
+
diff --git a/profiles/default-darwin/macos/10.4/package.mask b/profiles/default-darwin/macos/10.4/package.mask
index b0ff7ae46848..5716516e555f 100644
--- a/profiles/default-darwin/macos/10.4/package.mask
+++ b/profiles/default-darwin/macos/10.4/package.mask
@@ -10,9 +10,12 @@ app-shells/zsh
 dev-lang/perl
 dev-lang/python
 dev-libs/libxml2
+dev-perl/XML-Parser
+dev-util/intltool
 media-libs/a52dec
 net-misc/curl
 sys-apps/diffutils
+sys-apps/gawk
 sys-apps/grep
 sys-apps/texinfo
 sys-devel/gcc-apple
@@ -25,6 +28,7 @@ sys-devel/flex
 sys-devel/libperl
 sys-libs/ncurses
 sys-libs/readline
+x11-libs/gtk+
 ##
 # end collision-protect
 ##
diff --git a/profiles/default-darwin/macos/10.4/package.provided b/profiles/default-darwin/macos/10.4/package.provided
index dce47e54f277..c10008b18c35 100644
--- a/profiles/default-darwin/macos/10.4/package.provided
+++ b/profiles/default-darwin/macos/10.4/package.provided
@@ -112,7 +112,7 @@ 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
+sys-devel/libtool-1.5.10-r4
 sys-devel/m4-1.4
 sys-devel/make-3.80
 sys-devel/patch-2.5.8
diff --git a/profiles/default-darwin/macos/10.4/use.mask b/profiles/default-darwin/macos/10.4/use.mask
index 57093db96afb..0f2d5feb740b 100644
--- a/profiles/default-darwin/macos/10.4/use.mask
+++ b/profiles/default-darwin/macos/10.4/use.mask
@@ -3,3 +3,17 @@ tcltk
 
 # Collision-protect
 a52
+
+# 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
+
+# wxwindows needs wxGTK which in turn needs gtk+
+wxwindows
+
+
diff --git a/profiles/default-darwin/macos/progressive/packages b/profiles/default-darwin/macos/progressive/packages
index 7b5d41bbba23..157b2f82f532 100644
--- a/profiles/default-darwin/macos/progressive/packages
+++ b/profiles/default-darwin/macos/progressive/packages
@@ -1,8 +1,16 @@
 # 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.2 2005/05/10 02:14:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-darwin/macos/progressive/packages,v 1.3 2005/08/14 21:02:59 kito 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
 
diff --git a/profiles/default-darwin/macos/progressive/profile.bashrc b/profiles/default-darwin/macos/progressive/profile.bashrc
index f657cb3fdd2f..47d4d136af5f 100644
--- a/profiles/default-darwin/macos/progressive/profile.bashrc
+++ b/profiles/default-darwin/macos/progressive/profile.bashrc
@@ -2,9 +2,14 @@ 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"
 
+# 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"
diff --git a/profiles/default-darwin/macos/use.mask b/profiles/default-darwin/macos/use.mask
index 01cf700d0118..d3f3a15cf23f 100644
--- a/profiles/default-darwin/macos/use.mask
+++ b/profiles/default-darwin/macos/use.mask
@@ -1,13 +1,5 @@
 # Add USE flags that don't work on Mac OS X here
 
-# gtk+ pulls in XML-Parser with USE="nls xml", so Perl issue should
-# be resolved first before keywording them
-gtk
-gtk2
-
-# imlib depends on gtk+-1
-imlib
-
 # wxwindows needs wxGTK which in turn needs gtk+
 wxwindows