[gentoo-commits] proj/qt:master commit in: dev-qt/qttest/, dev-qt/pixeltool/, dev-qt/qttranslations/, dev-qt/qtmultimedia/, ...

[Davide Pesavento]

commit:     26ac5cda964668ec25772cf4fa815550adf79f48
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat May 31 01:18:35 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun  1 02:39:56 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=26ac5cda

[qt4-build-multilib.eclass] Get rid of QT4_EXTRACT_DIRECTORIES.

When doing out-of-source builds, syncqt needs to be run. The problem
is that it insists on running on all Qt modules, even those that
have not been extracted, therefore it's bound to fail.

Since we're going to need out-of-source builds for multilib support
(we could use multilib_copy_sources but it'd nullify the benefits
of partial extraction), just remove the whole QT4_EXTRACT_DIRECTORIES
machinery now.

It was very difficult to maintain a precise list anyway...

---
 dev-qt/assistant/assistant-4.8.6.ebuild            |  4 ---
 dev-qt/assistant/assistant-4.8.9999.ebuild         |  4 ---
 dev-qt/designer/designer-4.8.6.ebuild              |  4 ---
 dev-qt/designer/designer-4.8.9999.ebuild           |  4 ---
 dev-qt/linguist/linguist-4.8.6.ebuild              |  4 ---
 dev-qt/linguist/linguist-4.8.9999.ebuild           |  4 ---
 dev-qt/pixeltool/pixeltool-4.8.6.ebuild            |  5 ----
 dev-qt/pixeltool/pixeltool-4.8.9999.ebuild         |  5 ----
 dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild        |  4 ---
 dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild     |  4 ---
 dev-qt/qt3support/qt3support-4.8.6.ebuild          |  5 ----
 dev-qt/qt3support/qt3support-4.8.9999.ebuild       |  5 ----
 dev-qt/qtbearer/qtbearer-4.8.6.ebuild              |  9 -------
 dev-qt/qtbearer/qtbearer-4.8.9999.ebuild           |  9 -------
 dev-qt/qtcore/qtcore-4.8.6.ebuild                  | 15 -----------
 dev-qt/qtcore/qtcore-4.8.9999.ebuild               | 15 -----------
 dev-qt/qtdbus/qtdbus-4.8.6.ebuild                  |  7 -----
 dev-qt/qtdbus/qtdbus-4.8.9999.ebuild               |  7 -----
 dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild    |  6 -----
 dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild |  6 -----
 dev-qt/qtdemo/qtdemo-4.8.6.ebuild                  |  6 -----
 dev-qt/qtdemo/qtdemo-4.8.9999.ebuild               |  6 -----
 dev-qt/qtgui/qtgui-4.8.6.ebuild                    |  4 ---
 dev-qt/qtgui/qtgui-4.8.9999.ebuild                 |  4 ---
 dev-qt/qthelp/qthelp-4.8.6.ebuild                  |  8 ------
 dev-qt/qthelp/qthelp-4.8.9999.ebuild               |  8 ------
 dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild      | 11 +-------
 dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild   | 11 +-------
 dev-qt/qtopengl/qtopengl-4.8.6.ebuild              | 10 -------
 dev-qt/qtopengl/qtopengl-4.8.9999.ebuild           | 10 -------
 dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild              | 10 -------
 dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild           | 10 -------
 dev-qt/qtphonon/qtphonon-4.8.6.ebuild              |  4 ---
 dev-qt/qtphonon/qtphonon-4.8.9999.ebuild           |  4 ---
 dev-qt/qtscript/qtscript-4.8.6.ebuild              |  6 -----
 dev-qt/qtscript/qtscript-4.8.9999.ebuild           |  6 -----
 dev-qt/qtsql/qtsql-4.8.6.ebuild                    |  7 -----
 dev-qt/qtsql/qtsql-4.8.9999.ebuild                 |  7 -----
 dev-qt/qtsvg/qtsvg-4.8.6.ebuild                    | 12 ---------
 dev-qt/qtsvg/qtsvg-4.8.9999.ebuild                 | 12 ---------
 dev-qt/qttest/qttest-4.8.6.ebuild                  |  8 +-----
 dev-qt/qttest/qttest-4.8.9999.ebuild               |  8 +-----
 dev-qt/qttranslations/qttranslations-4.8.6.ebuild  |  3 ---
 .../qttranslations/qttranslations-4.8.9999.ebuild  |  3 ---
 dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild              |  4 ---
 dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild           |  4 ---
 dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild    |  9 -------
 dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild |  9 -------
 eclass/qt4-build-multilib.eclass                   | 31 +++-------------------
 49 files changed, 8 insertions(+), 353 deletions(-)

