[gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     f101a3fe9c4d37078fb0d16e534c5de128fb35a3
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Jul 10 09:05:51 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 09:05:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f101a3fe

[dev-qt/qtcore:4] Sync with portage.

Package-Manager: portage-2.2.0_alpha186

---
 ...OST_JOIN.patch => moc-boost-lexical-cast.patch} |  0
 dev-qt/qtcore/qtcore-4.8.9999.ebuild               | 10 ++-----
 dev-qt/qtcore/qtcore-5.9999.ebuild                 | 31 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch b/dev-qt/qtcore/files/moc-boost-lexical-cast.patch
similarity index 100%
rename from dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch
rename to dev-qt/qtcore/files/moc-boost-lexical-cast.patch

diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index e7f143c..40c483b 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -28,7 +28,7 @@ PDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch"
+	"${FILESDIR}/moc-boost-lexical-cast.patch"
 )
 
 pkg_setup() {
@@ -46,13 +46,7 @@ pkg_setup() {
 		tools/linguist/lupdate"
 
 	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt
-		include/QtCore
-		include/QtDeclarative
-		include/QtGui
-		include/QtNetwork
-		include/QtScript
-		include/QtXml
+		include
 		src/plugins/plugins.pro
 		src/plugins/qpluginbase.pri
 		src/src.pro

diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index c6b55df..e4bf21b 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -50,3 +50,34 @@ src_configure() {
 	)
 	qt5-build_src_configure
 }
+
+# Test dependencies
+#
+# kernel/qobject/test/test.pro: network
+# kernel/qpointer/qpointer.pro: widgets (opt)
+# kernel/qmetaproperty/qmetaproperty.pro: gui
+# kernel/qeventloop/qeventloop.pro: network
+# kernel/qsocketnotifier/qsocketnotifier.pro: network
+# kernel/qsignalmapper/qsignalmapper.pro: gui?
+# kernel/qmetaobject/qmetaobject.pro: gui
+# kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro: gui
+# kernel/qmimedata/qmimedata.pro: gui?
+# codecs/qtextcodec/test/test.pro: gui?
+# xml/qxmlstream/qxmlstream.pro: xml network
+# itemmodels/qabstractitemmodel/qabstractitemmodel.pro: gui?
+# itemmodels/qitemselectionmodel/qitemselectionmodel.pro: widgets
+# itemmodels/qabstractproxymodel/qabstractproxymodel.pro: gui?
+# itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro: gui widgets
+# itemmodels/qidentityproxymodel/qidentityproxymodel.pro: gui?
+# itemmodels/qitemmodel/qitemmodel.pro: widgets sql
+# statemachine/qstatemachine/qstatemachine.pro: gui widgets (opt)
+# animation/qparallelanimationgroup/qparallelanimationgroup.pro: gui
+# animation/qpauseanimation/qpauseanimation.pro: gui
+# animation/qpropertyanimation/qpropertyanimation.pro: gui widgets
+# io/qiodevice/qiodevice.pro: network
+# io/qsettings/qsettings.pro: gui
+# io/qprocess/testGuiProcess/testGuiProcess.pro: widgets
+# io/qprocess/test/test.pro: network
+# io/qtextstream/test/test.pro: network
+# io/qdatastream/qdatastream.pro: gui?
+# io/qfile/test/test.pro: network