summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask16
2 files changed, 5 insertions, 16 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 3d194c01a69b..dc32126ea2ec 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9053 2014/06/07 22:08:08 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9054 2014/06/08 10:35:06 mgorny 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!
+ 08 Jun 2014; Michał Górny <mgorny@gentoo.org> package.mask:
+ Unmask the previous set of multilib conversions.
+
07 Jun 2014; Manuel Rüger <mrueg@gentoo.org> package.mask:
Cleanup p.mask
diff --git a/profiles/package.mask b/profiles/package.mask
index 668ea204e285..cd6b25512331 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15769 2014/06/07 22:08:08 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15770 2014/06/08 10:35:06 mgorny 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
@@ -79,20 +79,6 @@ dev-java/ibm-jdk-bin:1.5
# Michał Górny <mgorny@gentoo.org> (29 May 2014)
# New multilib conversions. Unmask along with corresponding
# emul-linux-x86 packages, and make sure they're committed first :).
->=media-libs/libart_lgpl-2.3.21-r2
->=sys-libs/cracklib-2.9.1-r1
->=app-emulation/emul-linux-x86-baselibs-20140508-r7
->=sys-process/audit-2.2.2-r2
->=net-libs/libtirpc-0.2.4-r2
->=sys-devel/flex-2.5.39-r1
->=sys-libs/pam-1.1.8-r2
->=virtual/pam-0-r1
->=sys-auth/nss-mdns-0.10-r2
->=sys-auth/nss_ldap-265-r5
->=sys-auth/pam_ldap-186-r1
->=app-emulation/emul-linux-x86-baselibs-20140508-r8
->=dev-libs/cyrus-sasl-2.1.26-r6
->=sys-libs/libsemanage-2.3-r1
>=dev-util/cppunit-1.13.2-r1
>=media-libs/taglib-1.9.1-r1
>=media-libs/libofa-0.9.3-r1