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

[Davide Pesavento]

commit:     148c409cf4462865ce3d496b79ac09b5dfeb14ac
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 10 03:37:15 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 03:37:15 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=148c409c

[dev-qt/qtcore:4] Move and simplify env.d file installation to eclass.

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

diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild 
b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index af8ef25..e06581e 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -93,17 +93,6 @@ multilib_src_configure() {
 multilib_src_install_all() {
        qt4_multilib_src_install_all
 
-       # List all the multilib libdirs
-       local libdirs=
-       for libdir in $(get_all_libdirs); do
-               libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
-       done
-
-       cat <<-EOF > "${T}"/44qt4
-       LDPATH="${libdirs:1}"
-       EOF
-       doenvd "${T}"/44qt4
-
        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 af8ef25..e06581e 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -93,17 +93,6 @@ multilib_src_configure() {
 multilib_src_install_all() {
        qt4_multilib_src_install_all
 
-       # List all the multilib libdirs
-       local libdirs=
-       for libdir in $(get_all_libdirs); do
-               libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
-       done
-
-       cat <<-EOF > "${T}"/44qt4
-       LDPATH="${libdirs:1}"
-       EOF
-       doenvd "${T}"/44qt4
-
        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 eae348f..441371b 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -413,6 +413,12 @@ qt4_multilib_src_install() {
                einfo "Running $*"
                "$@"
 
+               # install env.d file
+               cat > "${T}/44qt4-${CHOST}" <<-_EOF_
+                       LDPATH="${QT4_LIBDIR}"
+               _EOF_
+               doenvd "${T}/44qt4-${CHOST}"
+
                # install qtchooser configuration file
                cat > "${T}/qt4-${CHOST}.conf" <<-_EOF_
                        ${QT4_BINDIR}