summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask9
2 files changed, 5 insertions, 9 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index c6184dd6a3f6..9ba8af393b11 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4104 2010/04/10 17:19:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4105 2010/04/11 11:30:17 nelchael 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!
+ 11 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org> package.mask:
+ Unmask Resin 4.0.3 and related packages.
+
10 Apr 2010; Pacho Ramos <pacho@gentoo.org> package.mask:
Mask upcoming emul-linux-x86-opengl version
diff --git a/profiles/package.mask b/profiles/package.mask
index 4bedd830ea4c..d7c5402a81d9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11446 2010/04/10 19:00:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11447 2010/04/11 11:30:17 nelchael 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
@@ -346,13 +346,6 @@ dev-perl/XML-LibXML-Common
# Merged in dev-perl/Class-XSAccessor (#275520)
dev-perl/Class-XSAccessor-Array
-# Krzysztof Pawlik <nelchael@gentoo.org> (23 Feb 2010)
-# Masked for testing.
->=dev-java/resin-servlet-api-4.0.3
->=www-servers/resin-4.0.3
->=www-apache/mod_caucho-4.0.3
-dev-java/mojarra
-
# Robert Piasek <dagger@gentoo.org> (23 Feb 2010)
# Masking libmapi as it depends on masked samba4
=net-libs/libmapi-0.9