summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 7 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index c3c30854b6a6..118e15b17cd4 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3152 2009/08/22 19:52:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3153 2009/08/22 20:57: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!
22 Aug 2009; Hans de Graaff <graaff@gentoo.org> package.mask:
+ Use proper name for activeresource.
+
+ 22 Aug 2009; Hans de Graaff <graaff@gentoo.org> package.mask:
Mask dev-ruby/ruby-amazon
22 Aug 2009; Hans de Graaff <graaff@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index f1b36f07442c..33163a50eb14 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10349 2009/08/22 19:52:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.10350 2009/08/22 20:57: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
@@ -44,13 +44,13 @@ dev-ruby/ruby-amazon
=dev-ruby/activerecord-2.0.5
=dev-ruby/actionmailer-2.0.5
=dev-ruby/actionpack-2.0.5
-=dev-ruby/actionresource-2.0.5
+=dev-ruby/activeresource-2.0.5
=dev-ruby/activesupport-2.0.5
=dev-ruby/rails-2.1.2-r1
=dev-ruby/activerecord-2.1.2
=dev-ruby/actionmailer-2.1.2
=dev-ruby/actionpack-2.1.2-r1
-=dev-ruby/actionresource-2.1.2
+=dev-ruby/activeresource-2.1.2
=dev-ruby/activesupport-2.1.2
# Samuli Suominen <ssuominen@gentoo.org> (21 Aug 2009)