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

[Davide Pesavento]

commit:     b617f4a6afa0ebcccecb634e4233a20cb5486450
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 11 21:43:58 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 21:43:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b617f4a6

[qt-core:5] Handle qmake and mkspecs installation in qt5-build.eclass.

---
 eclass/qt5-build.eclass                |    6 ++++++
 x11-libs/qt-core/qt-core-5.9999.ebuild |    8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index fa3ea0e..b8fd1e1 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -306,6 +306,12 @@ qt5-build_src_install() {
 		popd >/dev/null || die
 	done
 
+	if [[ ${PN} == "qt-core" ]]; then
+		pushd "${QT5_BUILD_DIR}" >/dev/null || die
+		emake INSTALL_ROOT="${D}" install_{qmake,mkspecs}
+		popd >/dev/null || die
+	fi
+
 	# TODO: install_qconfigs
 	# TODO: pkgconfig files are installed in the wrong place
 

diff --git a/x11-libs/qt-core/qt-core-5.9999.ebuild b/x11-libs/qt-core/qt-core-5.9999.ebuild
index 3273e47..881e035 100644
--- a/x11-libs/qt-core/qt-core-5.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-5.9999.ebuild
@@ -45,11 +45,3 @@ src_configure() {
 	)
 	qt5-build_src_configure
 }
-
-src_install() {
-	qt5-build_src_install
-
-	pushd "${QT5_BUILD_DIR}" >/dev/null || die
-	emake INSTALL_ROOT="${D}" install_{qmake,mkspecs}
-	popd >/dev/null || die
-}