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 1S9mVI-0003M1-EM for garchives@archives.gentoo.org; Tue, 20 Mar 2012 00:00:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2EB4EE08F9; Tue, 20 Mar 2012 00:00:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DC07BE08F9 for ; Tue, 20 Mar 2012 00:00:36 +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 F1A511B400D for ; Tue, 20 Mar 2012 00:00:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B457BE5403 for ; Tue, 20 Mar 2012 00:00:33 +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: <1332201588.a9871cefb900ef8340cfdfe3c3267d9774b1afcd.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-util/qt-creator/ X-VCS-Repository: proj/qt X-VCS-Files: dev-util/qt-creator/metadata.xml dev-util/qt-creator/qt-creator-9999.ebuild X-VCS-Directories: dev-util/qt-creator/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: a9871cefb900ef8340cfdfe3c3267d9774b1afcd X-VCS-Branch: master Date: Tue, 20 Mar 2012 00:00: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 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 0cc1aaa9-0b03-45d2-93cc-5f44a804032b X-Archives-Hash: eefe693a12854560a598dd8ac8b34279 commit: a9871cefb900ef8340cfdfe3c3267d9774b1afcd Author: Davide Pesavento gmail com> AuthorDate: Mon Mar 19 23:59:48 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Mar 19 23:59:48 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3Da9871cef qt-creator: sync with portage. (Portage version: 2.2.0_alpha92/git/Linux x86_64, unsigned Manifest commi= t) --- dev-util/qt-creator/metadata.xml | 3 +- dev-util/qt-creator/qt-creator-9999.ebuild | 71 ++++++++++++++--------= ------ 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metad= ata.xml index 44282bd..91bd2ae 100644 --- a/dev-util/qt-creator/metadata.xml +++ b/dev-util/qt-creator/metadata.xml @@ -11,6 +11,7 @@ Davide Pesavento + Enable autotools project manager plugin Add support for dev-vcs/bzr version co= ntrol system Use the bundled copy of dev-libs/bota= n Enable cmake project manager plugin @@ -18,7 +19,7 @@ Add support for dev-vcs/git version contr= ol system Enable integration with MADDE (Maemo Application D= evelopment and Debugging Environment) Add support for dev-vcs/mercurial v= ersion control system - Enable perforce software configuration manager = plugin + Add support for Perforce version control system= (requires manual installation of Perforce client) Add support for memory debugging using dev= -util/valgrind diff --git a/dev-util/qt-creator/qt-creator-9999.ebuild b/dev-util/qt-cre= ator/qt-creator-9999.ebuild index 8cd8c72..a62dc0a 100644 --- a/dev-util/qt-creator/qt-creator-9999.ebuild +++ b/dev-util/qt-creator/qt-creator-9999.ebuild @@ -2,21 +2,23 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D"4" +EAPI=3D4 + LANGS=3D"cs de es fr hu it ja pl ru sl uk zh_CN" -MY_P=3D${PN}-${PV/_/-}-src =20 inherit multilib eutils flag-o-matic =20 -if [[ ${PV} =3D=3D 9999 ]]; then +MY_P=3D${PN}-${PV/_/-}-src +if [[ ${PV} =3D=3D *9999* ]]; then QTCREATOR_SUFFIX=3D"-edge" - EGIT_REPO_URI=3D"git://gitorious.org/${PN}/${PN}.git - https://git.gitorious.org/${PN}/${PN}.git" inherit qt4${QTCREATOR_SUFFIX} git-2 + EGIT_REPO_URI=3D"git://gitorious.org/${PN}/${PN}.git + https://git.gitorious.org/${PN}/${PN}.git" else QTCREATOR_SUFFIX=3D"-r2" - SRC_URI=3D"http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz" inherit qt4${QTCREATOR_SUFFIX} + SRC_URI=3D"http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz" + S=3D${WORKDIR}/${MY_P} fi =20 DESCRIPTION=3D"Lightweight IDE for C++ development centering around Qt" @@ -24,36 +26,34 @@ HOMEPAGE=3D"http://qt.nokia.com/products/developer-to= ols" =20 LICENSE=3D"LGPL-2.1" SLOT=3D"0" -if [[ ${PV} =3D=3D 9999 ]]; then - KEYWORDS=3D"" -else - KEYWORDS=3D"~amd64 ~ppc ~ppc64 ~x86" -fi +KEYWORDS=3D"" =20 -QTC_PLUGINS=3D(bazaar cmake:cmakeprojectmanager cvs fakevim - git madde mercurial perforce subversion valgrind) +QTC_PLUGINS=3D(autotools:autotoolsprojectmanager bazaar cmake:cmakeproje= ctmanager + cvs fakevim git madde mercurial perforce subversion valgrind) IUSE=3D"+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}" =20 -QTVER=3D"4.7.4:4" +QT_PV=3D"4.7.4:4" + CDEPEND=3D" - >=3Dx11-libs/qt-core-${QTVER}[private-headers(+)] - >=3Dx11-libs/qt-declarative-${QTVER}[private-headers(+)] - >=3Dx11-libs/qt-gui-${QTVER}[private-headers(+)] - >=3Dx11-libs/qt-script-${QTVER}[private-headers(+)] - >=3Dx11-libs/qt-sql-${QTVER} - >=3Dx11-libs/qt-svg-${QTVER} - debug? ( >=3Dx11-libs/qt-test-${QTVER} ) - >=3Dx11-libs/qt-assistant-${QTVER}[doc?] + >=3Dx11-libs/qt-assistant-${QT_PV}[doc?] + >=3Dx11-libs/qt-core-${QT_PV}[private-headers(+)] + >=3Dx11-libs/qt-declarative-${QT_PV}[private-headers(+)] + >=3Dx11-libs/qt-gui-${QT_PV}[private-headers(+)] + >=3Dx11-libs/qt-script-${QT_PV}[private-headers(+)] + >=3Dx11-libs/qt-sql-${QT_PV} + >=3Dx11-libs/qt-svg-${QT_PV} + debug? ( >=3Dx11-libs/qt-test-${QT_PV} ) !botan-bundled? ( =3Ddev-libs/botan-1.8* ) " DEPEND=3D"${CDEPEND} !botan-bundled? ( dev-util/pkgconfig ) " RDEPEND=3D"${CDEPEND} - sys-devel/gdb[python] - examples? ( >=3Dx11-libs/qt-demo-${QTVER} ) + >=3Dsys-devel/gdb-7.2[python] + examples? ( >=3Dx11-libs/qt-demo-${QT_PV} ) " PDEPEND=3D" + autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) cmake? ( dev-util/cmake ) cvs? ( dev-vcs/cvs ) @@ -76,11 +76,11 @@ src_prepare() { done =20 if use perforce; then - ewarn + echo ewarn "You have enabled the perforce plugin." ewarn "In order to use it, you need to manually download the perforce = client from" ewarn " http://www.perforce.com/perforce/downloads/index.html" - ewarn + echo fi =20 # fix translations @@ -89,8 +89,7 @@ src_prepare() { =20 if ! use botan-bundled; then # identify system botan and pkg-config file - local botan_version=3D$(best_version dev-libs/botan | cut -d '-' -f3 |= \ - cut -d '.' -f1,2) + local botan_version=3D$(best_version dev-libs/botan | cut -d '-' -f3 |= cut -d '.' -f1,2) local lib_botan=3D$(pkg-config --libs botan-${botan_version}) einfo "Major version of system's botan library to be used: ${botan_ver= sion}" =20 @@ -123,23 +122,25 @@ src_compile() { } =20 src_install() { - emake INSTALL_ROOT=3D"${D%/}${EPREFIX}/usr" install + emake INSTALL_ROOT=3D"${ED}usr" install =20 + # Install documentation if use doc; then - emake INSTALL_ROOT=3D"${D%/}${EPREFIX}/usr" install_inst_qch_docs - emake INSTALL_ROOT=3D"${D%/}${EPREFIX}/usr" install_inst_dev_qch_docs + insinto /usr/share/doc/${PF} + doins share/doc/qtcreator/qtcreator{,-dev}.qch + docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch fi =20 # Install icon & desktop file - doicon src/plugins/coreplugin/images/logo/128/qtcreator.png || die - make_desktop_entry qtcreator 'Qt Creator' qtcreator 'Qt;Development;IDE= ' || die + doicon src/plugins/coreplugin/images/logo/128/qtcreator.png + make_desktop_entry qtcreator 'Qt Creator' qtcreator 'Qt;Development;IDE= ' =20 # Remove unneeded translations local lang for lang in ${LANGS}; do if ! has ${lang} ${LINGUAS}; then - rm "${D}"/usr/share/qtcreator/translations/qtcreator_${lang}.qm \ - || eqawarn "failed to remove ${lang} translation" + rm "${ED}"usr/share/qtcreator/translations/qtcreator_${lang}.qm \ + || eqawarn "Failed to remove ${lang} translation" fi done }