Bump version. Note that this is still masked, as it's related to Qt5.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA5DE03AE

4 files changed, 155 insertions, 17 deletions

diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog
index 333bf5a7eac0..794a56d0bc68 100644
--- a/dev-qt/qt-creator/ChangeLog
+++ b/dev-qt/qt-creator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qt-creator
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.29 2014/03/03 04:02:15 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.30 2014/08/03 14:09:49 zx2c4 Exp $
+
+*qt-creator-3.2.0_rc1 (03 Aug 2014)
+
+  03 Aug 2014; Jason A. Donenfeld <zx2c4@gentoo.org>
+  +qt-creator-3.2.0_rc1.ebuild, metadata.xml:
+  Bump version. Note that this is still masked, as it's related to Qt5.
 
 *qt-creator-3.0.1 (03 Mar 2014)
 
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 9ef35eaac329..e6bc5a527101 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -3,24 +3,26 @@ Hash: SHA256
 
 DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
 DIST qt-creator-opensource-src-3.0.1.tar.gz 24998886 SHA256 829f1608c1c7304c907548315317520bf24cf5db711775d4d5f827607affdf98 SHA512 fa8b2c4196136b310127daf308a5a99b0ef39b2e25db83930f959a034418a08590edbe8e19e6afea02c1d647602bb49c96df8db156d24f6b9b9246c1a93ead19 WHIRLPOOL 36b366775d74f4c61f7f13069793482ce330df5a57f80ccab557f1f02b39afa3408ffaff8fa9dd7b2fbbe9783bcfd2f7ab637cda6327223a1b09b61e153dba0d
+DIST qt-creator-opensource-src-3.2.0-rc1.tar.gz 23373007 SHA256 43e8b7f9ad59f7178eeaa6cc2a1c6ccb9330fe47a6eacd79d08c48d4382d463e SHA512 0a7c25562c3732390dda40c9ef68bca5d4c9f7a58cb4e34440b6b107942108c534f847aff7d6708568373a721948004da8b07a8bb47cf926c784be942e4ebb0f WHIRLPOOL d9f4d627fbb8d042559b5ec961289c6ebed07cfb81ac5f49052ea23e44ec40da72207ee6b7787e64818b8a69e50057beff35aa2e4384bf80e1ec6679036759f0
 EBUILD qt-creator-2.8.1.ebuild 3252 SHA256 28cb33cdf81c8555ac52702c815b6b2eb8967c56c50e4e9ae2c5ebac7c99d5f8 SHA512 5cdc91c9530984bf16c266809a09be7d3b0d5f7195f20091d444575d344f37cb06828f67eb3a7b3cfbb7103d0e879980893fed0a5cae722f8c5beea90f7c4376 WHIRLPOOL 87f87896456df7fa9c054813db4e8aa46dd87bf58221103986ebcb667ec491ddb980f0706632f13a84b35f0ec52714ed46f8018d49e87950ee01f0b355f47f4d
 EBUILD qt-creator-3.0.1.ebuild 3305 SHA256 a0b977f538c62efbb7ecee02667c8bacf49794cc935159771a946ed3ca31a76c SHA512 7be2a219adad92bb7ce054ea92fe39129b20bcfcb784824082287a6f0c9f29129a04a21e5566879169bc6ebb96ba88acab9f1f158888f404afa6f20ae06e391b WHIRLPOOL 30086c2196bd0e0e5e3289f969e75741b6789ae3ce1cde49a88810b61d7ebf73010c270339a6137aa77b5c1acbc21a0b5b75fc5b3b33c095491243215ea8b21f
