[gentoo-commits] proj/qt:master commit in: dev-util/qtchooser/, dev-qt/qtcomponents/, x11-libs/qt3d/, sets/, ...

[Davide Pesavento]

commit:     208deff5021dcaa18b347e9ba917ade9466bcaba
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Mar  5 08:05:44 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 08:05:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=208deff5

Fix fallout of qt category move.

---
 .../qt-components}/metadata.xml                    |    0
 .../qt-components-9999.ebuild}                     |    0
 {x11-libs => dev-qt}/qt3d/metadata.xml             |    0
 {x11-libs => dev-qt}/qt3d/qt3d-5.9999.ebuild       |    0
 {dev-util => dev-qt}/qtchooser/Manifest            |    0
 {dev-util => dev-qt}/qtchooser/metadata.xml        |    0
 {dev-util => dev-qt}/qtchooser/qtchooser-9.ebuild  |    0
 dev-qt/qtcomponents/metadata.xml                   |    5 --
 dev-qt/qtlocation/qtlocation-5.9999.ebuild         |    4 +-
 eclass/qt4-build.eclass                            |   51 ++-----------------
 eclass/qt5-build.eclass                            |   18 ++++----
 profiles/categories                                |    1 -
 profiles/updates/1Q-2013                           |    6 ++-
 profiles/use.desc                                  |    6 --
 sets/qt-4.8-live                                   |   10 ++--
 sets/qt4                                           |    4 +-
 sets/qt5-addons                                    |    2 +-
 www-client/qupzilla/qupzilla-9999.ebuild           |    2 +-
 18 files changed, 32 insertions(+), 77 deletions(-)

diff --git a/dev-util/qtchooser/metadata.xml b/dev-qt/qt-components/metadata.xml
similarity index 100%
copy from dev-util/qtchooser/metadata.xml
copy to dev-qt/qt-components/metadata.xml

diff --git a/dev-qt/qtcomponents/qtcomponents-9999.ebuild b/dev-qt/qt-components/qt-components-9999.ebuild
similarity index 100%
rename from dev-qt/qtcomponents/qtcomponents-9999.ebuild
rename to dev-qt/qt-components/qt-components-9999.ebuild

diff --git a/x11-libs/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml
similarity index 100%
rename from x11-libs/qt3d/metadata.xml
rename to dev-qt/qt3d/metadata.xml

diff --git a/x11-libs/qt3d/qt3d-5.9999.ebuild b/dev-qt/qt3d/qt3d-5.9999.ebuild
similarity index 100%
rename from x11-libs/qt3d/qt3d-5.9999.ebuild
rename to dev-qt/qt3d/qt3d-5.9999.ebuild

diff --git a/dev-util/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
similarity index 100%
rename from dev-util/qtchooser/Manifest
rename to dev-qt/qtchooser/Manifest

diff --git a/dev-util/qtchooser/metadata.xml b/dev-qt/qtchooser/metadata.xml
similarity index 100%
rename from dev-util/qtchooser/metadata.xml
rename to dev-qt/qtchooser/metadata.xml

diff --git a/dev-util/qtchooser/qtchooser-9.ebuild b/dev-qt/qtchooser/qtchooser-9.ebuild
similarity index 100%
rename from dev-util/qtchooser/qtchooser-9.ebuild
rename to dev-qt/qtchooser/qtchooser-9.ebuild

diff --git a/dev-qt/qtcomponents/metadata.xml b/dev-qt/qtcomponents/metadata.xml
deleted file mode 100644
index ab02f99..0000000
--- a/dev-qt/qtcomponents/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>qt</herd>
-</pkgmetadata>

diff --git a/dev-qt/qtlocation/qtlocation-5.9999.ebuild b/dev-qt/qtlocation/qtlocation-5.9999.ebuild
index e7de3a5..de87104 100644
--- a/dev-qt/qtlocation/qtlocation-5.9999.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.9999.ebuild
@@ -15,13 +15,13 @@ else
 fi
 
 # FIXME: src/3rdparty/poly2tri doesn't respect CXX and CXXFLAGS
-# TODO: plugins (qt-jsondb, geoclue, gypsy), qml
+# TODO: plugins (qtjsondb, geoclue, gypsy), qml
 IUSE=""
 
 DEPEND="
+	~dev-qt/qt3d-${PV}[debug=]
 	~dev-qt/qtcore-${PV}[debug=]
 	~dev-qt/qtgui-${PV}[debug=]
 	~dev-qt/qtnetwork-${PV}[debug=]
