summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-03-12 21:33:07 +0000
committerMichał Górny <mgorny@gentoo.org>2013-03-12 21:33:07 +0000
commit16a94bfab41bb8c758c989de5844967c6681c052 (patch)
tree4454db6af25f197c679986725bce9222fa1f5db5 /profiles
parentRevert the header move, use biarch-config support provided upstream, plus a f... (diff)
downloadgentoo-2-16a94bfab41bb8c758c989de5844967c6681c052.tar.gz
gentoo-2-16a94bfab41bb8c758c989de5844967c6681c052.tar.bz2
gentoo-2-16a94bfab41bb8c758c989de5844967c6681c052.zip
Unmask new freetype-2 and its multilib rdeps due to libdir move being reverted.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask11
2 files changed, 6 insertions, 11 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 7cd8cb4731af..5a4b71b762ac 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7584 2013/03/12 17:10:40 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7585 2013/03/12 21:33:07 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!
+ 12 Mar 2013; Michał Górny <mgorny@gentoo.org> package.mask:
+ Unmask new freetype-2 and its multilib rdeps due to libdir move being
+ reverted.
+
10 Mar 2013; Tom Wijsman <TomWij@gentoo.org> package.mask:
Masked broken media-video/avidemux again, needs a revise for it to become
maintainable; I will look into splitting the package. See bug #461496 C #5.
diff --git a/profiles/package.mask b/profiles/package.mask
index b5d9d2902733..068815365fb9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14546 2013/03/12 17:10:40 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14547 2013/03/12 21:33:07 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
@@ -125,15 +125,6 @@ app-emacs/yow
# experimental features and accept a more unstable release.
>=www-client/google-chrome-27
-# Michał Górny <mgorny@gentoo.org> (26 Feb 2013)
-# Mask the multilib version of freetype2 and dependencies since
-# the header install location has been changed, and packages not using
-# pkg-config nor freetype-config need be fixed.
-=app-emulation/emul-linux-x86-xlibs-20130224-r1
-=media-libs/fontconfig-2.10.2-r1
-=media-libs/freetype-2.4.11-r1
-=x11-libs/libXft-2.3.1-r1
-
# Pawel Hajdan jr <phajdan.jr@gentoo.org> (26 Feb 2013)
# Dev channel releases are only for people who are developers or want more
# experimental features and accept a more unstable release.