summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-08-23 23:01:23 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-08-23 23:01:23 +0000
commit95964cb5d0916df57013c7b6c114a9b0e76aec52 (patch)
tree6e2b0a6da1a0757f81d52755d8b94ea6157de304 /profiles/default-linux
parentUse a mirror:// URI, and other misc. corrections. (diff)
downloadgentoo-2-95964cb5d0916df57013c7b6c114a9b0e76aec52.tar.gz
gentoo-2-95964cb5d0916df57013c7b6c114a9b0e76aec52.tar.bz2
gentoo-2-95964cb5d0916df57013c7b6c114a9b0e76aec52.zip
Updating maskings in multilib subprofile. Renamed 'gcc33' profile 'java' and additionally mask newer glibc which break java.
Diffstat (limited to 'profiles/default-linux')
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/java/24headers/package.mask (renamed from profiles/default-linux/sparc/sparc64/dev/gcc33/24headers/package.mask)2
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/java/24headers/packages (renamed from profiles/default-linux/sparc/sparc64/dev/gcc33/24headers/packages)2
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/java/24headers/parent (renamed from profiles/default-linux/sparc/sparc64/dev/gcc33/24headers/parent)2
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/java/package.mask7
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/java/packages (renamed from profiles/default-linux/sparc/sparc64/dev/gcc33/packages)2
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/java/parent (renamed from profiles/default-linux/sparc/sparc64/dev/gcc33/parent)2
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/multilib/package.mask9
-rw-r--r--profiles/default-linux/sparc/sparc64/dev/multilib/packages5
8 files changed, 21 insertions, 10 deletions
diff --git a/profiles/default-linux/sparc/sparc64/dev/gcc33/24headers/package.mask b/profiles/default-linux/sparc/sparc64/dev/java/24headers/package.mask
index 72efab0a45d1..3008e54ecc5d 100644
--- a/profiles/default-linux/sparc/sparc64/dev/gcc33/24headers/package.mask
+++ b/profiles/default-linux/sparc/sparc64/dev/java/24headers/package.mask
@@ -1,2 +1,2 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/gcc33/24headers/package.mask,v 1.1 2005/04/06 06:05:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/java/24headers/package.mask,v 1.1 2005/08/23 23:01:22 eradicator Exp $
-<sys-boot/silo-1.4.9
diff --git a/profiles/default-linux/sparc/sparc64/dev/gcc33/24headers/packages b/profiles/default-linux/sparc/sparc64/dev/java/24headers/packages
index dc3cc448a647..ad06049d617d 100644
--- a/profiles/default-linux/sparc/sparc64/dev/gcc33/24headers/packages
+++ b/profiles/default-linux/sparc/sparc64/dev/java/24headers/packages
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/gcc33/24headers/packages,v 1.1 2005/03/07 00:05:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/java/24headers/packages,v 1.1 2005/08/23 23:01:22 eradicator Exp $
# Use 2.4 linux-headers by default
-*virtual/os-headers
diff --git a/profiles/default-linux/sparc/sparc64/dev/gcc33/24headers/parent b/profiles/default-linux/sparc/sparc64/dev/java/24headers/parent
index 5212cf6e5b9d..1ade522b6fe2 100644
--- a/profiles/default-linux/sparc/sparc64/dev/gcc33/24headers/parent
+++ b/profiles/default-linux/sparc/sparc64/dev/java/24headers/parent
@@ -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-linux/sparc/sparc64/dev/gcc33/24headers/parent,v 1.2 2005/05/10 02:14:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/java/24headers/parent,v 1.1 2005/08/23 23:01:22 eradicator Exp $
# This file describes the parent profile to this. In most cases this will
# just be the name of the parent directory
diff --git a/profiles/default-linux/sparc/sparc64/dev/java/package.mask b/profiles/default-linux/sparc/sparc64/dev/java/package.mask
new file mode 100644
index 000000000000..f809ad9e3cc0
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc64/dev/java/package.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/java/package.mask,v 1.1 2005/08/23 23:01:22 eradicator Exp $
+
+# Jeremy Huddleston <eradicator@gentoo.org>
+# Something between 2.3.3.20040420 and 2.3.4.20040619 breaks blackdown-jdk
+>=sys-libs/glibc-2.3.4
diff --git a/profiles/default-linux/sparc/sparc64/dev/gcc33/packages b/profiles/default-linux/sparc/sparc64/dev/java/packages
index be09edf770f7..2119b8b0666e 100644
--- a/profiles/default-linux/sparc/sparc64/dev/gcc33/packages
+++ b/profiles/default-linux/sparc/sparc64/dev/java/packages
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/gcc33/packages,v 1.2 2005/03/07 01:42:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/java/packages,v 1.1 2005/08/23 23:01:22 eradicator Exp $
# Lock to gcc-3.3.x
-*>=sys-devel/gcc-3.4.3-r1
diff --git a/profiles/default-linux/sparc/sparc64/dev/gcc33/parent b/profiles/default-linux/sparc/sparc64/dev/java/parent
index 3aa6bcfe4438..cd4bbd8ec9c9 100644
--- a/profiles/default-linux/sparc/sparc64/dev/gcc33/parent
+++ b/profiles/default-linux/sparc/sparc64/dev/java/parent
@@ -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-linux/sparc/sparc64/dev/gcc33/parent,v 1.2 2005/05/10 02:14:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/java/parent,v 1.1 2005/08/23 23:01:22 eradicator Exp $
# This file describes the parent profile to this. In most cases this will
# just be the name of the parent directory
diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask b/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask
index efc44127bfd8..e0eb75fd20af 100644
--- a/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask
+++ b/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask,v 1.4 2005/03/09 08:15:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask,v 1.5 2005/08/23 23:01:23 eradicator Exp $
# Jeremy Huddleston <eradicator@gentoo.org> 2005.03.06
# sys-devel/gcc brings in our 64bit compiler
@@ -7,7 +7,6 @@ sys-devel/gcc-sparc64
# Jeremy Huddleston <eradicator@gentoo.org> 2005.03.08
# Older perl versions don't set the correct archlib path for multilib
# profiles where CHOST != $(get_abi_CHOST)
-<dev-lang/perl-5.8.6-r3
<sys-devel/libperl-5.8.6
# Jeremy Huddleston <eradicator@gentoo.org> 2005.03.08
@@ -15,3 +14,9 @@ sys-devel/gcc-sparc64
<dev-db/postgresql-7.4.7-r1
=dev-db/postgresql-8.0.0
=dev-db/postgresql-8.0.1
+
+# Jeremy Huddleston <eradicator@gentoo.org> 2005.08.23
+# These old versions don't work when the default toolchain target is not
+# the desired target
+=sys-devel/gcc-config-1*
+=sys-devel/binutils-config-1*
diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/packages b/profiles/default-linux/sparc/sparc64/dev/multilib/packages
index 77c79b0ca36d..3c1d09a5de26 100644
--- a/profiles/default-linux/sparc/sparc64/dev/multilib/packages
+++ b/profiles/default-linux/sparc/sparc64/dev/multilib/packages
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/packages,v 1.2 2005/03/07 01:42:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/packages,v 1.3 2005/08/23 23:01:23 eradicator Exp $
# sys-devel/gcc brings in our 64bit compiler
-*sys-devel/gcc-sparc64
@@ -10,6 +10,5 @@
*>=sys-devel/binutils-2.15.92.0.2-r2
*>=sys-devel/gcc-3.4.3-r1
*>=sys-libs/glibc-2.3.4.20050125-r1
-*>=sys-devel/gcc-config-1.4.0
+*>=sys-devel/gcc-config-2.0.0
>=sys-devel/distcc-2.18.3-r4
-