diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-08-13 04:40:43 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-08-13 04:40:43 +0000 |
| commit | 42812e57b0d121c460516ac385035f6faabb51b0 (patch) | |
| tree | 56d593385709d194cd9510537004cd8f301a9f2c /dev-util/qt-creator | |
| parent | Version bump, drop old. (diff) | |
| download | gentoo-2-42812e57b0d121c460516ac385035f6faabb51b0.tar.gz gentoo-2-42812e57b0d121c460516ac385035f6faabb51b0.tar.bz2 gentoo-2-42812e57b0d121c460516ac385035f6faabb51b0.zip | |
Merge with live ebuild.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/qt-creator')
| -rw-r--r-- | dev-util/qt-creator/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/qt-creator/qt-creator-2.5.2.ebuild | 19 |
2 files changed, 16 insertions, 8 deletions
diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog index 393b6ddb843f..805db95393d6 100644 --- a/dev-util/qt-creator/ChangeLog +++ b/dev-util/qt-creator/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/qt-creator # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.125 2012/08/10 00:44:31 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.126 2012/08/13 04:40:43 pesa Exp $ + + 13 Aug 2012; Davide Pesavento <pesa@gentoo.org> qt-creator-2.5.2.ebuild: + Merge with live ebuild. *qt-creator-2.5.2 (10 Aug 2012) diff --git a/dev-util/qt-creator/qt-creator-2.5.2.ebuild b/dev-util/qt-creator/qt-creator-2.5.2.ebuild index ffbb13b850a8..b83f1ea4224f 100644 --- a/dev-util/qt-creator/qt-creator-2.5.2.ebuild +++ b/dev-util/qt-creator/qt-creator-2.5.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.5.2.ebuild,v 1.1 2012/08/10 00:44:31 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.5.2.ebuild,v 1.2 2012/08/13 04:40:43 pesa Exp $ EAPI=4 @@ -8,13 +8,20 @@ LANGS="cs de es fr hu it ja pl ru sl uk zh_CN" inherit multilib eutils flag-o-matic qt4-r2 -MY_P=${PN}-${PV/_/-}-src - DESCRIPTION="Lightweight IDE for C++ development centering around Qt" HOMEPAGE="http://qt.nokia.com/products/developer-tools" -SRC_URI="http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz" - LICENSE="LGPL-2.1" + +if [[ ${PV} == *9999* ]]; then + inherit git-2 + EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git + https://git.gitorious.org/${PN}/${PN}.git" +else + MY_P=${PN}-${PV/_/-}-src + SRC_URI="http://get.qt.nokia.com/qtcreator/${MY_P}.tar.gz" + S=${WORKDIR}/${MY_P} +fi + SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" @@ -53,8 +60,6 @@ PDEPEND=" valgrind? ( dev-util/valgrind ) " -S=${WORKDIR}/${MY_P} - src_prepare() { qt4-r2_src_prepare |