summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2012-03-24 17:58:10 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2012-03-24 17:58:10 +0000
commit654a8083bd8302c81cc8f2bcba2348318429a242 (patch)
tree4b5d3c7f7df0b0863b920ef2147b46e326dcbd99
parentVersion bump, organize configure options (diff)
downloadhistorical-654a8083bd8302c81cc8f2bcba2348318429a242.tar.gz
historical-654a8083bd8302c81cc8f2bcba2348318429a242.tar.bz2
historical-654a8083bd8302c81cc8f2bcba2348318429a242.zip
Unmask ghc-7.4.
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask8
2 files changed, 5 insertions, 8 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 7b65d46cf5e7..a76cd7f2049d 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6349 2012/03/24 12:48:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6350 2012/03/24 17:58:10 slyfox 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!
+ 24 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org> package.mask:
+ Unmask ghc-7.4.
+
24 Mar 2012; Pacho Ramos <pacho@gentoo.org> package.mask:
Mask some packages for removal.
diff --git a/profiles/package.mask b/profiles/package.mask
index 7818264942e3..da75f85e9922 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13609 2012/03/24 12:48:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13610 2012/03/24 17:58:10 slyfox 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
@@ -327,12 +327,6 @@ net-ftp/twoftpd
# No upstream, outdated, see bug #403377. Removal in a
# month.
app-i18n/man-pages-cs
-
-# Sergei Trofimovich <slyfox@gentoo.org> (04 Mar 2012)
-# The experimental ghc-7.4 branch
->=dev-lang/ghc-7.2
->=dev-haskell/haddock-2.9.2.20110721
->=dev-vcs/git-annex-3.20120227
# Samuli Suominen <ssuominen@gentoo.org> (29 Feb 2012)
# The old version of gnunet in portage is broken with the