summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Kolmodin <kolmodin@gentoo.org>2010-06-28 21:35:13 +0000
committerLennart Kolmodin <kolmodin@gentoo.org>2010-06-28 21:35:13 +0000
commitb2cb13da7f7e5a2b0edc6a149169ee10da0efba4 (patch)
tree59779fac1b1492297492c2038a239b8f541362a7 /profiles
parentCorrected prefix import, #325055 (diff)
downloadgentoo-2-b2cb13da7f7e5a2b0edc6a149169ee10da0efba4.tar.gz
gentoo-2-b2cb13da7f7e5a2b0edc6a149169ee10da0efba4.tar.bz2
gentoo-2-b2cb13da7f7e5a2b0edc6a149169ee10da0efba4.zip
Unmask dev-lang/ghc-6.12.3, but keep 6.12.{1,2}* masked.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask10
2 files changed, 9 insertions, 6 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index aa06aa6e9df0..b36c41d835de 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4352 2010/06/28 21:20:05 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4353 2010/06/28 21:35:13 kolmodin Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
28 Jun 2010; Lennart Kolmodin <kolmodin@gentoo.org> package.mask:
+ Unmask dev-lang/ghc-6.12.3, but keep ghc-6.12.{1,2} masked.
+
+ 28 Jun 2010; Lennart Kolmodin <kolmodin@gentoo.org> package.mask:
Masked dev-haskell/filepath for removal. It's part of dev-lang/ghc since
version 6.6.1, and with stable API since 6.8.1.
diff --git a/profiles/package.mask b/profiles/package.mask
index c65598dc7a33..a5208d432ba7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11716 2010/06/28 21:20:05 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11717 2010/06/28 21:35:13 kolmodin Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -901,10 +901,10 @@ dev-db/mysql-community
>=virtual/mysql-5.5
# Lennart Kolmodin <kolmodin@gentoo.org> (26 Jan 2010)
-# Masked GHC and friends for testing.
->=dev-lang/ghc-6.12
->=dev-haskell/haddock-2.6
-=app-admin/haskell-updater-1*
+# Masked earlier releases of dev-lang/ghc-6.12*.
+# We want to use ghc-6.12.3, not the older versions.
+=dev-lang/ghc-6.12.1*
+=dev-lang/ghc-6.12.2*
# Nirbheek Chauhan <nirbheek@gentoo.org> (25 Jan 2010)
# Final rc of networkmanager-0.8 and friends