summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask6
2 files changed, 8 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 3fcc10302513..4c177b7ccf69 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +1,16 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8954 2014/05/13 16:54:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8955 2014/05/13 17:46:15 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!
13 May 2014; Michał Górny <mgorny@gentoo.org> package.mask:
+ Update multilib OpenSSL mask, and move it to the top to facilatate early
+ unmasking if urgent update becomes necessary.
+
+ 13 May 2014; Michał Górny <mgorny@gentoo.org> package.mask:
Unmask the previous batch of multilib conversions.
13 May 2014; Michał Górny <mgorny@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index c975e0e7f3f4..b18427f59e42 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15682 2014/05/13 16:54:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15683 2014/05/13 17:46:15 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
@@ -440,6 +440,8 @@ lxde-base/lxpolkit
# preceding it
# - please update https://wiki.gentoo.org/wiki/Multilib_porting_status
# (mark the packages as {{Yes|DONE}})
+>=dev-libs/openssl-1.0.1g-r1
+>=app-emulation/emul-linux-x86-baselibs-20140406-r4
>=media-libs/alsa-oss-1.0.25-r1
>=media-plugins/alsa-plugins-1.0.27-r2
=net-wireless/bluez-4.101-r9
@@ -447,8 +449,6 @@ lxde-base/lxpolkit
>=app-emulation/emul-linux-x86-soundlibs-20140406-r1
>=dev-libs/libdaemon-0.14-r2
>=net-dns/avahi-0.6.31-r5
->=dev-libs/openssl-1.0.2_beta1-r3
->=app-emulation/emul-linux-x86-baselibs-20140508-r1
>=net-libs/ldns-1.6.16-r1
# Luca Barbato <lu_zero@gentoo.org> (20 Feb 2014)