summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 5 insertions, 6 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index ed110bd9adb9..4f5b97395cf9 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.9453 2014/10/14 20:54:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9454 2014/10/14 23:38:42 pesa 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!
+ 14 Oct 2014; Davide Pesavento <pesa@gentoo.org> package.mask:
+ Unmask dev-qt/qt-creator-3*
+
14 Oct 2014; Michał Górny <mgorny@gentoo.org> profiles.desc:
Add a no-emul-linux-x86 amd64 subprofile for testing emul-linux-x86-free
system.
diff --git a/profiles/package.mask b/profiles/package.mask
index 46db418b0738..b722c6de116d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16094 2014/10/14 06:38:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16095 2014/10/14 23:38:42 pesa 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
@@ -799,10 +799,6 @@ games-emulation/m64py
# Mask mainline version branch
=www-servers/nginx-1.5*
-# Davide Pesavento <pesa@gentoo.org> (23 Oct 2013)
-# Some features require Qt 5.2, which is not in tree yet.
-=dev-qt/qt-creator-3*
-
# Justin Lecher <jlec@gentoo.org> (14 Oct 2013)
# Seems to break all deps - API change?
>=sci-libs/metis-5