Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

4 files changed, 167 insertions, 17 deletions

diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog
index 57b1ebb9c16e..19786930e707 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.45 2015/03/29 13:57:41 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.46 2015/04/01 14:52:27 pesa Exp $
+
+*qt-creator-3.4.0_rc1 (01 Apr 2015)
+
+  01 Apr 2015; Davide Pesavento <pesa@gentoo.org> +qt-creator-3.4.0_rc1.ebuild,
+  metadata.xml:
+  Version bump.
 
   29 Mar 2015; Davide Pesavento <pesa@gentoo.org> qt-creator-2.8.1.ebuild,
   qt-creator-3.2.2.ebuild, qt-creator-3.3.2.ebuild:
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index e2ccc0eedb5c..21b76a173106 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -4,27 +4,29 @@ Hash: SHA256
 DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
 DIST qt-creator-opensource-src-3.2.2.tar.gz 22789455 SHA256 a115f1d7b08446dcfeb79537f3d8d251dbc3c9808d0ff377efe5c4fad7dbd8f0 SHA512 f85381eb6f56d787e5efe02407c4b6f949fd2a766a25567ceccb3a002ec7dd9c6277d9cf39ef0afdd8e110d7bc7436344756225784009a2e01ba9fd8428f885e WHIRLPOOL aa65009cffbc10161cdd9f8e70121c5b2e80df034bb1e06400558a947dcf3284cc23d1b162f85a7ed19af216f0d94d0c5f997c0072c3f19149f64e528fde36a7
 DIST qt-creator-opensource-src-3.3.2.tar.gz 22939032 SHA256 6ef76d23c778a58caffb487b8bc6a192defa2d5dd5fab1ecf8eb70d53ccfb98a SHA512 6b5c985075ad547558955972c3daa009557f949aa9b9a8a667368abd401c42af4914c330357ad1f8143c139cf58b23b9f44f65beb53feb46142c56fbe624b2f9 WHIRLPOOL 4832225337545e84b2e1e19e9f62abf54834d902ec8ab0ed7dd5adc90f23d51ae2dc51ada897dd0658a18b31306ae251d81377d0eabc7261cb9d9abfa0dc9c7b
+DIST qt-creator-opensource-src-3.4.0-rc1.tar.gz 23152924 SHA256 3c6e4169c6ae2d90dafab42c6ca66afd0cd0423dbc303b89ff51f8f6a3285302 SHA512 5c0f98ab7e28c6a7f000548e8fcbc6d75a188fb5af3e0eaae390ce827a996da834ec5bc412ed3d870c64b62aae7902c4d725973fec1c99f2c62f162bb2be4752 WHIRLPOOL a74d8a9008df0990d254b5731499baa156e4ecc20c4e16c99a2e37202a9305c188366cf7fd3ba30ba71cb6bfd2d9d120bd770cc0edf013ab62dc15b60291f211
 EBUILD qt-creator-2.8.1.ebuild 3175 SHA256 11f28d1750b6c2c9bc1e0220bc7fa98ffc51e22f91babba526b0c71497a65086 SHA512 9d0654f53f81623e7a27c3a7e8928a34428b51c1b9e5b3dcea4d63860410be1581dce9392e7c184d4087ecb521f8bb5ac7feba908367837608540b4c348c364b WHIRLPOOL 5c2fe594fea2464363ec5d7b33d665254fdb33c0d53171c706154a68952449d1bdbf3130bc31fdb01f903b43bb13331a962019289558b1a1ad6c013b4930cd7c
 EBUILD qt-creator-3.2.2.ebuild 3546 SHA256 498818fa4a4b963081ece3a80489c41edfebdd2197bcdb8bb1cd32e4b7004ad2 SHA512 293840922444d435b968080382731fd075f7e45ad667621f992fc5ee713d9dc63faba2658bdb001fd95f43a408e22e940bb7153b80bc43f3c2f9154121b546c4 WHIRLPOOL 7e56c3fa7ff7c76579e4c25bbbe8f076dd6f41d31f8b38bdfbccc0eb59fbe18e262e944daf11d99a59da1311a810c1ccb02a2404b25a0616240bd53fb02794b2
 EBUILD qt-creator-3.3.2.ebuild 4110 SHA256 ba05fc1e92ede556f8de34a0ca32f8cd54875cfd9da9120e1b5d17bb238144c6 SHA512 6e808626e3c309dab5bb936f9130f938284ba5119cdaff9397e97d34100692214f9dcfda824dec4d360888fd46bc58df2cad51b0319d603404fb2bde10b21d3e WHIRLPOOL c9f8262e0062220468452079148a68187951d164cb0018ac2e5ff4fadb99ebcd2357ba55878d7e1c8b013120ff7f34f9a901dfc5eb3d7a60ca727a7baf70e985
