Move zlib mask up, since it breaks everywhere but on Linux

diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index 01b067f07bb636d601048b86011526fe918611f2..254c5a43ad11d59756822e9635c269dface42930 100644 (file)
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for profiles/prefix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.170 2010/04/16 11:24:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.171 2010/04/18 15:48:54 grobian Exp $
+
+  18 Apr 2010; Fabian Groffen <grobian@gentoo.org>
+  darwin/macos/10.4/ppc64/package.mask, darwin/macos/10.5/x64/package.mask,
+  darwin/macos/10.6/x64/package.mask, linux/package.mask, package.mask,
+  sunos/solaris/5.9/sparc64/package.mask,
+  sunos/solaris/5.10/sparc64/package.mask,
+  sunos/solaris/5.10/x64/package.mask,
+  sunos/solaris/5.11/sparc64/package.mask,
+  sunos/solaris/5.11/x64/package.mask:
+  Move zlib mask up, since it breaks everywhere but on Linux
 
   16 Apr 2010; Fabian Groffen <grobian@gentoo.org>
   +darwin/macos/10.4/ppc64/package.mask, darwin/macos/10.5/x64/package.mask,

diff --git a/profiles/prefix/darwin/macos/10.4/ppc64/package.mask b/profiles/prefix/darwin/macos/10.4/ppc64/package.mask
index 8c6b63bd4d34112c631931b09b483a0fd1c7fb8c..948600cb5d5f8f273dc7325a5c0dc7517e6b5a93 100644 (file)
--- a/profiles/prefix/darwin/macos/10.4/ppc64/package.mask
+++ b/profiles/prefix/darwin/macos/10.4/ppc64/package.mask
@@ -1,7 +1,3 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc64/package.mask,v 1.1 2010/04/16 11:24:32 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (16 Apr 2010)
-# installs a broken zlib.h on 64-bits systems, bug #310209
-=sys-libs/zlib-1.2.4
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc64/package.mask,v 1.2 2010/04/18 15:48:55 grobian Exp $

diff --git a/profiles/prefix/darwin/macos/10.5/x64/package.mask b/profiles/prefix/darwin/macos/10.5/x64/package.mask
index a1c916d245a1d2cd6897ccefac4857ef6e7b3c0b..5f02bc8e6f19b7e2d17c46f32585f9f97b6ce0db 100644 (file)
--- a/profiles/prefix/darwin/macos/10.5/x64/package.mask
+++ b/profiles/prefix/darwin/macos/10.5/x64/package.mask
@@ -1,7 +1,3 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/package.mask,v 1.3 2010/04/16 11:24:33 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (16 Apr 2010)
-# installs a broken zlib.h on 64-bits systems, bug #310209
-=sys-libs/zlib-1.2.4
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/package.mask,v 1.4 2010/04/18 15:48:55 grobian Exp $

diff --git a/profiles/prefix/darwin/macos/10.6/x64/package.mask b/profiles/prefix/darwin/macos/10.6/x64/package.mask
index 0fee55c5db70fff6a4b513cc610b8f669de33680..a0899085debed89aa0ee26fe8624b3ebb0d6b4a7 100644 (file)
--- a/profiles/prefix/darwin/macos/10.6/x64/package.mask
+++ b/profiles/prefix/darwin/macos/10.6/x64/package.mask
@@ -1,7 +1,3 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x64/package.mask,v 1.3 2010/04/16 11:24:33 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (16 Apr 2010)
-# installs a broken zlib.h on 64-bits systems, bug #310209
-=sys-libs/zlib-1.2.4
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x64/package.mask,v 1.4 2010/04/18 15:48:55 grobian Exp $

diff --git a/profiles/prefix/linux/package.mask b/profiles/prefix/linux/package.mask
index fe420c0179cd22d422518657a8a38b821cd55cc6..ab7fa7f6b764d4477339e40e218279c987ced648 100644 (file)
--- a/profiles/prefix/linux/package.mask
+++ b/profiles/prefix/linux/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/package.mask,v 1.2 2009/10/15 19:49:42 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/package.mask,v 1.3 2010/04/18 15:48:55 grobian Exp $
+
+# Fabian Groffen <grobian@gentoo.org> (16 Apr 2010)
+# installs a broken zlib.h on all but Linux systems, bug #310209
+-=sys-libs/zlib-1.2.4
 
 # Jeremy Olexa <darkside@gentoo.org> (15 Oct 2009)
 # Some wierd issue that prevents xulrunner from linking properly and completely

diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index dafd7710415134d4faaa3eff641ad53d446aea06..e32bf26f258ea59c47fe36f2e8acd71e956d28b6 100644 (file)
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Id: package.mask,v 1.56 2010/04/06 19:17:25 darkside Exp $
+# $Id: package.mask,v 1.57 2010/04/18 15:48:54 grobian Exp $
 # When you add an entry to this file, add your name, the date, and an
 # explanation of why something is getting masked.  This file is for
 # Prefix profiles only!
@@ -33,6 +33,10 @@
 #--- END OF EXAMPLES ---
 
 
+# Fabian Groffen <grobian@gentoo.org> (16 Apr 2010)
+# installs a broken zlib.h on 64-bits systems, bug #310209
+=sys-libs/zlib-1.2.4
+
 # Fabian Groffen <grobian@gentoo.org> (26 Mar 2010)
 # Scheduled for removal.  This version isn't worth the hassle of merging
 # to gx86, and hence will be removed.  If you are in desparate need of

diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask b/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask
index c7baa7d032807a5371d95a4336c521bca0c5d372..8af2a557fec1c313bfb914129e92d893d4185174 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask
+++ b/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask,v 1.2 2010/04/16 11:24:33 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (16 Apr 2010)
-# installs a broken zlib.h on 64-bits systems, bug #310209
-=sys-libs/zlib-1.2.4
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask,v 1.3 2010/04/18 15:48:56 grobian Exp $
 
 # Fabian Groffen <grobian@gentoo.org> (28 Dec 2009)
 # Fails to compile on Sparc (both 32-bits and 64-bits)

diff --git a/profiles/prefix/sunos/solaris/5.10/x64/package.mask b/profiles/prefix/sunos/solaris/5.10/x64/package.mask
index 8b3d71e83a48a22778349735b4c438653deb2c70..53057beef706a79fa0957acfc853adac74b169bd 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.10/x64/package.mask
+++ b/profiles/prefix/sunos/solaris/5.10/x64/package.mask
@@ -1,7 +1,3 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/x64/package.mask,v 1.3 2010/04/16 11:24:33 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (16 Apr 2010)
-# installs a broken zlib.h on 64-bits systems, bug #310209
-=sys-libs/zlib-1.2.4
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/x64/package.mask,v 1.4 2010/04/18 15:48:56 grobian Exp $

diff --git a/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask b/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask
index 33d8ca379cda73e6b63302a79cd34ec5fddd429d..846bcb79eed12645ba2a844aae3998e6d6f712e5 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask
+++ b/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask
@@ -1,7 +1,3 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask,v 1.1 2010/04/16 11:24:33 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (16 Apr 2010)
-# installs a broken zlib.h on 64-bits systems, bug #310209
-=sys-libs/zlib-1.2.4
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask,v 1.2 2010/04/18 15:48:56 grobian Exp $

diff --git a/profiles/prefix/sunos/solaris/5.11/x64/package.mask b/profiles/prefix/sunos/solaris/5.11/x64/package.mask
index 51eba95189aa1d45ebd7e85dcddc6740a1d1829c..03347cb0b4facb32bbce0f43fc3181f26c04c03a 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.11/x64/package.mask
+++ b/profiles/prefix/sunos/solaris/5.11/x64/package.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/x64/package.mask,v 1.3 2010/04/16 11:24:33 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (16 Apr 2010)
-# installs a broken zlib.h on 64-bits systems, bug #310209
-=sys-libs/zlib-1.2.4
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/x64/package.mask,v 1.4 2010/04/18 15:48:56 grobian Exp $
 
 # Fabian Groffen <grobian@gentoo.org> (24 May 2009)
 # causes SIGABORTS: (experienced with media-libs/mesa-7.4.2)

diff --git a/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask b/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask
index 3efc053029d28ac0306d8cbf8a898557b20abf02..6246813319b4286d117ec64631ccaa1a811f6b88 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask
+++ b/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask,v 1.2 2010/04/16 11:24:34 grobian Exp $
-
-# Fabian Groffen <grobian@gentoo.org> (16 Apr 2010)
-# installs a broken zlib.h on 64-bits systems, bug #310209
-=sys-libs/zlib-1.2.4
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask,v 1.3 2010/04/18 15:48:56 grobian Exp $
 
 # Jeremy Olexa <darkside@gentoo.org> (26 Aug 2008)
 # Requires that pthread.h defines pthread_atfork() but it doesn't on Solaris 9