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 1BB301389E2 for ; Wed, 26 Nov 2014 18:30:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6C58E07A0; Wed, 26 Nov 2014 18:30:08 +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 4CDCDE07A0 for ; Wed, 26 Nov 2014 18:30:08 +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 768223402E6 for ; Wed, 26 Nov 2014 18:30:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21A2FAF72 for ; Wed, 26 Nov 2014 18:30:06 +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: <1417026590.b5add565b4d9e289ff9a4cfd70c7fec296a343a7.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: b5add565b4d9e289ff9a4cfd70c7fec296a343a7 X-VCS-Branch: master Date: Wed, 26 Nov 2014 18:30:06 +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: 45a8d4fa-73f2-44bc-927a-688a3df774c4 X-Archives-Hash: 45e54a05bd6cb2023fbb4d3ec3d2e392 commit: b5add565b4d9e289ff9a4cfd70c7fec296a343a7 Author: Davide Pesavento gentoo org> AuthorDate: Wed Nov 26 18:29:50 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Wed Nov 26 18:29:50 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b5add565 [dev-qt/qthelp:4] Sync. Package-Manager: portage-2.2.14 --- dev-qt/qthelp/qthelp-4.8.9999.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild index 0bb1a0f..55ad8ad 100644 --- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild +++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild @@ -52,8 +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 - mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \ - "${S}"/tools/assistant/compat || die + mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die + mv "${WORKDIR}"/QtAssistant "${S}"/include || die fi } @@ -78,7 +78,7 @@ multilib_src_configure() { if use compat; then # syncqt knows nothing about these headers (bug 529398) - cp -pr "${WORKDIR}"/QtAssistant "${BUILD_DIR}"/include || die + cp -pr "${S}"/include/QtAssistant "${BUILD_DIR}"/include || die fi }