-MISC ChangeLog 28445 SHA256 d2d10450c2153e4e4fab11cb000b21b203eb7a060c9aaf926c6cb3dbe0fa1b0a SHA512 90a08ecab622ac0a091c2e9b48eeb9738f4d8da23e64485ffd77fee028968c816f7b3b2c9b998a3aac2c892de2c02b82e1ce14161d9c74a0f585f648528bcf78 WHIRLPOOL 08eec8126731c262526137f416c14ccfc4263107097efe00739252fc64dddcb068ee5fee54527842ece80b530910769208cbea249ca370cc1e97b26504cec21c
-MISC metadata.xml 1740 SHA256 27a5ef83ec012f02ad59acad3b950125fdcbf8a78ad82451f9d2b5dbf15a1f49 SHA512 6a8240c28f73c0a4138b82145ad38364962b2f0fce9563dc24ba2126c98ee03ea45677fc99d89bbfd71333e9c95440aae701a39089596f773e9a36b79d6063df WHIRLPOOL 3d4299284425bf2fc593293f0c70dd949b58e68ef83b480974bf0e2ba36a790486ec138d006b98fb455761d2be7313f8b7230739526fe5f9a4ad63486cbf2df1
+EBUILD qt-creator-3.4.0_rc1.ebuild 4196 SHA256 e2908e88b6791268b8eea597721aa4f4657725c11924ae55922512ae12ab90ca SHA512 75dc645d4b3567052d175a4c6b88adfe1130b1666a796bacf1679cd455898ed7af656c87c514e0b738003180fd303929225d0c29f656b14fbea0bcc03409ee13 WHIRLPOOL 464827e23c91b783fcc642d7a7315ae82cdb35bc37a52ada8f8b2280925bd6344a267bb117e0fe354db63b22a57fd2af85186e9dc75e834639b3a6ba156af5a1
+MISC ChangeLog 28595 SHA256 81b52c39f8fe9e7799a32391eb80aa52740e43c624b05b0ecaee787c0d1902a1 SHA512 5ffe5d4a9a9bdd9c855d1ff0e69a11f39b208d7c0d8d6d01708edc2acc4e4612637b47704f000fede587f1feeb586ef591bf450a608aeb6d851a690a69bb4ada WHIRLPOOL fd63391f2d249edf5e8149829e45fd2fee6a35d872f8fe7a4dce4016a6efe2d80448f4e22ee918b7c13ac0bd0f4ec106d83972923464f4b7ab8e97e2ed0312c3
+MISC metadata.xml 1829 SHA256 7050ebc71722d7184afd0e9210ac45c553b54a6692018ece99f8f817e34cc923 SHA512 6098c01066404005a1a7530b4c24617378e474c8b6bb0e22ba74aa7438511d4057bd772ddb8b8d7eb6bef7de1ce2c363d81c20451643e6044bfe22b242fedf35 WHIRLPOOL 67d22e8a34b37c06c6b9b0ea76ab610720a28fbc6a5cfeb24ae71046c60984af6dbb561aab871efd5f403c11f40839d53d10ae66795b27d59347af98878e61c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVGATkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVHAYyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9fcYQAKQBMN75wggbKeNjE+jf3BYs
-03+mEStwnI4KJBcHm99eJCetM3Qu59+fTtNp8pZMXw5jIaIabbA5ydSflm7zd/qQ
-ONsUeRWcXfMk7uEEitriTvfotzcAmqgz1+Wv0eMJGkoQr7Gv/31WZ0RLmeELnZIw
-UDuuTl4A8GBd8hte8CRE6QKh/Hc5Z2nyJqopZQG9nata7mYeL2A37nlsIQQ/38Z6
-yeYC30V0k6dMojHob/L1n/WEn2GejEPdMzeV3vwHUf9es6btr22mOIk1orJ/N1hX
-GBKr4TDeXjzVlX0D1AESy8bKTLHZLh8KVevmE6cUUTu7hLNqBTHxgRt1HeQ8Ropt
-uXvIrUQO2RF1C9FEUJyt4h/tQA/JKpHa2t1bqplG+KagAZTunGvU2YY6OYlg2JvP
-r3QPd+QvieZgCUzNlyMWRAfHqldLEiH9Fkvm+WxM8VFLvAbAnB98GnvuU7o0J53Y
-EuWC8Ra9PrkIu910X5f4JwtvL3t0HInJXy0gbTWKMuO0ysixLLSIcMpiQxKB/gC3
-Yv5I+wyPvsKk6pdsNmgJZSNZE+GyGt3+2dQPF0yhwLyk0HFJiA2sf+61bYuqBQmT
-5dx5mjD0fzt0l0zjDPPPwQ7D33TAiYixz2N0qFYIPgBGoARD9rb/DqAy8+jEe9Pz
-4zYIA18IjnP+KcumnQcM
-=88cN
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9aDwQAKja2q3FncoqcrTZ/Qnp6wcC
+AT7KJtP1BDM26sJRH7zHUjgQe0C+eQ9CFfE1dDSugs37q0XeTGwFdUM6bkzdWs/R
+w3dwrHBQqvHHQyuHsutD8fP0YN6QZ3Tduaqi9ZaFXqQDc/q+DNcl7Q15hcXXK2OZ
+RgJIVU2XFC6L3dxLiWwJncpPTuSh3s8Hy4wB64FKLSSKeaufgQazQjY6eENVyNRu
+0wghEt6UvfFiH9X4kz022dUpILcI1jtpuryKcll/jQEL6Fai020Goq33DU2rhnI6
+GduD9/Pfw5Lxbepo7tSwZoZttFnREyAK1u/c8CDy03bdiW3PnAzjRiwJrixet9Y8
+TFrUygR82rEBvnDsXt0ZIYymfl5CTGd2gwPquT00gLVSEGxj7s+PLEG8wMn84bB3
+i6QUV/YBjWTkOgzteNU4+6pNXbCI+E6pr5D5MzIbOt/f8G7YOoiDHVxI76h2uuuM
+g2JMRaHO4MRaLdbSfMY0temPA+S49WYdg/MT44cDvKieOZG7o+OddXXZrSzjIW7b
+zZatZNC1/2k4gTEA9nHs6HZ+vVFGZGGTln9Kuvykn8z3Z+O7gAodkmZoraExo4GY
+iLJpsMj+kApu6PFGsrWXFL+2Kjd+hLnhA+nTbbMGCcxqCAPEQIJlMVdVkSwSmM9B
+qxqWQPgc3ygQVw7InodV
+=HvH3
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 38ebd7e7bd76..559537ab6864 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -22,6 +22,7 @@
 	<flag name="python">Enable Python source code editor</flag>
 	<flag name="qbs">Enable QBS project manager plugin</flag>
 	<flag name="qnx">Build plugin for QNX/Blackberry devices</flag>
