Qt category move.

19 files changed, 84 insertions, 79 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 23a17c769874..02dfd2797a17 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,21 @@
 # ChangeLog for profile directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7544 2013/03/02 17:50:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7545 2013/03/02 20:45:50 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!
 
+  02 Mar 2013; Davide Pesavento <pesa@gentoo.org> arch/alpha/package.use.mask,
+  arch/alpha/use.mask, arch/amd64-fbsd/todo/package.use.mask,
+  arch/amd64/package.use.mask, arch/arm/package.use.mask,
+  arch/hppa/package.use.mask, arch/ia64/package.use.mask, arch/ia64/use.mask,
+  arch/powerpc/package.use.force, arch/powerpc/package.use.mask,
+  arch/sparc/package.use.mask, arch/sparc/use.mask, arch/x86/package.use.mask,
+  base/package.use.force, base/package.use.mask, default/bsd/package.use.mask,
+  default/linux/hppa/package.use.mask, package.mask:
+  Qt category move.
+
   02 Mar 2013; Justin Lecher <jlec@gentoo.org> arch/x86/package.use.mask,
   package.mask:
   Drop mask from dev-tcltk/tcllib
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 34b63b941671..a61295ea7825 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.119 2013/01/31 05:57:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.120 2013/03/02 20:45:51 pesa Exp $
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (31 Jan 2013)
 # remove mask when net-libs/libqmi is keyworded here
@@ -51,10 +51,10 @@ dev-util/devhelp gedit
 >=dev-db/mariadb-5.5 tcmalloc jemalloc
 
 # Raúl Porcel <armin76@gentoo.org> (25 Jun 2012)
-# x11-libs/qt-webkit doesn't seem to work
+# dev-qt/qtwebkit doesn't seem to work
 dev-python/PyQt4 webkit
-x11-libs/qt-assistant webkit
-x11-libs/qt-declarative webkit
+dev-qt/qtdeclarative webkit
+dev-qt/qthelp webkit
 net-irc/kvirc webkit
 x11-misc/google-gadgets qt4
 
@@ -159,7 +159,7 @@ x11-misc/rss-glx quesoglc
 games-strategy/freeciv ggz
 
 # Ben de Groot <yngwin@gentoo.org> (16 Jan 2010)
-# qt-multimedia is not keyworded, bug 293671
+# qtmultimedia is not keyworded, bug 293671
 dev-python/PyQt4 multimedia
 
 # Raúl Porcel <armin76@gentoo.org> (07 Jul 2008)
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 5c2cee124116..7347f7c5075a 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/use.mask,v 1.81 2013/01/20 16:53:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/use.mask,v 1.82 2013/03/02 20:45:51 pesa Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -alpha
@@ -94,8 +94,8 @@ gts
 # Needs to be tested
 video_cards_nouveau
 
-# Ben de Groot <yngwin@gentoo.org> 11 Feb 2009
-# both x11-libs/qt-phonon and media-sound/phonon are unkeyworded
+# Ben de Groot <yngwin@gentoo.org> (11 Feb 2009)
+# Both dev-qt/qtphonon and media-sound/phonon are unkeyworded
 phonon
 
 # 14 May 2007 Raúl Porcel <armin76@gentoo.org>
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index 0b95626da037..f8b255a46766 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/todo/package.use.mask,v 1.301 2013/02/18 11:07:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/todo/package.use.mask,v 1.302 2013/03/02 20:45:51 pesa Exp $
 
 # Mask useflags that require deps with missing keywords.
 # Anyone is allowed and _very welcome_ to add masks there.
@@ -127,7 +127,7 @@ media-video/ffmpeg frei0r
 
 # media-libs/nas
 media-libs/libsdl nas
-x11-libs/qt-gui nas
+dev-qt/qtgui nas
 app-editors/xemacs nas
 
 # net-misc/openntpd
@@ -139,7 +139,7 @@ net-libs/webkit-gtk introspection
 # virtual/mysql
 sci-mathematics/glpk mysql
 dev-libs/apr-util mysql
