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

[Davide Pesavento]

commit:     46bbe9ea1137984ed7909d8da818f7980dc1a056
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 12 02:14:10 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Nov 12 02:14:10 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=46bbe9ea

[dev-qt/qtcore:4] Move the rest of multilib_src_install_all to the eclass.

---
 dev-qt/qtcore/qtcore-4.8.6.ebuild    | 7 -------
 dev-qt/qtcore/qtcore-4.8.9999.ebuild | 7 -------
 eclass/qt4-build-multilib.eclass     | 3 +++
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild 
b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index e06581e..542bc0b 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -89,10 +89,3 @@ multilib_src_configure() {
        )
        qt4_multilib_src_configure
 }
-
-multilib_src_install_all() {
-       qt4_multilib_src_install_all
-
-       dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
-       mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
-}

diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild 
b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index e06581e..542bc0b 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -89,10 +89,3 @@ multilib_src_configure() {
        )
        qt4_multilib_src_configure
 }
-
-multilib_src_install_all() {
-       qt4_multilib_src_install_all
-
-       dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
-       mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
-}

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 441371b..f53fed2 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -458,6 +458,9 @@ qt4_multilib_src_install_all() {
                                "${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
                                || die "sed failed (qconfig.h)"
                fi
+
+               dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
+               mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
        fi
 
        # install private headers of a few modules