+	<flag name="systemd">Add support for retrieving application output from journald</flag>
 	<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
 	<flag name="winrt">Build plugin for WinRT devices</flag>
 </use>
diff --git a/dev-qt/qt-creator/qt-creator-3.4.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-3.4.0_rc1.ebuild
new file mode 100644
index 000000000000..ede3e4ceface
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-3.4.0_rc1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 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.4.0_rc1.ebuild,v 1.1 2015/04/01 14:52:27 pesa Exp $
+
+EAPI=5
+
+PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+
+inherit eutils l10n multilib qmake-utils virtualx
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"git://code.qt.io/${PN}/${PN}.git"
+		"https://code.qt.io/git/${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.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+fi
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
+	bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
+	perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+IUSE="debug doc systemd test ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.3.2:5"
+
+RDEPEND="
+	=dev-libs/botan-1.10*[threads]
+	>=dev-qt/designer-${QT_PV}
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtquick1-${QT_PV}
+	>=dev-qt/qtquickcontrols-${QT_PV}
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtx11extras-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	>=sys-devel/gdb-7.5[client,python]
+	clang? ( >=sys-devel/clang-3.2:= )
+	qbs? ( >=dev-util/qbs-1.3.4 )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? ( >=dev-qt/qttest-${QT_PV} )
+"
+for x in ${PLOCALES}; do
+	# qt translations must be installed for qt-creator translations to work
+	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+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() {
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# disable broken or unreliable tests
+	sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
+	sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/parsertests\.pro/d' tests/auto/valgrind/memcheck/memcheck.pro || die
+
+	# fix translations
+	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
+		share/qtcreator/translations/translations.pro || die
+
+	# remove bundled qbs
+	rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		LLVM_INSTALL_DIR="${EPREFIX}/usr" \
+		QBS_INSTALL_DIR="${EPREFIX}/usr" \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1) \
+		USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+	cd tests/auto || die
+	VIRTUALX_COMMAND=default virtualmake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+	fi
+
+	# install desktop file
+	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+}