From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1STydF-0006Ke-S9 for garchives@archives.gentoo.org; Mon, 14 May 2012 17:00:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11426E0687; Mon, 14 May 2012 17:00:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C16FBE0687 for ; Mon, 14 May 2012 17:00:17 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08D7B1BC081 for ; Mon, 14 May 2012 17:00:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B6EB4E5429 for ; Mon, 14 May 2012 17:00:15 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1337014787.13131c1852354862d887086d0f5369d6c2a4ac32.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/qt-assistant/files/, x11-libs/qt-assistant/ X-VCS-Repository: proj/qt X-VCS-Files: x11-libs/qt-assistant/Manifest x11-libs/qt-assistant/files/qt-assistant-4.7-include.tar.gz x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild X-VCS-Directories: x11-libs/qt-assistant/files/ x11-libs/qt-assistant/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 13131c1852354862d887086d0f5369d6c2a4ac32 X-VCS-Branch: master Date: Mon, 14 May 2012 17:00:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 0f4cae27-359f-43a4-9e96-72fa309e988f X-Archives-Hash: 7c98622bd050cd8cf7dd7452e7e38a3c commit: 13131c1852354862d887086d0f5369d6c2a4ac32 Author: Davide Pesavento gmail com> AuthorDate: Mon May 14 16:59:47 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon May 14 16:59:47 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3D13131c18 [x11-libs/qt-assistant] Sync with portage. (Portage version: 2.2.0_alpha104/git/Linux x86_64, unsigned Manifest comm= it) --- x11-libs/qt-assistant/Manifest | 1 + .../files/qt-assistant-4.7-include.tar.gz | Bin 448 -> 0 bytes x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild | 21 +++++++++++---= ----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manif= est index 9ac0ec7..9e50f44 100644 --- a/x11-libs/qt-assistant/Manifest +++ b/x11-libs/qt-assistant/Manifest @@ -1 +1,2 @@ +DIST qt-assistant-compat-headers-4.7.tar.gz 448 SHA256 73ae604834cc89d6c= 67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 SHA512 da14cb9904591f4389= 862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66= c88b94e23df5fc25e33e01f1ed4d3093460bb WHIRLPOOL 26c42c101aab36a8d0355f124= 3226f6b8bd5a477c5aafece7e036f18a9fcfe98ae016042befe494fca0c42b825e2953982= 5466c1ddb720102fa6c65e9cbaec61 DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 32989= 6 RMD160 f34da3587cb311f42aa19b9c8259b90269590c61 SHA1 7a5e5155136c406e5b= 7eb880eed752f56625d10b SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b8= 64e58b99b64b7b5549c2d diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.7-include.tar.gz = b/x11-libs/qt-assistant/files/qt-assistant-4.7-include.tar.gz deleted file mode 100644 index 34207d7..0000000 Binary files a/x11-libs/qt-assistant/files/qt-assistant-4.7-include.tar.g= z and /dev/null differ diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-lib= s/qt-assistant/qt-assistant-4.8.9999.ebuild index c0643af..55f346b 100644 --- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild +++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild @@ -7,13 +7,17 @@ EAPI=3D4 inherit qt4-build =20 DESCRIPTION=3D"The Help module and Assistant application for the Qt tool= kit" -SRC_URI+=3D" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistant= client-library-compat-src-4.6.3.tar.gz )" -SLOT=3D"4" +SRC_URI+=3D" + compat? ( + ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat= -src-4.6.3.tar.gz + http://dev.gentoo.org/~pesa/distfiles/${PN}-compat-headers-4.7.tar.gz + )" =20 +SLOT=3D"4" if [[ ${QT4_BUILD_TYPE} =3D=3D live ]]; then KEYWORDS=3D"" else - KEYWORDS=3D"~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos" + KEYWORDS=3D"~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos" fi IUSE=3D"compat doc +glib qt3support trace webkit" =20 @@ -53,12 +57,11 @@ src_unpack() { # compat version # http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-avail= able-as-extra-source-package/ if use compat; then - unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz + unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz \ + ${PN}-compat-headers-4.7.tar.gz mv "${WORKDIR}"/${PN}-qassistantclient-library-compat-version-4.6.3 \ - "${S}"/tools/assistant/compat || - die "moving compat to the right place failed" - tar xzf "${FILESDIR}"/${PN}-4.7-include.tar.gz -C "${S}"/include/ || - die "unpacking the include files failed" + "${S}"/tools/assistant/compat || die + mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die fi } =20 @@ -100,8 +103,8 @@ src_compile() { =20 if use doc; then emake docs - # live ebuild cannot build qch_docs. It will build them through emake d= ocs elif [[ ${QT4_BUILD_TYPE} =3D=3D release ]]; then + # live ebuild cannot build qch_docs, it will build them through emake = docs emake qch_docs fi }