From: Davide Pesavento Date: Sun, 18 Jan 2015 04:44:42 +0000 (+0000) Subject: Mask qt-creator versions that depend on Qt5. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b81e93e60b4b54ca7474e1616d6a7b8233cd53b;p=gentoo.git Mask qt-creator versions that depend on Qt5. --- diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 48a35521bf75..b5b90bbed78e 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9686 2015/01/17 20:51:21 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9687 2015/01/18 04:44: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! + 18 Jan 2015; Davide Pesavento package.mask: + Mask qt-creator versions that depend on Qt5. + 17 Jan 2015; Manuel Rüger package.mask: Mask rox-extra/* and rox-base/* See bug #533642. diff --git a/profiles/package.mask b/profiles/package.mask index 3f69e810f569..c616ca53e333 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16290 2015/01/17 20:56:54 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16291 2015/01/18 04:44: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 @@ -589,6 +589,7 @@ dev-php/suhosin =dev-qt/qtx11extras-5.4.0* =dev-qt/qtxml-5.4.0* =dev-qt/qtxmlpatterns-5.4.0* +>=dev-qt/qt-creator-3.3.0 dev-python/PyQt5 kde-frameworks/attica kde-frameworks/frameworkintegration @@ -652,15 +653,15 @@ kde-frameworks/solid kde-frameworks/sonnet kde-frameworks/threadweaver >=kde-misc/about-distro-2.0.0 -www-client/otter -=app-text/calibre-2* app-i18n/fcitx-qt5 +=app-text/calibre-2* dev-libs/grantlee:5 >=media-gfx/photoqt-1.1 media-gfx/phototonic >=media-sound/drumstick-1.0.0 >=media-sound/kmetronome-1.0.0 >=media-sound/teamspeak-client-bin-3.0.16 +www-client/otter x11-misc/kaqaz # Chí-Thanh Christopher Nguyễn (03 Sep 2014)