diff --git a/dev-qt/assistant/assistant-4.8.6.ebuild b/dev-qt/assistant/assistant-4.8.6.ebuild
index 8508bf8..0a54ca0 100644
--- a/dev-qt/assistant/assistant-4.8.6.ebuild
+++ b/dev-qt/assistant/assistant-4.8.6.ebuild
@@ -30,10 +30,6 @@ PATCHES=(
 )
 
 QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src
-	tools"
 
 src_prepare() {
 	# bug 401173

diff --git a/dev-qt/assistant/assistant-4.8.9999.ebuild b/dev-qt/assistant/assistant-4.8.9999.ebuild
index 8508bf8..0a54ca0 100644
--- a/dev-qt/assistant/assistant-4.8.9999.ebuild
+++ b/dev-qt/assistant/assistant-4.8.9999.ebuild
@@ -30,10 +30,6 @@ PATCHES=(
 )
 
 QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src
-	tools"
 
 src_prepare() {
 	# bug 401173

diff --git a/dev-qt/designer/designer-4.8.6.ebuild b/dev-qt/designer/designer-4.8.6.ebuild
index 0b75a86..5ae0273 100644
--- a/dev-qt/designer/designer-4.8.6.ebuild
+++ b/dev-qt/designer/designer-4.8.6.ebuild
@@ -29,10 +29,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="tools/designer"
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src
-	tools"
 
 src_prepare() {
 	qt4-build-multilib_src_prepare

diff --git a/dev-qt/designer/designer-4.8.9999.ebuild b/dev-qt/designer/designer-4.8.9999.ebuild
index 0b75a86..5ae0273 100644
--- a/dev-qt/designer/designer-4.8.9999.ebuild
+++ b/dev-qt/designer/designer-4.8.9999.ebuild
@@ -29,10 +29,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="tools/designer"
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src
-	tools"
 
 src_prepare() {
 	qt4-build-multilib_src_prepare

diff --git a/dev-qt/linguist/linguist-4.8.6.ebuild b/dev-qt/linguist/linguist-4.8.6.ebuild
index eec9dc2..606e0af 100644
--- a/dev-qt/linguist/linguist-4.8.6.ebuild
+++ b/dev-qt/linguist/linguist-4.8.6.ebuild
@@ -24,10 +24,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src
-	tools"
 
 src_configure() {
 	myconf+="

diff --git a/dev-qt/linguist/linguist-4.8.9999.ebuild b/dev-qt/linguist/linguist-4.8.9999.ebuild
index eec9dc2..606e0af 100644
--- a/dev-qt/linguist/linguist-4.8.9999.ebuild
+++ b/dev-qt/linguist/linguist-4.8.9999.ebuild
@@ -24,10 +24,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src
-	tools"
 
 src_configure() {
 	myconf+="

diff --git a/dev-qt/pixeltool/pixeltool-4.8.6.ebuild b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
index 9086ea0..b61f5ed 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
@@ -24,11 +24,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="tools/pixeltool"
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src/corelib
-	src/gui
-	tools/pixeltool"
 
 src_configure() {
 	myconf+="

diff --git a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
index 9086ea0..b61f5ed 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
@@ -24,11 +24,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="tools/pixeltool"
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src/corelib
-	src/gui
-	tools/pixeltool"
 
 src_configure() {
 	myconf+="

diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
index 09d4d01..303fc8d 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
@@ -24,10 +24,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src
-	tools/qdbus"
 
 src_configure() {
 	myconf+="

diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
index 09d4d01..303fc8d 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
@@ -24,10 +24,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src
-	tools/qdbus"
 
 src_configure() {
 	myconf+="

diff --git a/dev-qt/qt3support/qt3support-4.8.6.ebuild b/dev-qt/qt3support/qt3support-4.8.6.ebuild
index 4b4927c..191103e 100644
--- a/dev-qt/qt3support/qt3support-4.8.6.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.6.ebuild
@@ -28,11 +28,6 @@ QT4_TARGET_DIRECTORIES="
 	src/tools/uic3
 	tools/porting"
 
-QT4_EXTRACT_DIRECTORIES="
-	src
-	include
-	tools"
-
 src_configure() {
 	myconf+="
 		-qt3support

diff --git a/dev-qt/qt3support/qt3support-4.8.9999.ebuild b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
index 4b4927c..191103e 100644
--- a/dev-qt/qt3support/qt3support-4.8.9999.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
@@ -28,11 +28,6 @@ QT4_TARGET_DIRECTORIES="
 	src/tools/uic3
 	tools/porting"
 
-QT4_EXTRACT_DIRECTORIES="
-	src
-	include
-	tools"
-
 src_configure() {
 	myconf+="
 		-qt3support

diff --git a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
index c99bbab..d5c7eb1 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
@@ -26,15 +26,6 @@ RDEPEND="${DEPEND}
 	networkmanager? ( net-misc/networkmanager )
 "
 
-QT4_EXTRACT_DIRECTORIES="
-	include/QtCore
-	include/QtDBus
-	include/QtNetwork
-	src/corelib
-	src/dbus
-	src/network
-	src/plugins/bearer"
-
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
 		src/plugins/bearer/generic

diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
index c99bbab..d5c7eb1 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
@@ -26,15 +26,6 @@ RDEPEND="${DEPEND}
 	networkmanager? ( net-misc/networkmanager )
 "
 
-QT4_EXTRACT_DIRECTORIES="
-	include/QtCore
-	include/QtDBus
-	include/QtNetwork
-	src/corelib
-	src/dbus
-	src/network
-	src/plugins/bearer"
-
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
 		src/plugins/bearer/generic

diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index a1fb867..60bff0a 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -48,21 +48,6 @@ QT4_TARGET_DIRECTORIES="
 	tools/linguist/lrelease
 	tools/linguist/lupdate"
 
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include
-	src/3rdparty/des
-	src/3rdparty/easing
-	src/3rdparty/harfbuzz
-	src/3rdparty/md4
-	src/3rdparty/md5
-	src/3rdparty/sha1
-	src/3rdparty/zlib_dependency.pri
-	src/declarative
-	src/gui
-	src/script
-	tools/linguist
-	tools/shared"
-
 QCONFIG_DEFINE="QT_ZLIB"
 
 src_prepare() {

diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index a1fb867..60bff0a 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -48,21 +48,6 @@ QT4_TARGET_DIRECTORIES="
 	tools/linguist/lrelease
 	tools/linguist/lupdate"
 
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include
-	src/3rdparty/des
-	src/3rdparty/easing
-	src/3rdparty/harfbuzz
-	src/3rdparty/md4
-	src/3rdparty/md5
-	src/3rdparty/sha1
-	src/3rdparty/zlib_dependency.pri
-	src/declarative
-	src/gui
-	src/script
-	tools/linguist
-	tools/shared"
-
 QCONFIG_DEFINE="QT_ZLIB"
 
 src_prepare() {

diff --git a/dev-qt/qtdbus/qtdbus-4.8.6.ebuild b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
index cf203e4..d4fcbde 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
@@ -33,13 +33,6 @@ QT4_TARGET_DIRECTORIES="
 	tools/qdbus/qdbusxml2cpp
 	tools/qdbus/qdbuscpp2xml"
 
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/QtCore
-	include/QtDBus
-	include/QtXml
-	src/corelib
-	src/xml"
-
 QCONFIG_ADD="dbus dbus-linked"
 QCONFIG_DEFINE="QT_DBUS"
 

diff --git a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
index cf203e4..d4fcbde 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
@@ -33,13 +33,6 @@ QT4_TARGET_DIRECTORIES="
 	tools/qdbus/qdbusxml2cpp
 	tools/qdbus/qdbuscpp2xml"
 
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/QtCore
-	include/QtDBus
-	include/QtXml
-	src/corelib
-	src/xml"
-
 QCONFIG_ADD="dbus dbus-linked"
 QCONFIG_DEFINE="QT_DBUS"
 

diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
index a0b8602..3247b62 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
@@ -36,12 +36,6 @@ QT4_TARGET_DIRECTORIES="
 	tools/qml
 	tools/qmlplugindump"
 
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src
-	tools
-	translations"
-
 QCONFIG_ADD="declarative"
 QCONFIG_DEFINE="QT_DECLARATIVE"
 

diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
index a0b8602..3247b62 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
@@ -36,12 +36,6 @@ QT4_TARGET_DIRECTORIES="
 	tools/qml
 	tools/qmlplugindump"
 
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src
-	tools
-	translations"
-
 QCONFIG_ADD="declarative"
 QCONFIG_DEFINE="QT_DECLARATIVE"
 

diff --git a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
index db57ecf..50072f8 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
@@ -47,12 +47,6 @@ QT4_TARGET_DIRECTORIES="
 	demos
 	examples"
 
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	doc/src/images
-	include
-	src
-	tools"
-
 src_prepare() {
 	qt4-build-multilib_src_prepare
 

diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index db57ecf..50072f8 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -47,12 +47,6 @@ QT4_TARGET_DIRECTORIES="
 	demos
 	examples"
 
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	doc/src/images
-	include
-	src
-	tools"
-
 src_prepare() {
 	qt4-build-multilib_src_prepare
 

diff --git a/dev-qt/qtgui/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild
index e652ddf..8191652 100644
--- a/dev-qt/qtgui/qtgui-4.8.6.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild
@@ -79,10 +79,6 @@ QT4_TARGET_DIRECTORIES="
 	src/plugins/imageformats/jpeg
 	src/plugins/imageformats/tga
 	src/plugins/inputmethods"
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src
-	tools/qtconfig"
 
 pkg_setup() {
 	use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"

diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
index 2e49b9d..288ec37 100644
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
@@ -78,10 +78,6 @@ QT4_TARGET_DIRECTORIES="
 	src/plugins/imageformats/jpeg
 	src/plugins/imageformats/tga
 	src/plugins/inputmethods"
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src
-	tools/qtconfig"
 
 pkg_setup() {
 	use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"

diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild b/dev-qt/qthelp/qthelp-4.8.6.ebuild
index 4ee3aa3..f385329 100644
--- a/dev-qt/qthelp/qthelp-4.8.6.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild
@@ -40,14 +40,6 @@ QT4_TARGET_DIRECTORIES="
 	tools/assistant/tools/qhelpconverter
 	tools/qdoc3"
 
-QT4_EXTRACT_DIRECTORIES="
-	demos
-	doc
-	examples
-	include
-	src
-	tools"
-
 pkg_setup() {
 	use compat && QT4_TARGET_DIRECTORIES+="
 		tools/assistant/compat

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 4ee3aa3..f385329 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -40,14 +40,6 @@ QT4_TARGET_DIRECTORIES="
 	tools/assistant/tools/qhelpconverter
 	tools/qdoc3"
 
-QT4_EXTRACT_DIRECTORIES="
-	demos
-	doc
-	examples
-	include
-	src
-	tools"
-
 pkg_setup() {
 	use compat && QT4_TARGET_DIRECTORIES+="
 		tools/assistant/compat

diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
index d31a7a8..897fa0d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
@@ -27,16 +27,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.8.0-alsa.patch"
 )
 
-QT4_TARGET_DIRECTORIES="
-	src/multimedia"
-
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/Qt
-	include/QtCore
-	include/QtGui
-	include/QtMultimedia
-	src/corelib
-	src/gui"
+QT4_TARGET_DIRECTORIES="src/multimedia"
 
 QCONFIG_ADD="multimedia"
 QCONFIG_DEFINE="QT_MULTIMEDIA"

diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
index d31a7a8..897fa0d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
@@ -27,16 +27,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.8.0-alsa.patch"
 )
 
-QT4_TARGET_DIRECTORIES="
-	src/multimedia"
-
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/Qt
-	include/QtCore
-	include/QtGui
-	include/QtMultimedia
-	src/corelib
-	src/gui"
+QT4_TARGET_DIRECTORIES="src/multimedia"
 
 QCONFIG_ADD="multimedia"
 QCONFIG_DEFINE="QT_MULTIMEDIA"

diff --git a/dev-qt/qtopengl/qtopengl-4.8.6.ebuild b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
index 11b887b..404909b 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
@@ -29,16 +29,6 @@ QT4_TARGET_DIRECTORIES="
 	src/opengl
 	src/plugins/graphicssystems/opengl"
 
-QT4_EXTRACT_DIRECTORIES="
-	include/QtCore
-	include/QtGui
-	include/QtOpenGL
-	src/corelib
-	src/gui
-	src/opengl
-	src/plugins
-	src/3rdparty"
-
 QCONFIG_ADD="opengl"
 QCONFIG_DEFINE="QT_OPENGL"
 

diff --git a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
index 11b887b..404909b 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
@@ -29,16 +29,6 @@ QT4_TARGET_DIRECTORIES="
 	src/opengl
 	src/plugins/graphicssystems/opengl"
 
-QT4_EXTRACT_DIRECTORIES="
-	include/QtCore
-	include/QtGui
-	include/QtOpenGL
-	src/corelib
-	src/gui
-	src/opengl
-	src/plugins
-	src/3rdparty"
-
 QCONFIG_ADD="opengl"
 QCONFIG_DEFINE="QT_OPENGL"
 

diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
index e11f3af..73e2d06 100644
--- a/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
@@ -27,16 +27,6 @@ QT4_TARGET_DIRECTORIES="
 	src/openvg
 	src/plugins/graphicssystems/openvg"
 
-QT4_EXTRACT_DIRECTORIES="
-	include/QtCore
-	include/QtGui
-	include/QtOpenVG
-	src/corelib
-	src/gui
-	src/openvg
-	src/plugins
-	src/3rdparty"
-
 QCONFIG_ADD="openvg"
 QCONFIG_DEFINE="QT_OPENVG"
 

diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
index e11f3af..73e2d06 100644
--- a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
@@ -27,16 +27,6 @@ QT4_TARGET_DIRECTORIES="
 	src/openvg
 	src/plugins/graphicssystems/openvg"
 
-QT4_EXTRACT_DIRECTORIES="
-	include/QtCore
-	include/QtGui
-	include/QtOpenVG
-	src/corelib
-	src/gui
-	src/openvg
-	src/plugins
-	src/3rdparty"
-
 QCONFIG_ADD="openvg"
 QCONFIG_DEFINE="QT_OPENVG"
 

diff --git a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
index d684e9f..759970f 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
@@ -36,10 +36,6 @@ QT4_TARGET_DIRECTORIES="
 	src/phonon
 	src/plugins/phonon"
 
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src"
-
 QCONFIG_ADD="phonon"
 
 pkg_setup() {

diff --git a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
index d684e9f..759970f 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
@@ -36,10 +36,6 @@ QT4_TARGET_DIRECTORIES="
 	src/phonon
 	src/plugins/phonon"
 
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src"
-
 QCONFIG_ADD="phonon"
 
 pkg_setup() {

diff --git a/dev-qt/qtscript/qtscript-4.8.6.ebuild b/dev-qt/qtscript/qtscript-4.8.6.ebuild
index 33ef722..3f6b70c 100644
--- a/dev-qt/qtscript/qtscript-4.8.6.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.6.ebuild
@@ -22,12 +22,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="src/script"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/Qt
-	include/QtCore
-	include/QtScript
-	src/3rdparty/javascriptcore
-	src/corelib"
 
 QCONFIG_ADD="script"
 QCONFIG_DEFINE="QT_SCRIPT"

diff --git a/dev-qt/qtscript/qtscript-4.8.9999.ebuild b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
index 33ef722..3f6b70c 100644
--- a/dev-qt/qtscript/qtscript-4.8.9999.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
@@ -22,12 +22,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="src/script"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/Qt
-	include/QtCore
-	include/QtScript
-	src/3rdparty/javascriptcore
-	src/corelib"
 
 QCONFIG_ADD="script"
 QCONFIG_DEFINE="QT_SCRIPT"

diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index 05ad99c..c899348 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -36,13 +36,6 @@ QT4_TARGET_DIRECTORIES="
 	src/sql
 	src/plugins/sqldrivers"
 
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/Qt
-	include/QtCore
-	include/QtSql
-	src/corelib
-	src/plugins"
-
 src_configure() {
 	myconf+="
 		$(qt_use firebird sql-ibase  plugin)

diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
index 05ad99c..c899348 100644
--- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
@@ -36,13 +36,6 @@ QT4_TARGET_DIRECTORIES="
 	src/sql
 	src/plugins/sqldrivers"
 
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/Qt
-	include/QtCore
-	include/QtSql
-	src/corelib
-	src/plugins"
-
 src_configure() {
 	myconf+="
 		$(qt_use firebird sql-ibase  plugin)

diff --git a/dev-qt/qtsvg/qtsvg-4.8.6.ebuild b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
index 6e4baef..7228081 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
@@ -28,18 +28,6 @@ QT4_TARGET_DIRECTORIES="
 	src/plugins/imageformats/svg
 	src/plugins/iconengines/svgiconengine"
 
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/QtSvg
-	include/Qt
-	include/QtGui
-	include/QtCore
-	include/QtXml
-	src/corelib
-	src/gui
-	src/plugins
-	src/xml
-	src/3rdparty"
-
 QCONFIG_ADD="svg"
 QCONFIG_DEFINE="QT_SVG"
 

diff --git a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
index 6e4baef..7228081 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
@@ -28,18 +28,6 @@ QT4_TARGET_DIRECTORIES="
 	src/plugins/imageformats/svg
 	src/plugins/iconengines/svgiconengine"
 
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/QtSvg
-	include/Qt
-	include/QtGui
-	include/QtCore
-	include/QtXml
-	src/corelib
-	src/gui
-	src/plugins
-	src/xml
-	src/3rdparty"
-
 QCONFIG_ADD="svg"
 QCONFIG_DEFINE="QT_SVG"
 

diff --git a/dev-qt/qttest/qttest-4.8.6.ebuild b/dev-qt/qttest/qttest-4.8.6.ebuild
index a0292cb..71ef73a 100644
--- a/dev-qt/qttest/qttest-4.8.6.ebuild
+++ b/dev-qt/qttest/qttest-4.8.6.ebuild
@@ -21,13 +21,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-QT4_TARGET_DIRECTORIES="
-	src/testlib"
-
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/QtTest
-	include/QtCore
-	src/corelib"
+QT4_TARGET_DIRECTORIES="src/testlib"
 
 src_configure() {
 	myconf+="

diff --git a/dev-qt/qttest/qttest-4.8.9999.ebuild b/dev-qt/qttest/qttest-4.8.9999.ebuild
index a0292cb..71ef73a 100644
--- a/dev-qt/qttest/qttest-4.8.9999.ebuild
+++ b/dev-qt/qttest/qttest-4.8.9999.ebuild
@@ -21,13 +21,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-QT4_TARGET_DIRECTORIES="
-	src/testlib"
-
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/QtTest
-	include/QtCore
-	src/corelib"
+QT4_TARGET_DIRECTORIES="src/testlib"
 
 src_configure() {
 	myconf+="

diff --git a/dev-qt/qttranslations/qttranslations-4.8.6.ebuild b/dev-qt/qttranslations/qttranslations-4.8.6.ebuild
index f19042f..43487af 100644
--- a/dev-qt/qttranslations/qttranslations-4.8.6.ebuild
+++ b/dev-qt/qttranslations/qttranslations-4.8.6.ebuild
@@ -22,9 +22,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="translations"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	src
-	tools"
 
 src_configure() {
 	cd translations || die

diff --git a/dev-qt/qttranslations/qttranslations-4.8.9999.ebuild b/dev-qt/qttranslations/qttranslations-4.8.9999.ebuild
index f19042f..43487af 100644
--- a/dev-qt/qttranslations/qttranslations-4.8.9999.ebuild
+++ b/dev-qt/qttranslations/qttranslations-4.8.9999.ebuild
@@ -22,9 +22,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="translations"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	src
-	tools"
 
 src_configure() {
 	cd translations || die

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
index eb66856..c435448 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
@@ -44,10 +44,6 @@ QT4_TARGET_DIRECTORIES="
 	src/3rdparty/webkit/Source/WebCore
 	src/3rdparty/webkit/Source/WebKit/qt"
 
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src"
-
 QCONFIG_ADD="webkit"
 QCONFIG_DEFINE="QT_WEBKIT"
 

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
index eb66856..c435448 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
@@ -44,10 +44,6 @@ QT4_TARGET_DIRECTORIES="
 	src/3rdparty/webkit/Source/WebCore
 	src/3rdparty/webkit/Source/WebKit/qt"
 
-QT4_EXTRACT_DIRECTORIES="
-	include
-	src"
-
 QCONFIG_ADD="webkit"
 QCONFIG_DEFINE="QT_WEBKIT"
 

diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
index 9f6a15b..9c99fa9 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
@@ -26,15 +26,6 @@ QT4_TARGET_DIRECTORIES="
 	tools/xmlpatterns
 	tools/xmlpatternsvalidator"
 
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/QtCore
-	include/QtNetwork
-	include/QtXml
-	include/QtXmlPatterns
-	src/network
-	src/xml
-	src/corelib"
-
 QCONFIG_ADD="xmlpatterns"
 QCONFIG_DEFINE="QT_XMLPATTERNS"
 

diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
index 9f6a15b..9c99fa9 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
@@ -26,15 +26,6 @@ QT4_TARGET_DIRECTORIES="
 	tools/xmlpatterns
 	tools/xmlpatternsvalidator"
 
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/QtCore
-	include/QtNetwork
-	include/QtXml
-	include/QtXmlPatterns
-	src/network
-	src/xml
-	src/corelib"
-
 QCONFIG_ADD="xmlpatterns"
 QCONFIG_DEFINE="QT_XMLPATTERNS"
 

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 84aa4b4..8f49441 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -53,17 +53,11 @@ fi
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
 
-# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Space-separated list including the directories that will be extracted from
-# Qt tarball.
-
 # @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# Arguments for build_target_directories. Takes the directories in which the
-# code should be compiled. This is a space-separated list.
+# Space-separated list of directories that will be configured,
+# compiled, and installed. All paths must be relative to ${S}.
 
 # @FUNCTION: qt4-build-multilib_src_unpack
 # @DESCRIPTION:
@@ -89,25 +83,8 @@ qt4-build-multilib_src_unpack() {
 	fi
 
 	case ${QT4_BUILD_TYPE} in
-		live)
-			git-r3_src_unpack
-			;;
-		release)
-			local tarball="${MY_P}.tar.gz" target= targets=
-			# On MacOS we need src/gui/kernel/qapplication_mac.mm for platform detection
-			for target in \
-				bin config.tests configure doc/doc.pri LICENSE.GPL3 mkspecs projects.pro qmake \
-				src/{plugins/qpluginbase,qbase,qt_install,qt_targets}.pri {src/src,tools/tools}.pro \
-				$([[ ${CHOST} == *-apple-darwin* ]] && echo src/gui/kernel/qapplication_mac.mm) \
-				${QT4_EXTRACT_DIRECTORIES}
-			do
-				targets+="${MY_P}/${target} "
-			done
-
-			ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
-			tar -xzf "${DISTDIR}"/${tarball} ${targets}
-			eend $? || die "failed to unpack"
-			;;
+		live)    git-r3_src_unpack ;;
+		release) default ;;
 	esac
 }