diff options
author | Kito Danya Dietrich <kito@gentoo.org> | 2005-08-06 22:43:40 +0000 |
---|---|---|
committer | Kito Danya Dietrich <kito@gentoo.org> | 2005-08-06 22:43:40 +0000 |
commit | 8aa30d9aec68a86ecc11b9fe73f6e8e80a4447e9 (patch) | |
tree | 20fa078b785bf2e1494521ae9f44bf0c6a0fc3aa /profiles | |
parent | New version. Added 20050429 to x86. Removed old version. (diff) | |
download | gentoo-2-8aa30d9aec68a86ecc11b9fe73f6e8e80a4447e9.tar.gz gentoo-2-8aa30d9aec68a86ecc11b9fe73f6e8e80a4447e9.tar.bz2 gentoo-2-8aa30d9aec68a86ecc11b9fe73f6e8e80a4447e9.zip |
fix jre/jdk in virtuals and package.provided
Diffstat (limited to 'profiles')
5 files changed, 17 insertions, 7 deletions
diff --git a/profiles/default-darwin/macos/10.3/package.provided b/profiles/default-darwin/macos/10.3/package.provided index 437ebafd8448..47d6a0bc26af 100644 --- a/profiles/default-darwin/macos/10.3/package.provided +++ b/profiles/default-darwin/macos/10.3/package.provided @@ -17,7 +17,8 @@ app-text/enscript-1.6.1 app-text/rcs-5.7 app-text/texi2html-1.57 dev-java/javascriptcore-96 -dev-java/sun-j2sdk-1.4.2 +dev-java/sun-jdk-1.4.2.08 +dev-java/sun-jre-bin-1.4.2.08 dev-lang/objc4-235 dev-lang/perl-5.8.1 dev-lang/python-2.3.3 diff --git a/profiles/default-darwin/macos/10.4/package.provided b/profiles/default-darwin/macos/10.4/package.provided index fdfff4bf811b..7c7889ba89e5 100644 --- a/profiles/default-darwin/macos/10.4/package.provided +++ b/profiles/default-darwin/macos/10.4/package.provided @@ -18,7 +18,8 @@ app-text/rcs-5.7 app-text/texi2html-1.57 dev-db/mysql-4.1.10a dev-java/javascriptcore-96 -dev-java/sun-j2sdk-1.4.2 +dev-java/sun-jdk-1.4.2.08 +dev-java/sun-jre-bin-1.4.2.08 dev-lang/objc4-235 dev-lang/perl-5.8.6 dev-lang/python-2.3.5 diff --git a/profiles/default-darwin/macos/progressive/package.provided b/profiles/default-darwin/macos/progressive/package.provided index 7d05ed5f6fec..9486f10eb1a3 100644 --- a/profiles/default-darwin/macos/progressive/package.provided +++ b/profiles/default-darwin/macos/progressive/package.provided @@ -19,6 +19,7 @@ app-text/texi2html-1.57 dev-db/mysql-4.1.10a dev-java/javascriptcore-96 dev-java/sun-jdk-1.5 +dev-java/sun-jre-bin-1.5.0.04 dev-lang/objc4-235 dev-lang/perl-5.8.6 dev-lang/python-2.3.5 diff --git a/profiles/default-darwin/macos/progressive/profile.bashrc b/profiles/default-darwin/macos/progressive/profile.bashrc index 3bf31684a126..f657cb3fdd2f 100644 --- a/profiles/default-darwin/macos/progressive/profile.bashrc +++ b/profiles/default-darwin/macos/progressive/profile.bashrc @@ -1,7 +1,13 @@ -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" alias libtool=glibtool alias libtoolize=glibtoolize +export LIBTOOLIZE="glibtoolize" [ -x /usr/bin/gsed ] && alias sed=gsed diff --git a/profiles/default-darwin/macos/virtuals b/profiles/default-darwin/macos/virtuals index 4191b8e4af69..0a2ba35c8379 100644 --- a/profiles/default-darwin/macos/virtuals +++ b/profiles/default-darwin/macos/virtuals @@ -1,15 +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/virtuals,v 1.6 2005/08/05 19:54:15 gongloo Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-darwin/macos/virtuals,v 1.7 2005/08/06 22:43:40 kito Exp $ # 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/commonlisp dev-lisp/sbcl 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 virtual/jdk dev-java/sun-j2sdk +virtual/jre dev-java/sun-jre-bin |