-x11-libs/qt-sql mysql
+dev-qt/qtsql mysql
 dev-libs/redland mysql
 dev-libs/cyrus-sasl mysql
 dev-lang/php mysql mysqli
@@ -153,7 +153,7 @@ dev-libs/cyrus-sasl authdaemond
 
 # dev-db/freetds
 dev-libs/apr-util freetds
-x11-libs/qt-sql freetds
+dev-qt/qtsql freetds
 
 # app-emulation/wine
 media-libs/mesa d3d
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index cf4060b69086..c4c7b0b4f285 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.155 2013/02/27 21:58:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.156 2013/03/02 20:45:51 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
@@ -157,9 +157,8 @@ www-client/epiphany -jit
 # Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
 # JavaScriptCore JIT is supported only on amd64/arm/x86,
 # so it's masked in base profile and unmasked here.
-# Davide Pesavento <pesa@gentoo.org> (26 Jun 2012)
-# Keep it masked for qt-script wrt bug 423141.
-x11-libs/qt-webkit -jit
+dev-qt/qtscript -jit
+dev-qt/qtwebkit -jit
 
 # Samuli Suominen <ssuominen@gentoo.org> (16 Oct 2011)
 # Masked in base, unmask per arch
@@ -184,8 +183,8 @@ dev-lang/path64 assembler
 =sys-cluster/corosync-1.3.0 infiniband
 
 # Markos Chandras <hwoarang@gentoo.org> (10 Jun 2011)
-# Unmask firebird on qt-sql per bug #337451
-x11-libs/qt-sql -firebird
+# Unmask firebird on qtsql per bug #337451
+dev-qt/qtsql -firebird
 
 # Jim Ramsay <lack@gentoo.org> (14 May 2011)
 # Mask 'kde' flag for adobe-flash, since the KCM plugin in 10.3 is 32-bit only.
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index f905821c77c2..aeaf01755835 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.128 2013/02/27 06:25:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.129 2013/03/02 20:45:51 pesa Exp $
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (20 Feb 2013)
 # Mask flags of calligra and dependencies due to lack of keywords
@@ -167,8 +167,8 @@ net-misc/tinc vde
 # Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
 # JavaScriptCore JIT is supported only on amd64/arm/x86,
 # so it's masked in base profile and unmasked here.
-x11-libs/qt-script -jit
-x11-libs/qt-webkit -jit
+dev-qt/qtscript -jit
+dev-qt/qtwebkit -jit
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (25 Nov 2011)
 # Mask USE flags on gnome-3.2 packages due to missing keywords on deps;
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 2b348cdea096..764ccf4268bf 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/package.use.mask,v 1.120 2013/01/22 19:04:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/package.use.mask,v 1.121 2013/03/02 20:45:51 pesa Exp $
 
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
 
@@ -54,7 +54,7 @@ app-text/asciidoc test
 
 # Jeroen Roovers <jer@gentoo.org> (26 Apr 2012)
 # Untested dependency on net-misc/connman
-x11-libs/qt-bearer connman
+dev-qt/qtbearer connman
 
 # Jeroen Roovers <jer@gentoo.org> (19 Apr 2012)
 # Requires sys-power/upower which is not much use on HPPA
@@ -73,10 +73,6 @@ dev-libs/libmemcached tcmalloc sasl
 app-office/lyx gnumeric
 
 # Jeroen Roovers <jer@gentoo.org> (24 Feb 2011)
-# No JIT compiler support for HPPA
-x11-libs/qt-core jit
-
-# Jeroen Roovers <jer@gentoo.org> (24 Feb 2011)
 # Needs Java (bug #355353)
 app-text/texlive pdfannotextractor
 
@@ -116,7 +112,7 @@ app-cdr/cdrdao gcdmaster
 net-im/pidgin eds
 
 # Ben de Groot <yngwin@gentoo.org> (16 Jan 2010)