-MISC ChangeLog 25646 SHA256 55e824a020837fda0f9594be2c757f19d0825d2ba1a917754dc02738ab11454f SHA512 2a62553bc91333f410194e3ebda6452333ea3e3d716e815e1d7528d26b09e85f86029640f353b7c251bb8b091afbb3dc7115e378306809eafd4ee88088179e5b WHIRLPOOL e5961a023730bd2bf12b2892ffb4bba4f7e041c26aad9fa1c436721c944cdc740cae4952736e3f7eba9eb0cd657a0981c7da54df5fc6fa059e2534dcabd264e5
-MISC metadata.xml 1442 SHA256 a477b02330f2e3b6192c301c6deb9349c247ab75d278db4da5d6fe2493fcde38 SHA512 16f2d618be72bd29f5966945d5760916b57cd7951bf971a065e3c027d4f6db907bf06c3ad1f564a77292358fbbae394acd941ab7ef95adea3268c5202f8abf11 WHIRLPOOL 77cdd75d3b6828a8b8d2c4847362994a721a37d5bd0c47ed9079cef8bbd16b376fc21630cb7ec86d8a73cae8318d229f3b7ddaa1a547c6518ec28edbeb15eed3
+EBUILD qt-creator-3.2.0_rc1.ebuild 3421 SHA256 e7e5e85593ed6e1d8b14eeecb49035442293b9a45b2956f6a7c43a90fb3b4a1e SHA512 bf4b33270d3f13ad48c555b5431442fd38b38f82a2a8523c5cb0ec70cc1e2c255d66830467ae08db639ea4f44f3d34b7676e0810fec2dfd76a132825b72d5d35 WHIRLPOOL afa23f6f2f0882a7a1568a8e5a7ba82bc9dc98a3b2cf104901d250caa20b8dc584f16ad581dfc243c3d93976ebdbb71d17526d605ff5a0d8c01f9bca8af0cd64
+MISC ChangeLog 25856 SHA256 c2f61c1e8b493fb4a99d49406d2cbb9709acd2094d92f3a9814b407e2aa792ae SHA512 6024f8147ea3b0bbea26dab56dc19e2ba4cc2dc0d11e2e261de5a427850c3a090b31c075b648ad929cb954c5716cbe70ee0cf945dcf47f2f826696511f55b5d0 WHIRLPOOL cec112b472464445ced13af7763853a38c74e5f690fe3658732d7d901294e490fecf9ff41a5b14345d4c633b3db10f9db46f230652af2a2575d1ceaf21922476
+MISC metadata.xml 1488 SHA256 33982c8b19f5c1863c06e67d15cc6fb1839b12079c31d554dfffc31bb0a13645 SHA512 40621af0e84e7381d59a70a0647019add71f2ca9cfb40071ef19466662376539cb335defef9c4be48a9048339a32d79a568a2301daa7b7f9d787f5dfc17d2c13 WHIRLPOOL 663e510558dafdea97e57123d27d4e385511894d581d19c7873a4d6e2df4af5ecf5fab1eebc321a245ef7ffdd661ec276e3996dbee43bef3a7174a71c245ed48
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTE/7TAAoJENXLsxwXqFxyAlUQAKA6NkGwOQozLPzkjJ3Oy6R6
-OKc0bROMbEzjE/jNdz7/d/XvyDFFIGZThENh8JFaQFuM6I60lVbNlXrVq2qUe5BR
-4/t3B+CWCzii2cp3twq28C2z0VO+eDxoQpKt772YlrqFRHNNvT43omLM8oPHsEe8
-ObmWjFewWKekrZW/Mz4b3qnR+LenFoayRFBEhZv5OZ2g+7JLfTkgF+KDUKjzXrmw
-pig0Jy6xP81zczLb0BnZMSU6s5k2ILqEiwzwOgO2uwdNkhwkKrChAT2ahA9hJvlV
-Fyg4vsSPsxUJBVcHctZn/n0whWV693vUeVlAbicCal788e/EmWEpYAw8I0pxQn/I
-1VEufyZ4g30scXGuGUojue3F3nufOFNTbwu9kCy9871z8L4ctEmOboIBpGDFzyfu
-eu2Re37avghgM1/IilzmTZ1L65HTBqrRRsNKh6W/PUCz3T4sABzjY0mTlUzJN5sp
-k3uNZu45BQRUjq36Whrd2dcMBiuC3amuCjeShVZigk0S6R61MD41kMdKF+cXlcPR
-9BmEDiG7PvsRa9eSd9kTaOGy6wh7PQqVVpq1MHjAwOS/TVClFaQzMptqjNP0MKtG
-G0qAuPQmYQShoArukxRTaCBkNQYyRvHG5wTwwYcDJkP0lRnm1TZifHwYo5y7g8cM
-kfu6FeaCcetB2PVfoMyy
-=W6YV
+iQIcBAEBCAAGBQJT3kM7AAoJEEn8cBKl3gOuVLIQANDwc1FmvKkocV0e5lmB88Q2
+XbvvP6ABxQpJOM5XJXlAHdOv/FgU7HcGJiofTxj/CstFLmk339b5xCVn9yml5Tg/
+0vrMw6Z5wsDguYmKlgt65ay4sO3dPCSXRM9i9WWpBuOrdhSFngvOJV49+0xHSchH
+Iwx+E7cFJBo4ktE1jeT+jU5yxB21OnkFI8JiUVwzw6f1wLrmZgdGinqRkFPC/DL3
+n4w3JfB3z7amLzwwTQU/Z+BaNfkkT8kIFTq0jKcl2FChT+cS0NMfltrw7iDF1F79
+k9FraVOuJluatnYgFzdv1JoRp+1mQH+YzCs+j3LxC4y6cuZk7TrTlzIav2yqUNUe
+Vh+xjF5rS74V9ncrsHfDltkSTdcy68HB2ryOWIvfq8e3cZPUl5rJDPCO4JFhu06j
+G0GhhvjEuKkYOrEx6CEgQwxyYcQZP5mQbz3hI2XfqGihPMY7QBsxcvANJH5DYo00
+qEWVR9zTGqq7P2EIOStfrgM3Mqf0BaoyZTAWgoSExAQfrIi1UQja06crEp0SVGPL
+v+5IpEDsE/uvD2dVWAKa8PYeXXyfGgSw3Nz6LqwNSBFIEalEp8eaCmqE2i2t242z
+rB84SezHWslTnN+pEdQzO/7Ai1iUp1i545hozQMOjtQ0Y4ank3Ro+kPO8nWk/W98
+7BQ74y9H2G1qAOyrfJCz
+=kKcb
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 589b30e69423..aec3238bd1c4 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -21,5 +21,6 @@
 	<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>