-	~x11-libs/qt3d-${PV}[debug=]
 "
 RDEPEND="${DEPEND}"

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 64a76db..e14a664 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.144 2013/03/03 00:22:56 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -41,53 +41,14 @@ case ${QT4_BUILD_TYPE} in
 esac
 
 IUSE="aqua debug pch"
-[[ ${CATEGORY}/${PN} != dev-qt/qtxmlpatterns ]] && IUSE+=" +exceptions"
 [[ ${CATEGORY}/${PN} != dev-qt/qtwebkit ]] && IUSE+=" c++0x"
+[[ ${CATEGORY}/${PN} != dev-qt/qtxmlpatterns ]] && IUSE+=" +exceptions"
 
 DEPEND="virtual/pkgconfig"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	DEPEND+=" dev-lang/perl"
 fi
 
-RDEPEND="
-	!<dev-qt/qtbearer-${PV}:4
-	!>dev-qt/qtbearer-${PV}-r9999:4
-	!<dev-qt/qtcore-${PV}:4
-	!>dev-qt/qtcore-${PV}-r9999:4
-	!<dev-qt/qtdbus-${PV}:4
-	!>dev-qt/qtdbus-${PV}-r9999:4
-	!<dev-qt/qtdeclarative-${PV}:4
-	!>dev-qt/qtdeclarative-${PV}-r9999:4
-	!<dev-qt/qtdemo-${PV}:4
-	!>dev-qt/qtdemo-${PV}-r9999:4
-	!<dev-qt/qtgui-${PV}:4
-	!>dev-qt/qtgui-${PV}-r9999:4
-	!<dev-qt/qthelp-${PV}:4
-	!>dev-qt/qthelp-${PV}-r9999:4
-	!<dev-qt/qtmultimedia-${PV}:4
-	!>dev-qt/qtmultimedia-${PV}-r9999:4
-	!<dev-qt/qtopengl-${PV}:4
-	!>dev-qt/qtopengl-${PV}-r9999:4
-	!<dev-qt/qtopenvg-${PV}:4
-	!>dev-qt/qtopenvg-${PV}-r9999:4
-	!<dev-qt/qtphonon-${PV}:4
-	!>dev-qt/qtphonon-${PV}-r9999:4
-	!<dev-qt/qt3support-${PV}:4
-	!>dev-qt/qt3support-${PV}-r9999:4
-	!<dev-qt/qtscript-${PV}:4
-	!>dev-qt/qtscript-${PV}-r9999:4
-	!<dev-qt/qtsql-${PV}:4
-	!>dev-qt/qtsql-${PV}-r9999:4
-	!<dev-qt/qtsvg-${PV}:4
-	!>dev-qt/qtsvg-${PV}-r9999:4
-	!<dev-qt/qttest-${PV}:4
-	!>dev-qt/qttest-${PV}-r9999:4
-	!<dev-qt/qtwebkit-${PV}:4
-	!>dev-qt/qtwebkit-${PV}-r9999:4
-	!<dev-qt/qtxmlpatterns-${PV}:4
-	!>dev-qt/qtxmlpatterns-${PV}-r9999:4
-"
-
 S=${WORKDIR}/${MY_P}
 
 # @FUNCTION: qt4-build_pkg_setup