-# qt-multimedia is not keyworded, bug 293671
+# qtmultimedia is not keyworded, bug 293671
 dev-python/PyQt4 multimedia
 
 # Jeroen Roovers <jer@gentoo.org> (31 May 2009)
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index e91fe7eefaae..cad10839a7cc 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.116 2013/02/21 23:59:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.117 2013/03/02 20:45:51 pesa Exp $
 
 # Agostino Sarubbo <ago@gentoo.org> (09 Feb 2013)
 # Mask media-video/libav[hardcoded-tables] bug #453328
@@ -151,7 +151,7 @@ www-client/firefox custom-optimization
 www-client/seamonkey custom-optimization
 
 # Ben de Groot <yngwin@gentoo.org> (16 Jan 2010)
-# qt-multimedia is not keyworded, bug 293671
+# qtmultimedia is not keyworded, bug 293671
 dev-python/PyQt4 multimedia
 
 # Raúl Porcel <armin76@gentoo.org)
@@ -159,7 +159,7 @@ dev-python/PyQt4 multimedia
 x11-wm/fvwm lock
 
 # Raúl Porcel <armin76@gentoo.org> (11 Apr 2009)
-# net-libs/webkit-gtk segfaults but x11-libs/qt-webkit doesn't
+# net-libs/webkit-gtk segfaults but dev-qt/qtwebkit doesn't
 dev-python/PyQt4 -webkit
 
 # Jean-Noel Rivasseau <elvanor@gentoo.org> (28 Jul 2008)
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 952e6488251e..97be86bb7894 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -119,7 +119,7 @@ musepack
 webkit
 
 # Ben de Groot <yngwin@gentoo.org> (11 Feb 2009)
-# both x11-libs/qt-phonon and media-sound/phonon are unkeyworded
+# Both dev-qt/qtphonon and media-sound/phonon are unkeyworded
 phonon
 
 # see email to gentoo-dev with subject "use.mask and PHP5's crazy IUSE"
diff --git a/profiles/arch/powerpc/package.use.force b/profiles/arch/powerpc/package.use.force
index d2fff720ea92..331f601e3caf 100644
--- a/profiles/arch/powerpc/package.use.force
+++ b/profiles/arch/powerpc/package.use.force
@@ -2,7 +2,7 @@
 # dev-libs/botan is not keyworded for ppc64 but it is
 # required for qt-creator[-botan-bundled]. So force
 # the botan-bundled useflag
-dev-util/qt-creator botan-bundled
+dev-qt/qt-creator botan-bundled
 
 # Matti Bickel <mabi@gentoo.org> - 2007-12-31
 # only the java interface is usable on ppc
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 2f931a47f5fc..9dcb3addb78f 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.162 2013/01/31 05:57:09 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.163 2013/03/02 20:45:52 pesa Exp $
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (31 Jan 2013)
 # remove mask when net-libs/libqmi is keyworded here
@@ -48,9 +48,9 @@ net-misc/tor tor-hardening
 net-libs/cyassl aes-ni cyassl-hardening
 
 # Johannes Huber <johu@gentoo.org> (9 Jul 2012)
-# x11-libs/qt-openvg not keyworded correctly.
+# dev-qt/qtopenvg not keyworded correctly.
 # ppc/ppc64 team please validate.
-=x11-libs/qt-demo-4.8* openvg
+=dev-qt/qtdemo-4.8* openvg
 
 # Michael Weber <xmw@gentoo.org> (3 Jun 2012)
 # pymol got stabled (bug 366229) but USE=apbs deps aren't keyworded
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 256190b65ba5..3684aa452e39 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.133 2013/02/11 09:21:21 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.134 2013/03/02 20:45:52 pesa Exp $
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (31 Jan 2013)
 # remove mask when net-libs/libqmi is keyworded here
@@ -39,17 +39,17 @@ gnome-extra/libgda reports
 >=dev-db/mariadb-5.5 systemtap tcmalloc jemalloc
 
 # Raúl Porcel <armin76@gentoo.org> (08 Jul 2012)
-# x11-libs/qt-webkit doesn't seem to work
+# dev-qt/qtwebkit doesn't seem to work
 dev-python/PyQt4 webkit
