revert mask for e2fsprogs in Prefix, I haven't gotten around to fixing it in one way or another

2 files changed, 25 insertions, 16 deletions

diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index 353b2dc24142..fe84f6aaf7f4 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for profiles/prefix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.158 2010/03/14 21:23:55 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.159 2010/03/19 07:23:50 grobian Exp $
+
+  19 Mar 2010; Fabian Groffen <grobian@gentoo.org> package.mask:
+  Revert e2fsprogs mask for the time being, since it's the only compiling
+  version for us.
 
   14 Mar 2010; Fabian Groffen <grobian@gentoo.org> package.use.mask:
   drop use-masks for darcs:doc and subversion:nowebdav, we do have texlive
diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index b9b7aa9cb6a2..c4d213f65490 100644
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Id: package.mask,v 1.50 2010/03/17 17:43:31 sping Exp $
+# $Id: package.mask,v 1.51 2010/03/19 07:23:50 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!
@@ -36,6 +36,25 @@
 # Needs some testing on prefixed packages (not all were fixed in gx86)
 >=sys-devel/autoconf-2.64
 
+# Mike Frysinger <vapier@gentoo.org> (07 Mar 2010)
+# Very old packages that people should have upgraded away from
+# long ago.  Courtesy mask ... time to upgrade.
+# Added <sys-fs/e2fsprogs as well (halcy0n)
+# prefix: unmask, it's the only thing that compiles for us
+-sys-libs/com_err
+-sys-libs/ss
+-<sys-libs/e2fsprogs-libs-1.41.8
+-<sys-fs/e2fsprogs-1.41.9
+# Fabian Groffen <grobian@gentoo.org> (26 Jul 2009)
+# util-linux doesn't work on non-Linux and doesn't work in Prefix.  This
+# release of e2fsprogs switches from using internal libuuid and libblkid
+# to those provided by util-linux.  In Prefix (but probably for FreeBSD
+# also) we need to probably create virtuals for these, so we can make an
+# e2fsprogs-uuid ebuild or something to provide these libs with on Prefix.
+>=sys-libs/e2fsprogs-libs-1.41.8
+>=sys-fs/e2fsprogs-1.41.8
+>=sys-apps/util-linux-2.16
+
 # Fabian Groffen <grobian@gentoo.org> (27 Dec 2009)
 # Needs some controlled testing before being thrown at all users.
 # (Prefix modifications may not work properly)
@@ -54,16 +73,6 @@ dev-lang/python:3.0
 dev-lang/python:3.1
 =dev-python/beautifulsoup-3.1.0.1-r1
 
-# Fabian Groffen <grobian@gentoo.org> (26 Jul 2009)
-# util-linux doesn't work on non-Linux and doesn't work in Prefix.  This
-# release of e2fsprogs switches from using internal libuuid and libblkid
-# to those provided by util-linux.  In Prefix (but probably for FreeBSD
-# also) we need to probably create virtuals for these, so we can make an
-# e2fsprogs-uuid ebuild or something to provide these libs with on Prefix.
->=sys-libs/e2fsprogs-libs-1.41.8
->=sys-fs/e2fsprogs-1.41.8
->=sys-apps/util-linux-2.16
-
 # Jeremy Olexa <darkside@gentoo.org> (30 Jun 2009)
 # The PAM auth system just will not work in Gentoo Prefix, instead the host auth
 # system should be used.
@@ -148,10 +157,6 @@ net-fs/openafs
 # needs cups or lprng which we both don't have
 >=net-print/xfprint-4.4.3
 
-# Fabian Groffen <grobian@gentoo.org> (06 Jul 2008)
-# Needs to have bug #230981 sorted out (e2fsprogs dependency)
-~x11-libs/libSM-1.1.0
-
 # Jeremy Olexa <darkside@gentoo.org> (16 May 2008)
 # distcc-config --install is rather 'interesting' in prefix and I am not 
 # convinced that it works correctly. Also, you will have to add CHOST=<...> to