[gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/

[Davide Pesavento]

commit:     58eb7ba78812cedb1f458b0f719404af81ee800c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 16 04:09:42 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Nov 16 04:09:42 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=58eb7ba7

[dev-qt/qthelp:4] Sync.

Package-Manager: portage-2.2.14

---
 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild 
b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 7235819..0bb1a0f 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -52,11 +52,8 @@ src_unpack() {
        # compat version
        # 
http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
        if use compat; then
-               unpack 
qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \
-                       qt-assistant-compat-headers-4.7.tar.gz
                mv 
"${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \
                        "${S}"/tools/assistant/compat || die
-               mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
        fi
 }
 
@@ -78,6 +75,11 @@ multilib_src_configure() {
                -no-nas-sound -no-cups -no-nis -fontconfig
        )
        qt4_multilib_src_configure
+
+       if use compat; then
+               # syncqt knows nothing about these headers (bug 529398)
+               cp -pr "${WORKDIR}"/QtAssistant "${BUILD_DIR}"/include || die
+       fi
 }
 
 multilib_src_compile() {
@@ -95,16 +97,20 @@ multilib_src_compile() {
 multilib_src_install() {
        qt4_multilib_src_install
 
-       if use compat; then
-               insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
-               doins tools/assistant/compat/features/assistant.prf
-       fi
-
        if multilib_is_native_abi; then
                emake INSTALL_ROOT="${D}" install_qchdocs
                use doc && emake INSTALL_ROOT="${D}" install_htmldocs
 
                # do not compress .qch files
-               docompress -x "${QT4_DOCDIR}"/qch
+               docompress -x "${QT4_DOCDIR#${EPREFIX}}"/qch
+       fi
+}
+
+multilib_src_install_all() {
+       qt4_multilib_src_install_all
+
+       if use compat; then
+               insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
+               doins tools/assistant/compat/features/assistant.prf
        fi
 }