-x11-libs/qt-assistant webkit
-x11-libs/qt-declarative webkit
+dev-qt/qtdeclarative webkit
+dev-qt/qthelp webkit
 
 # Diego Elio Pettenò <flameeyes@gentoo.org> (24 Jun 2012)
 # Requires libpcre with jit
 www-apache/mod_security jit
 
 # Ben de Groot <yngwin@gentoo.org> (14 Jun 2012)
-# Since x11-libs/qt-* will no longer be available for sparc, we need
+# Since dev-qt/qt* will no longer be available for sparc, we need
 # to mask the reverse dependencies
 dev-cpp/eigen examples
 dev-tex/latex-beamer lyx
@@ -159,11 +159,11 @@ dev-libs/soprano virtuoso
 app-admin/system-config-printer-common  policykit
 
 # Ben de Groot <yngwin@gentoo.org> (16 Jan 2010)
-# qt-multimedia is not keyworded, bug 293671
+# qtmultimedia is not keyworded, bug 293671
 dev-python/PyQt4 multimedia
 
 # Ben de Groot <yngwin@gentoo.org> (11 Nov 2009)
-# Requires qt-assistant, which requires qt-webkit, bug 292838
+# Requires qthelp, which requires qtwebkit, bug 292838
 dev-libs/uriparser doc
 media-libs/libxspf doc
 
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index 56e2e93f8fc4..c435a85338b7 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.mask,v 1.105 2013/01/20 10:51:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.mask,v 1.106 2013/03/02 20:45:52 pesa Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -sparc
@@ -306,8 +306,8 @@ alsa_cards_wavefront
 # if a sub-profile want's it, it can -use.mask it
 multilib
 
-# Ben de Groot <yngwin@gentoo.org> 11 Feb 2009
-# both x11-libs/qt-phonon and media-sound/phonon are unkeyworded
+# Ben de Groot <yngwin@gentoo.org> (11 Feb 2009)
+# Both dev-qt/qtphonon and media-sound/phonon are unkeyworded
 phonon
 
 # Matt Turner <mattst88@gentoo.org) (10 Feb 2012)
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 7b68fa74dcc6..0ca0565877a1 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.111 2013/02/16 21:26:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.112 2013/03/02 20:45:52 pesa Exp $
 
 # Agostino Sarubbo <ago@gentoo.org> (16 Feb 2012)
 # mask because requires unstable depends not ready for the stabilization
@@ -91,8 +91,8 @@ media-video/transcode -nuv -pic
 # Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
 # JavaScriptCore JIT is supported only on amd64/arm/x86,
 # so it's masked in base profile and unmasked here.
-x11-libs/qt-script -jit
-x11-libs/qt-webkit -jit
+dev-qt/qtscript -jit
+dev-qt/qtwebkit -jit
 
 # Samuli Suominen <ssuominen@gentoo.org> (25 Nov 2011)
 # Expose USE="suid" for USE="svga" only for x86 users,
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 8bf2d1f357de..86d46a4c957c 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.32 2013/02/26 23:04:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.33 2013/03/02 20:45:52 pesa Exp $
 
 # Michał Gorny <mgorny@gentoo.org> (26 Feb 2013)
 # Meta-packages which use multilib ebuilds always install development
@@ -18,9 +18,8 @@ app-shells/bash readline
 dev-python/python-exec python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_jython2_5 python_targets_pypy1_9 python_targets_pypy2_0
 
 # Davide Pesavento <pesa@gentoo.org> (12 Sep 2012)
-# qt-creator-2.6.x uses botan-1.10.2, which isn't packaged yet,
-# thus force the usage of bundled copy for now.
->=dev-util/qt-creator-2.6 botan-bundled
+# Unbundling code needs updates, will be fixed in 2.7
+>=dev-qt/qt-creator-2.6 botan-bundled
 
 # Samuli Suominen <ssuominen@gentoo.org> (23 Jan 2012)
 # Forcing enabled while waiting for eselect-notify-send wrt #379941
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ba9d41382464..5fd73144cf5a 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.440 2013/02/21 21:55:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.441 2013/03/02 20:45:52 pesa Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
@@ -285,8 +285,8 @@ media-video/transcode nuv pic
 # Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
 # JavaScriptCore JIT is supported only on amd64/arm/x86, so
 # mask USE="jit" here and unmask it in the relevant arch profiles.
