pesa 14/11/16 04:06:13 Modified: qthelp-4.8.6-r1.ebuild ChangeLog Log: 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!)
Revision Changes Path 1.2 dev-qt/qthelp/qthelp-4.8.6-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?r1=1.1&r2=1.2 Index: qthelp-4.8.6-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qthelp-4.8.6-r1.ebuild 15 Nov 2014 02:36:55 -0000 1.1 +++ qthelp-4.8.6-r1.ebuild 16 Nov 2014 04:06:13 -0000 1.2 @@ -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 @@ # 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 @@ -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_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 } 1.24 dev-qt/qthelp/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.24&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?r1=1.23&r2=1.24 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ChangeLog 15 Nov 2014 02:36:55 -0000 1.23 +++ ChangeLog 16 Nov 2014 04:06:13 -0000 1.24 @@ -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 <[email protected]> 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)
