summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-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 11fae827710f..8df36e364ed4 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5984 2011/12/06 10:21:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5985 2011/12/06 13:08:40 graaff 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!
+ 06 Dec 2011; Hans de Graaff <graaff@gentoo.org> package.mask:
+ Remove ruby-activeldap mask since the problematic version has been removed.
+
06 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> thirdpartymirrors:
Remove unused mirror://transcode with only listing 404's.
diff --git a/profiles/package.mask b/profiles/package.mask
index 007d849b9b13..0c95cee58218 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13305 2011/12/06 10:51:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13306 2011/12/06 13:08:40 graaff 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
@@ -362,12 +362,6 @@ app-admin/mon
# Masked while testing potentially dangerous utility
dev-python/pypax
-# Hans de Graaff <graaff@gentoo.org> (04 Oct 2011)
-# Mask stable version of ruby-activeldap since the sole version
-# of rails that it works with no longer in the tree. A new
-# version of ruby-activeldap should be stable soon, bug 384827.
-=dev-ruby/ruby-activeldap-1.2.1
-
# Michael Sterrett <mr_bones_@gentoo.org> (29 Sep 2011)
# This version is added for ebuild testing only.
# Bug reports about anything other than the package