[gentoo-commits] proj/qt:master commit in: x11-libs/qt-dbus/, x11-libs/qt-core/

[gentoo-commits] proj/qt:master commit in: x11-libs/qt-dbus/, x11-libs/qt-core/

[Davide Pesavento]

commit:     9f538cfef362d196a3a75c4b7cceb8193c63ff2a
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon May 14 22:14:09 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 14 22:14:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9f538cfe

[x11-libs/qt-{core,dbus}] Delete useless conditionals.

---
 x11-libs/qt-core/qt-core-4.8.9999.ebuild |   52 ++++++++++++++---------------
 x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild |   14 +++----
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index dbca485..edc937a 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -45,33 +45,31 @@ pkg_setup() {
 		tools/linguist/lrelease
 		tools/linguist/lupdate"
 
-	# This is not needed in live ebuilds since the git repo contains everything
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES=" ${QT4_TARGET_DIRECTORIES}
-			include/Qt
-			include/QtCore
-			include/QtDeclarative
-			include/QtGui
-			include/QtNetwork
-			include/QtScript
-			include/QtXml
-			src/plugins/plugins.pro
-			src/plugins/qpluginbase.pri
-			src/src.pro
-			src/3rdparty/des
-			src/3rdparty/harfbuzz
-			src/3rdparty/md4
-			src/3rdparty/md5
-			src/3rdparty/sha1
-			src/3rdparty/easing
-			src/3rdparty/zlib_dependency.pri
-			src/declarative
-			src/gui
-			src/script
-			tools/shared
-			tools/linguist/shared
-			translations"
-	fi
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtDeclarative
+		include/QtGui
+		include/QtNetwork
+		include/QtScript
+		include/QtXml
+		src/plugins/plugins.pro
+		src/plugins/qpluginbase.pri
+		src/src.pro
+		src/3rdparty/des
+		src/3rdparty/harfbuzz
+		src/3rdparty/md4
+		src/3rdparty/md5
+		src/3rdparty/sha1
+		src/3rdparty/easing
+		src/3rdparty/zlib_dependency.pri
+		src/declarative
+		src/gui
+		src/script
+		tools/shared
+		tools/linguist/shared
+		translations"
+
 	qt4-build_pkg_setup
 }
 

diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
index 1e95ea2..020bf75 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
@@ -32,14 +32,12 @@ pkg_setup() {
 		tools/qdbus/qdbusxml2cpp
 		tools/qdbus/qdbuscpp2xml"
 
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-			include/QtCore
-			include/QtDBus
-			include/QtXml
-			src/corelib
-			src/xml"
-	fi
+	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"