summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-04-18 17:24:49 +0000
committerMichał Górny <mgorny@gentoo.org>2014-04-18 17:24:49 +0000
commitadf0310baa6189da11793d53597db645f0e83ec0 (patch)
tree8971c437eefda898a4bf0203ecfef4e04cb8a01a /profiles
parentAdd patch for building with >=gcc-4.9, bug #507484. Thanks to Ryan Hill <rhil... (diff)
downloadgentoo-2-adf0310baa6189da11793d53597db645f0e83ec0.tar.gz
gentoo-2-adf0310baa6189da11793d53597db645f0e83ec0.tar.bz2
gentoo-2-adf0310baa6189da11793d53597db645f0e83ec0.zip
Remove stray comments from middle of multilib mask, update note on unmasking.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask10
2 files changed, 8 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 6a7f3e6d72fe..36417c1d5ebc 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.8839 2014/04/18 17:07:54 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8840 2014/04/18 17:24:48 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!
+ 18 Apr 2014; Michał Górny <mgorny@gentoo.org> package.mask:
+ Remove stray comments from middle of multilib mask, update note on unmasking.
+
18 Apr 2014; Julian Ospald <hasufell@gentoo.org> package.mask:
remove obsolete mask on >=media-libs/libsdl2-2.0.2-r1, it does not depend on
masked libs
diff --git a/profiles/package.mask b/profiles/package.mask
index a2ace647d2ea..684c5aa9083e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15580 2014/04/18 17:07:54 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15581 2014/04/18 17:24:49 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
@@ -397,20 +397,18 @@ app-emacs/delicious
# Michał Górny <mgorny@gentoo.org> (28 Feb 2014)
# New multilib conversions for testing, grouped with corresponding
-# emul-linux bumps. Please unmask in order, after getting ACK from
-# package maintainer.
+# emul-linux bumps.
#
# Notes:
-# - yngwin explicitly requested 30 days + 1 version bump for cairo.
+# - yngwin explicitly requested 30 days + 1 version bump for cairo,
+# other packages are fine to unmask already
# - always unmask in order, with emul-linux of choice and *all* packages
# preceding it
# - please update https://wiki.gentoo.org/wiki/Multilib_porting_status
# (mark the packages as {{Yes|DONE}})
>=dev-libs/libgcrypt-1.6.1-r1
dev-libs/libgcrypt:11
-# libaacs needs multilib libgcrypt, good to go asap (aballier@g.o)
>=media-libs/libaacs-0.7.0-r1
-# libbluray needs multilib libaacs, good to go asap (aballier@g.o)
>=media-libs/libbluray-0.5.0-r1
>=dev-libs/lzo-2.06-r1
>=app-emulation/emul-linux-x86-baselibs-20131008-r20