diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2014-11-16 04:06:13 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2014-11-16 04:06:13 +0000 |
| commit | 76695dec78bc0e018cc636989c197ffbf278495e (patch) | |
| tree | ceb54bdfbcf17ab67f131561727562e13fcfc162 /dev-qt | |
| parent | Drop unneeded python3_4 (un)mask. (diff) | |
| download | gentoo-2-76695dec78bc0e018cc636989c197ffbf278495e.tar.gz gentoo-2-76695dec78bc0e018cc636989c197ffbf278495e.tar.bz2 gentoo-2-76695dec78bc0e018cc636989c197ffbf278495e.zip | |
Fix build of QtAssistantClient compat library (bug 529398). Fix assistant.prf installation. Fix docompress on prefix.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qthelp/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-qt/qthelp/qthelp-4.8.6-r1.ebuild | 26 |
2 files changed, 21 insertions, 11 deletions
diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog index 35a75ee46083..338fd7fc9e5c 100644 --- a/dev-qt/qthelp/ChangeLog +++ b/dev-qt/qthelp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qthelp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.23 2014/11/15 02:36:55 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.24 2014/11/16 04:06:13 pesa Exp $ + + 16 Nov 2014; Davide Pesavento <pesa@gentoo.org> qthelp-4.8.6-r1.ebuild: + Fix build of QtAssistantClient compat library (bug 529398). Fix assistant.prf + installation. Fix docompress on prefix. *qthelp-4.8.6-r1 (15 Nov 2014) diff --git a/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild b/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild index cb03bf8b7d0e..bb045d479af2 100644 --- a/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild +++ b/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:36:55 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v 1.2 2014/11/16 04:06:13 pesa Exp $ EAPI=5 @@ -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 } |