From: Ben de Groot Date: Sun, 1 Feb 2015 10:48:41 +0000 (+0000) Subject: Unmask Qt5 (bug #454132) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f367b162619135c1e771898047b9c3bbdc0e0317;p=gentoo.git Unmask Qt5 (bug #454132) --- diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 4a79888e61d2..f974e1a3eb44 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.9730 2015/01/31 13:32:03 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9731 2015/02/01 10:48:41 yngwin 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! + 01 Feb 2015; Ben de Groot base/use.mask, package.mask: + Unmask Qt5 + 31 Jan 2015; Eray Aslan package.mask: Remove mask entry for mail-mta/postfix-2.12 - no longer in the tree diff --git a/profiles/base/use.mask b/profiles/base/use.mask index 67c720ca8ece..b8bc8bcc3646 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.217 2015/01/29 16:47:20 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.218 2015/02/01 10:48:41 yngwin Exp $ # CURL_SSL=winssl is for prefix/windows/winnt only curl_ssl_winssl @@ -385,11 +385,6 @@ sbcl # is keyworded. systemd -# Michael Palimaka (1 May 2013) -# Mask until Qt 5 is in portage. (The flag is here already -# to permit the neccessary package preparation.) -qt5 - # Pacho Ramos (28 Sep 2013) # This USE flag is available after long dicussion in # http://www.gossamer-threads.com/lists/gentoo/dev/276077 diff --git a/profiles/package.mask b/profiles/package.mask index c3760ad1d639..e9c96b7b57e2 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16311 2015/01/31 13:32:03 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16312 2015/02/01 10:48:41 yngwin 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 @@ -559,47 +559,6 @@ www-apps/trac-downloads =dev-qt/qtx11extras-5.3.2* =dev-qt/qtxml-5.3.2* =dev-qt/qtxmlpatterns-5.3.2* -=dev-qt/assistant-5.4.0* -=dev-qt/designer-5.4.0* -=dev-qt/linguist-5.4.0* -=dev-qt/linguist-tools-5.4.0* -=dev-qt/pixeltool-5.4.0* -=dev-qt/qdbus-5.4.0* -=dev-qt/qdbusviewer-5.4.0* -=dev-qt/qdoc-5.4.0* -=dev-qt/qtconcurrent-5.4.0* -=dev-qt/qtcore-5.4.0* -=dev-qt/qtdbus-5.4.0* -=dev-qt/qtdeclarative-5.4.0* -=dev-qt/qtdiag-5.4.0* -=dev-qt/qtgraphicaleffects-5.4.0* -=dev-qt/qtgui-5.4.0* -=dev-qt/qthelp-5.4.0* -=dev-qt/qtimageformats-5.4.0* -=dev-qt/qtmultimedia-5.4.0* -=dev-qt/qtnetwork-5.4.0* -=dev-qt/qtopengl-5.4.0* -=dev-qt/qtpaths-5.4.0* -=dev-qt/qtpositioning-5.4.0* -=dev-qt/qtprintsupport-5.4.0* -=dev-qt/qtquick1-5.4.0* -=dev-qt/qtquickcontrols-5.4.0* -=dev-qt/qtscript-5.4.0* -=dev-qt/qtsensors-5.4.0* -=dev-qt/qtserialport-5.4.0* -=dev-qt/qtsql-5.4.0* -=dev-qt/qtsvg-5.4.0* -=dev-qt/qttest-5.4.0* -=dev-qt/qttranslations-5.4.0* -=dev-qt/qtwayland-5.4.0* -=dev-qt/qtwebkit-5.4.0* -=dev-qt/qtwebsockets-5.4.0* -=dev-qt/qtwidgets-5.4.0* -=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 kde-frameworks/kactivities @@ -662,16 +621,12 @@ kde-frameworks/solid kde-frameworks/sonnet kde-frameworks/threadweaver >=kde-misc/about-distro-2.0.0 -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) # Temporary mask until it is verified to work