From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 70A701389F5 for ; Sun, 16 Nov 2014 04:09:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4002AE0936; Sun, 16 Nov 2014 04:09:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E9972E0936 for ; Sun, 16 Nov 2014 04:09:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BBE843405D4 for ; Sun, 16 Nov 2014 04:09:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62F8FA3A9 for ; Sun, 16 Nov 2014 04:09:52 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1416110982.58eb7ba78812cedb1f458b0f719404af81ee800c.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qthelp/qthelp-4.8.9999.ebuild X-VCS-Directories: dev-qt/qthelp/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 58eb7ba78812cedb1f458b0f719404af81ee800c X-VCS-Branch: master Date: Sun, 16 Nov 2014 04:09:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8b8d0bc1-ad39-43cb-862e-3506989c2526 X-Archives-Hash: becff7177efa1c67a2e5294d753de521 commit: 58eb7ba78812cedb1f458b0f719404af81ee800c Author: Davide Pesavento gentoo org> AuthorDate: Sun Nov 16 04:09:42 2014 +0000 Commit: Davide Pesavento gentoo 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 }