summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-09-14 22:54:44 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-09-14 22:54:44 +0000
commit738f19775fe9cc9731b4de0368f6fe77792e7cad (patch)
treeb327a8b61fa1ce23e5b863c666d272102d0c1021 /profiles
parentAdd -fno-strict-aliasing for python2. (diff)
downloadgentoo-2-738f19775fe9cc9731b4de0368f6fe77792e7cad.tar.gz
gentoo-2-738f19775fe9cc9731b4de0368f6fe77792e7cad.tar.bz2
gentoo-2-738f19775fe9cc9731b4de0368f6fe77792e7cad.zip
unmask ocaml 4.01.0
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 5 insertions, 6 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 9c798905934d..150b455eca7f 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8239 2013/09/14 14:30:28 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8240 2013/09/14 22:54:44 aballier 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!
+ 14 Sep 2013; Alexis Ballier <aballier@gentoo.org> package.mask:
+ unmask ocaml 4.01.0
+
14 Sep 2013; Amadeusz Żołnowski <aidecoe@gentoo.org>
desc/dracut_modules.desc:
Added dash use expand to dracut_modules.
diff --git a/profiles/package.mask b/profiles/package.mask
index d6cff6c7bb65..c37e00748e7e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15105 2013/09/14 13:59:29 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15106 2013/09/14 22:54:44 aballier 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
@@ -259,10 +259,6 @@ dev-ruby/programming-ruby
# Bug #339409. Masked for removal in 30 days.
dev-python/pyme
-# Alexis Ballier <aballier@gentoo.org> (15 Aug 2013)
-# Beta release, breaks some packages
->=dev-lang/ocaml-4.01.0_beta1
-
# Tom Wijsman <TomWij@gentoo.org> (15 Aug 2013)
# Dependencies are unable to satisfy current version,
# broken; needs a version bump from bug #475552.