[gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     90f1d293b6e14c2ab213924fdcf58900e83870a0
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Oct 23 13:11:56 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 13:11:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=90f1d293

[dev-qt/qt-creator] Sync with portage.

Package-Manager: portage-2.2.7

---
 dev-qt/qt-creator/metadata.xml           |  8 +++++---
 dev-qt/qt-creator/qt-creator-9999.ebuild | 22 ++++++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 92a5d23..9626a26 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -7,16 +7,18 @@
 </maintainer>
 <herd>qt</herd>
 <use>
-	<flag name="android">Build Android plugin</flag>
+	<flag name="android">Build plugin for Android devices</flag>
 	<flag name="autotools">Enable autotools project manager plugin</flag>
+	<flag name="baremetal">Build plugin for bare metal devices</flag>
 	<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
 	<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 	<flag name="cmake">Enable cmake project manager plugin</flag>
 	<flag name="fakevim">Enable support for vim-like key bindings</flag>
-	<flag name="madde">Enable integration with MADDE (Maemo Application Development and Debugging Environment)</flag>
+	<flag name="ios">Build plugin for Apple iOS devices</flag>
 	<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
 	<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
-	<flag name="qnx">Build QNX/Blackberry plugin</flag>
+	<flag name="python">Enable Python source code editor</flag>
+	<flag name="qnx">Build plugin for QNX/Blackberry devices</flag>
 	<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 552a33d..3233668 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.0.ebuild,v 1.2 2013/08/15 08:04:02 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.0.0_beta.ebuild,v 1.1 2013/10/23 13:08:04 pesa Exp $
 
 EAPI=5
 
-PLOCALES="cs de es fr it ja pl ru sl uk zh_CN zh_TW"
+PLOCALES="cs de fr ja pl ru sl zh_CN zh_TW"
 
 inherit eutils l10n multilib qt4-r2
 
@@ -12,10 +12,12 @@ DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
 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"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"git://gitorious.org/${PN}/${PN}.git"
+		"https://git.gitorious.org/${PN}/${PN}.git"
+	)
 else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-${MY_PV}-src
@@ -27,9 +29,9 @@ fi
 SLOT="0"
 KEYWORDS=""
 
-QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
-	clearcase cmake:cmakeprojectmanager cvs fakevim git
-	madde mercurial perforce qnx subversion valgrind)
+QTC_PLUGINS=(android autotools:autotoolsprojectmanager baremetal bazaar
+	clearcase cmake:cmakeprojectmanager cvs fakevim git ios mercurial
+	perforce python:pythoneditor qnx subversion valgrind)
 IUSE="debug doc examples test ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
@@ -53,7 +55,7 @@ DEPEND="${CDEPEND}
 	test? ( >=dev-qt/qttest-${QT_PV} )
 "
 RDEPEND="${CDEPEND}
-	>=sys-devel/gdb-7.2[python]
+	>=sys-devel/gdb-7.2[client(+),python]
 	examples? ( >=dev-qt/qtdemo-${QT_PV} )
 "
 PDEPEND="