-x11-libs/qt-script jit
-x11-libs/qt-webkit jit
+dev-qt/qtscript jit
+dev-qt/qtwebkit jit
 
 # Samuli Suominen <ssuominen@gentoo.org> (25 Nov 2011)
 # Expose USE="suid" for USE="svga" only for x86 users,
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index 1b8cbec52e4e..913e437dc9ec 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/package.use.mask,v 1.33 2013/02/18 11:22:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/package.use.mask,v 1.34 2013/03/02 20:45:52 pesa Exp $
 
 
 # Richard Yao <ryao@gentoo.org> (09 Nov 2012)
@@ -86,7 +86,7 @@ media-libs/xine-lib fusion
 kde-base/kdelibs udisks upower
 
 # connman is Linux only
-x11-libs/qt-bearer connman
+dev-qt/qtbearer connman
 
 # udisks is linux only (for now?)
 gnome-base/gvfs udisks
diff --git a/profiles/default/linux/hppa/package.use.mask b/profiles/default/linux/hppa/package.use.mask
index 0c98998ba435..f798fa80bfde 100644
--- a/profiles/default/linux/hppa/package.use.mask
+++ b/profiles/default/linux/hppa/package.use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/hppa/package.use.mask,v 1.12 2012/04/19 15:23:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/hppa/package.use.mask,v 1.13 2013/03/02 20:45:53 pesa Exp $
 
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
 
@@ -13,21 +13,22 @@ sys-apps/hwloc numa
 www-client/firefox custom-optimization
 
 # Jeroen Roovers <jer@gentoo.org> (18 Jul 2008)
-# Mask precompiled headers (pch) USE flag for x11-libs/qt-* (bug #223775).
-x11-libs/qt-assistant pch 
-x11-libs/qt-core pch
-x11-libs/qt-dbus pch
-x11-libs/qt-demo pch
-x11-libs/qt-gui pch
-x11-libs/qt-opengl pch
-x11-libs/qt-phonon pch
-x11-libs/qt-qt3support pch
-x11-libs/qt-script pch
-x11-libs/qt-sql pch
-x11-libs/qt-svg pch
-x11-libs/qt-test pch
-x11-libs/qt-webkit pch
-x11-libs/qt-xmlpatterns pch
+# Mask precompiled headers (pch) USE flag for dev-qt/qt* (bug #223775).
+dev-qt/qt3support pch
+dev-qt/qtbearer pch
+dev-qt/qtcore pch
+dev-qt/qtdbus pch
+dev-qt/qtdemo pch
+dev-qt/qtgui pch
+dev-qt/qthelp pch 
+dev-qt/qtopengl pch
+dev-qt/qtphonon pch
+dev-qt/qtscript pch
+dev-qt/qtsql pch
+dev-qt/qtsvg pch
+dev-qt/qttest pch
+dev-qt/qtwebkit pch
+dev-qt/qtxmlpatterns pch
 
 # Jeroen Roovers <jer@gentoo.org> (15 Jul 2008)
 # media-libs/openinventor isn't ported to HPPA.
diff --git a/profiles/package.mask b/profiles/package.mask
index b35a4907052a..67b0ac84bb80 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14517 2013/03/02 17:50:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14518 2013/03/02 20:45:50 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
@@ -128,7 +128,7 @@ games-strategy/freecraft
 
 # Davide Pesavento <pesa@gentoo.org> (17 Feb 2013)
 # Mask beta version for testing.
-=dev-util/qt-creator-2.7.0_beta*
+=dev-qt/qt-creator-2.7.0_beta*
 
 # Markos Chandras <hwoarang@gentoo.org> (17 Feb 2013)
 # Does not build with libav-0.8