Set importdir to be /usr/$(get_libdir)/qt4/imports instead of the non-FHS-compliant...

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 1b7117d7974ab38ec7eecfbfe46b735f724152ff..9c9f1c1c1f2d4ff0405a428e1a9cea922b20b4d6 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.45 2011/12/16 16:40:46 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.46 2011/12/16 20:02:48 abcd Exp $
+
+  16 Dec 2011; Jonathan Callen <abcd@gentoo.org> qt4-build.eclass:
+  Set importdir to be /usr/$(get_libdir)/qt4/imports instead of the
+  non-FHS-compliant /usr/imports
 
   16 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> leechcraft.eclass:
   Add app-arch/xz-utils dependency to leechcraft.eclass

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 3ca7d465a649f9a9ff2515ee18232dda9927c4df..0109e21af9edc6165ff208299fc449094cce87ef 100644 (file)
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.103 2011/12/10 17:28:16 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.104 2011/12/16 20:02:48 abcd Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -451,6 +451,7 @@ setqtenv() {
        QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
        QTHEADERDIR=${EPREFIX}/usr/include/qt4
        QTPLUGINDIR=${QTLIBDIR}/plugins
+       QTIMPORTDIR=${QTLIBDIR}/imports
        QTSYSCONFDIR=${EPREFIX}/etc/qt4
        QTTRANSDIR=${QTDATADIR}/translations
        QTEXAMPLESDIR=${QTDATADIR}/examples
@@ -517,7 +518,7 @@ standard_configure_options() {
                -datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
                -plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
                -translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
-               -demosdir ${QTDEMOSDIR} -silent -fast -opensource
+               -demosdir ${QTDEMOSDIR} -importdir ${QTIMPORTDIR} -silent -fast -opensource
                ${exceptions}
                -nomake examples -nomake demos"
 
@@ -536,7 +537,10 @@ prepare_directories() {
                {
                        echo "${S}"/mkspecs/common/*.conf
                        find "${S}" -name '*.pr[io]'
-               } | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die
+               } | xargs sed -i \
+                       -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
+                       -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
+                       || die
                "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
                popd >/dev/null
        done