+	<flag name="clang">Build clang plugin</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild
new file mode 100644
index 000000000000..1a3ef9ec7a9f
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild,v 1.1 2014/08/03 14:09:49 zx2c4 Exp $
+
+EAPI=5
+
+PLOCALES="cs de fr ja pl ru sl zh_CN zh_TW"
+
+inherit eutils l10n multilib qt4-r2
+
+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-r3
+	EGIT_REPO_URI=(
+		"git://gitorious.org/${PN}/${PN}.git"
+		"https://git.gitorious.org/${PN}/${PN}.git"
+	)
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-opensource-src-${MY_PV}
+	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+	SRC_URI="http://download.qt-project.org/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+fi
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+QTC_PLUGINS=(android autotools:autotoolsprojectmanager baremetal bazaar
+	clang:clangcodemodel 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
+QT_PV="4.8.0:4"
+
+CDEPEND="
+	=dev-libs/botan-1.10*[threads]
+	>=dev-qt/qtcore-${QT_PV}[ssl]
+	>=dev-qt/qtdeclarative-${QT_PV}
+	|| (
+		( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 )
+		( >=dev-qt/qtgui-${QT_PV} <dev-qt/qtgui-4.8.5:4 )
+	)
+	>=dev-qt/qthelp-${QT_PV}[doc?]
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}
+	>=dev-qt/qtsvg-${QT_PV}
+	clang? ( >=sys-devel/clang-3.2 )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-qt/qttest-${QT_PV} )
+"
+RDEPEND="${CDEPEND}
+	>=sys-devel/gdb-7.2[client(+),python]
+	examples? ( >=dev-qt/qtdemo-${QT_PV} )
+"
+PDEPEND="
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	cmake? ( dev-util/cmake )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/^\s+${plugin#*:}\>/d" src/plugins/plugins.pro \
+				|| die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# fix translations
+	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
+		share/qtcreator/translations/translations.pro || die
+
+	# remove bundled qbs for now
+	# TODO: package it and re-enable the plugin
+	rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+	EQMAKE4_EXCLUDE="share/qtcreator/templates/*
+			tests/*"
+	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		TEST=$(use test && echo 1 || echo 0) \
+		USE_SYSTEM_BOTAN=1 \
+		LLVM_INSTALL_DIR=$(use clang && echo $(get_libdir))
+}
+
+src_test() {
+	echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}"
+	cd tests/auto || die
+
+	EQMAKE4_EXCLUDE="valgrind/*"
+	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)"
+
+	emake check
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		insinto /usr/share/doc/${PF}
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	# install desktop file
+	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+}