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 C5D7113877A for ; Fri, 11 Jul 2014 01:35:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85A47E0931; Fri, 11 Jul 2014 01:35:37 +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 11872E0931 for ; Fri, 11 Jul 2014 01:35:37 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C6A7433F6E2 for ; Fri, 11 Jul 2014 01:35:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id B124018011 for ; Fri, 11 Jul 2014 01:35:33 +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: <1405042517.314ebc2b484200c00dcd332e74c5b4a1783f4321.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.6.ebuild 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: 314ebc2b484200c00dcd332e74c5b4a1783f4321 X-VCS-Branch: master Date: Fri, 11 Jul 2014 01:35:33 +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: ee3db74c-c908-418b-b6be-fb0a439293e1 X-Archives-Hash: 15c2e751b1236a16218d2417284ed36d commit: 314ebc2b484200c00dcd332e74c5b4a1783f4321 Author: Davide Pesavento gentoo org> AuthorDate: Fri Jul 11 01:35:17 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri Jul 11 01:35:17 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=314ebc2b [dev-qt/qthelp:4] Unbreak and simplify docs generation/installation. Fixes bug 514942 Package-Manager: portage-2.2.10 --- dev-qt/qthelp/qthelp-4.8.6.ebuild | 30 +++++++++++++----------------- dev-qt/qthelp/qthelp-4.8.9999.ebuild | 30 +++++++++++++----------------- 2 files changed, 26 insertions(+), 34 deletions(-) diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild b/dev-qt/qthelp/qthelp-4.8.6.ebuild index 9b7a09c..7f63af5 100644 --- a/dev-qt/qthelp/qthelp-4.8.6.ebuild +++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild @@ -83,32 +83,28 @@ multilib_src_configure() { multilib_src_compile() { qt4_multilib_src_compile - # qhelpgenerator needs libQtHelp.so.4 - export LD_LIBRARY_PATH=${BUILD_DIR}/lib - export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework - - if use doc; then + # release tarballs are shipped with prebuilt docs + if [[ ${QT4_BUILD_TYPE} == live ]] && multilib_is_native_abi; then + # qhelpgenerator needs libQtHelp.so.4 + export LD_LIBRARY_PATH=${BUILD_DIR}/lib + export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework emake docs - elif [[ ${QT4_BUILD_TYPE} == release ]]; then - # live ebuild cannot build qch_docs, it will build them through emake docs - emake qch_docs fi } multilib_src_install() { qt4_multilib_src_install - emake INSTALL_ROOT="${D}" install_qchdocs - - # do not compress .qch files - docompress -x "${QT4_DOCDIR}"/qch - - if use doc; then - emake INSTALL_ROOT="${D}" install_htmldocs - fi - 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 + fi } diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild index 9b7a09c..7f63af5 100644 --- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild +++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild @@ -83,32 +83,28 @@ multilib_src_configure() { multilib_src_compile() { qt4_multilib_src_compile - # qhelpgenerator needs libQtHelp.so.4 - export LD_LIBRARY_PATH=${BUILD_DIR}/lib - export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework - - if use doc; then + # release tarballs are shipped with prebuilt docs + if [[ ${QT4_BUILD_TYPE} == live ]] && multilib_is_native_abi; then + # qhelpgenerator needs libQtHelp.so.4 + export LD_LIBRARY_PATH=${BUILD_DIR}/lib + export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework emake docs - elif [[ ${QT4_BUILD_TYPE} == release ]]; then - # live ebuild cannot build qch_docs, it will build them through emake docs - emake qch_docs fi } multilib_src_install() { qt4_multilib_src_install - emake INSTALL_ROOT="${D}" install_qchdocs - - # do not compress .qch files - docompress -x "${QT4_DOCDIR}"/qch - - if use doc; then - emake INSTALL_ROOT="${D}" install_htmldocs - fi - 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 + fi }