@@ -142,7 +103,7 @@ qt4-build_src_unpack() {
 		ewarn "Using a GCC version lower than 4.1 is not supported."
 	fi
 
-	if [[ ${PN} == qtwebkit ]]; then
+	if [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
 			echo
@@ -212,7 +173,7 @@ qt4-build_src_prepare() {
 			-i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
 	fi
 
-	if [[ ${PN} != qtcore ]]; then
+	if [[ ${CATEGORY}/${PN} != dev-qt/qtcore ]]; then
 		skip_qmake_build
 		skip_project_generation
 		symlink_binaries_to_buildtree
@@ -470,7 +431,7 @@ qt4-build_src_compile() {
 # Runs tests only in target directories.
 qt4-build_src_test() {
 	# QtMultimedia does not have any test suite (bug #332299)
-	[[ ${PN} == qtmultimedia ]] && return
+	[[ ${CATEGORY}/${PN} == dev-qt/qtmultimedia ]] && return
 
 	for dir in ${QT4_TARGET_DIRECTORIES}; do
 		emake -j1 check -C ${dir}
@@ -662,7 +623,7 @@ install_qconfigs() {
 # @DESCRIPTION:
 # Generates gentoo-specific qconfig.{h,pri}.
 generate_qconfigs() {
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qtcore ]]; then
+	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == dev-qt/qtcore ]]; then
 		local x qconfig_add qconfig_remove qconfig_new
 		for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
 			[[ -f ${x} ]] || continue

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 97da197..3c87f5c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -58,8 +58,8 @@ IUSE="+c++11 debug test"
 
 DEPEND=">=dev-lang/perl-5.14
 	virtual/pkgconfig"
-if [[ ${PN} != "qt-test" ]]; then
-	DEPEND+=" test? ( ~dev-qt/qt-test-${PV}[debug=] )"
+if [[ ${PN} != "qttest" ]]; then
+	DEPEND+=" test? ( ~dev-qt/qttest-${PV}[debug=] )"
 fi
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
@@ -131,7 +131,7 @@ qt5-build_src_unpack() {
 		ewarn "Using a GCC version lower than 4.4 is not supported."
 	fi
 
-	if [[ ${PN} == "qt-webkit" ]]; then
+	if [[ ${PN} == "qtwebkit" ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
 			echo
@@ -197,7 +197,7 @@ qt5-build_src_prepare() {
 			|| die "sed failed (config.tests)"
 	fi
 
-	if [[ ${PN} != "qt-core" ]]; then
+	if [[ ${PN} != "qtcore" ]]; then
 		qt5_symlink_tools_to_buildtree
 	fi
 
@@ -263,7 +263,7 @@ qt5-build_src_test() {
 qt5-build_src_install() {
 	qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install
 
-	if [[ ${PN} == "qt-core" ]]; then
+	if [[ ${PN} == "qtcore" ]]; then
 		pushd "${QT5_BUILD_DIR}" > /dev/null || die
 		einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake,syncqt}"
 		emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
@@ -297,7 +297,7 @@ qt5-build_pkg_postinst() {
 # @DESCRIPTION:
 # Regenerate configuration when the package is completely removed.
 qt5-build_pkg_postrm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${PN} != "qt-core" ]]; then
+	if [[ -z ${REPLACED_BY_VERSION} && ${PN} != "qtcore" ]]; then
 		qt5_regenerate_global_qconfigs
 	fi
 }
@@ -345,7 +345,7 @@ qt5_prepare_env() {
 # @FUNCTION: qt5_symlink_tools_to_buildtree
 # @INTERNAL
 # @DESCRIPTION:
-# Symlinks qt-core tools to buildtree, so they can be used when building other modules.
+# Symlinks qtcore tools to buildtree, so they can be used when building other modules.
 qt5_symlink_tools_to_buildtree() {
 	mkdir -p "${QT5_BUILD_DIR}"/bin || die
 
@@ -427,11 +427,11 @@ qt5_base_configure() {
 		# requires GNU ld >= 2.18
 		-reduce-relocations
 
-		# disable all SQL drivers by default, override in qt-sql
+		# disable all SQL drivers by default, override in qtsql
 		-no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc
 		-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds
 
-		# disable all platform plugins by default, override in qt-gui
+		# disable all platform plugins by default, override in qtgui
 		-no-xcb -no-xrender -no-eglfs -no-directfb -no-linuxfb -no-kms
 
 		# disable gtkstyle because it adds qt4 include paths to the compiler

diff --git a/profiles/categories b/profiles/categories
deleted file mode 100644
index ec4f664..0000000
--- a/profiles/categories
+++ /dev/null
@@ -1 +0,0 @@
-razorqt-base

diff --git a/profiles/updates/1Q-2013 b/profiles/updates/1Q-2013
index fc02645..aa0f7fe 100644
--- a/profiles/updates/1Q-2013
+++ b/profiles/updates/1Q-2013
@@ -1,6 +1,10 @@
-move x11-libs/qt-components dev-qt/qtcomponents
+move dev-util/qtchooser dev-qt/qtchooser
+move x11-libs/qt-components dev-qt/qt-components
 move x11-libs/qt-concurrent dev-qt/qtconcurrent
 move x11-libs/qt-jsbackend dev-qt/qtjsbackend
 move x11-libs/qt-location dev-qt/qtlocation
+move x11-libs/qt-network dev-qt/qtnetwork
 move x11-libs/qt-printsupport dev-qt/qtprintsupport
 move x11-libs/qt-widgets dev-qt/qtwidgets
+move x11-libs/qt-xml dev-qt/qtxml
+move x11-libs/qt3d dev-qt/qt3d

diff --git a/profiles/use.desc b/profiles/use.desc
deleted file mode 100644
index 69e06b2..0000000
--- a/profiles/use.desc
+++ /dev/null
@@ -1,6 +0,0 @@
-# qt/profiles/use.desc
-# Please keep alphabetically sorted
-
-custom-cxxflags - Allows building with user set CXXFLAGS
-kde-qt - Use KDE's QT repository with extra patches
-raster - Use raster backend engine for Qt

diff --git a/sets/qt-4.8-live b/sets/qt-4.8-live
index 8a443ed..055274c 100644
--- a/sets/qt-4.8-live
+++ b/sets/qt-4.8-live
@@ -1,16 +1,18 @@
-# set for all packages from Nokia's 4.8 branch
-# qt-phonon is commented out, as you may want media-libs/phonon instead
+# set for all packages from qt/4.8 branch
+# qtphonon is commented out, as you may want media-libs/phonon instead
 
-~dev-qt/qthelp-4.8.9999
+~dev-qt/qt3support-4.8.9999
 ~dev-qt/qtbearer-4.8.9999
 ~dev-qt/qtcore-4.8.9999
 ~dev-qt/qtdbus-4.8.9999
 ~dev-qt/qtdeclarative-4.8.9999
+#~dev-qt/qtdemo-4.8.9999
 ~dev-qt/qtgui-4.8.9999
+~dev-qt/qthelp-4.8.9999
 ~dev-qt/qtmultimedia-4.8.9999
 ~dev-qt/qtopengl-4.8.9999
+#~dev-qt/qtopenvg-4.8.9999
 #~dev-qt/qtphonon-4.8.9999
-~dev-qt/qt3support-4.8.9999
 ~dev-qt/qtscript-4.8.9999
 ~dev-qt/qtsql-4.8.9999
 ~dev-qt/qtsvg-4.8.9999

diff --git a/sets/qt4 b/sets/qt4
index 2c70de8..92a8ed2 100644
--- a/sets/qt4
+++ b/sets/qt4
@@ -1,18 +1,18 @@
 # set for all Qt4 modules
 # copy this file to /etc/portage/sets/qt-custom for customization
 
-dev-qt/qthelp:4
+dev-qt/qt3support:4
 dev-qt/qtbearer:4
 dev-qt/qtcore:4
 dev-qt/qtdbus:4
 dev-qt/qtdeclarative:4
 dev-qt/qtdemo:4
 dev-qt/qtgui:4
+dev-qt/qthelp:4
 dev-qt/qtmultimedia:4
 dev-qt/qtopengl:4
 dev-qt/qtopenvg:4
 dev-qt/qtphonon:4
-dev-qt/qt3support:4
 dev-qt/qtscript:4
 dev-qt/qtsql:4
 dev-qt/qtsvg:4

diff --git a/sets/qt5-addons b/sets/qt5-addons
index a28571a..793c891 100644
--- a/sets/qt5-addons
+++ b/sets/qt5-addons
@@ -1,7 +1,7 @@
 # set for Qt5 Add-on modules
 # http://qt-project.org/wiki/Qt-Add-ons-Modules
 
-#x11-libs/qt3d:5
+#dev-qt/qt3d:5
 dev-qt/qtconcurrent:5
 dev-qt/qtdbus:5
 #dev-qt/qtgraphicaleffects:5

diff --git a/www-client/qupzilla/qupzilla-9999.ebuild b/www-client/qupzilla/qupzilla-9999.ebuild
index f25f192..5932836 100644
--- a/www-client/qupzilla/qupzilla-9999.ebuild
+++ b/www-client/qupzilla/qupzilla-9999.ebuild
@@ -54,7 +54,7 @@ src_configure() {
 	export NONBLOCK_JS_DIALOGS=$(use nonblockdialogs && echo true || echo false)
 	has_version '>=dev-qt/qtwebkit-4.8.0:4' && export USE_QTWEBKIT_2_2=true
 
-	# needs qt-webkit with webgl enabled (which we currently don't)
+	# needs qtwebkit with webgl enabled (which we currently don't)
 	# export USE_WEBGL=$(use webgl && echo true || echo false)
 
 	eqmake4