summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-01-16 13:28:26 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-01-16 13:28:26 +0000
commite38d38c26a2cd37c0cf0564bcb940db0632459ff (patch)
treebc8a9946a566c3e7284df94f69c2b1871e727940 /profiles
parentadd new USWGI_PLUGINS USE_EXPAND (diff)
downloadhistorical-e38d38c26a2cd37c0cf0564bcb940db0632459ff.tar.gz
historical-e38d38c26a2cd37c0cf0564bcb940db0632459ff.tar.bz2
historical-e38d38c26a2cd37c0cf0564bcb940db0632459ff.zip
Multilib ready gettext (bug #496218). Collides with emul-linux-x86-baselibs
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 9 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 82f61e7c6e87..b7a37877a42d 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.8539 2014/01/15 10:19:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8540 2014/01/16 13:28:26 polynomial-c 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!
+ 16 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> package.mask:
+ Multilib ready gettext (bug #496218). Collides with emul-linux-x86-baselibs.
+
15 Jan 2014; Michał Górny <mgorny@gentoo.org> package.mask:
Mask poor media-gfx/exiv2 multilib conversion.
diff --git a/profiles/package.mask b/profiles/package.mask
index b7106b2714b5..8b0b4c8720b3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15338 2014/01/15 10:19:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15339 2014/01/16 13:28:26 polynomial-c 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
@@ -30,6 +30,10 @@
#--- END OF EXAMPLES ---
+# Lars Wendler <polynomial-c@gentoo.org>
+# Multilib ready ebuild (bug #496218). Collides with emul-linux-x86-baselibs
+=sys-devel/gettext-0.18.3.2
+
# Michał Górny <mgorny@gentoo.org> (15 Jan 2014)
# Multilib conversion and Python support code seriously broken.
# Has dependencies that are not converted to multilib yet.