Version bump.

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

4 files changed, 25 insertions, 160 deletions

diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog
index 874741243839..7fd793d629ba 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.47 2015/04/01 20:57:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.48 2015/04/23 15:34:04 pesa Exp $
+
+*qt-creator-3.4.0 (23 Apr 2015)
+
+  23 Apr 2015; Davide Pesavento <pesa@gentoo.org> +qt-creator-3.4.0.ebuild,
+  -qt-creator-3.3.2.ebuild, -qt-creator-3.4.0_rc1.ebuild:
+  Version bump.
 
   01 Apr 2015; Davide Pesavento <pesa@gentoo.org> metadata.xml,
   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 dd1df16f374a..563b83400ffd 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -3,30 +3,28 @@ 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
+DIST qt-creator-opensource-src-3.4.0.tar.gz 23199469 SHA256 b80baf5be9b0421b3d951a8a0eb411a65cf008f4c753f5a80d205e90fa4fe112 SHA512 26d527a914b073f16dffe92314635af975c5878221dfbb8b7d0d0279d38e7934b062a4087f352fe619da2db1f66a090dc3f93ac2c1596438bd3d3f08d67e3d82 WHIRLPOOL 92e695b4f02634cf54d4126c2b81e50879040a6fbd4adb564068af086d80197a683035428c1409400c53644df0a875d0921032243cabdf1ced03875c4b25ae8c
 EBUILD qt-creator-2.8.1.ebuild 3150 SHA256 034e4af5d417417ca6e9b833a87f826eea5d812b518913f6c504cd3a88db9e32 SHA512 41be818bee40a55d4313a7126ec99bc90a502e2182cbb53def233ae0f9e465145fe8379087910554ecb39f44a05a7e69b0e18ab519cce7b66b2d8f35cdeb983b WHIRLPOOL 9adcf26642e8bd341a44b61f5fd859375658a2835eec8e090d3f68f70be5efad68e9b030e53a6f76f1deaac870f053843b3b1ba9159cc5f2edc1a5bc418ac251
 EBUILD qt-creator-3.2.2.ebuild 3521 SHA256 9edfe4295c86ff8bb6a284cd201b63e439ae15a530d106eff99ff94ba8d26535 SHA512 c964e6259e18432388d7b87db027628d411ae5f3d12bf8554f977371efd930490b502b34b2e4d49196e682dc7302d56f6816e288f38f6dd3620ce93a16e2ebe8 WHIRLPOOL 62d456a063b2eb965f0ee3749b30a889aa2107104bbff26a65e58fd3c515022060e0200033314c2b7f8f57956717d3f80f56be222c51ff87b6e975fc3b69b897
-EBUILD qt-creator-3.3.2.ebuild 4085 SHA256 b6295c53548ae7d6768c99bf7b18de71300b9695e55ad74f206eb5b7a3e60a3d SHA512 3034be5ce2752cf72e11d01a6ecd83086461276c1ef3407600ab508ecd187f75734c1fb316a9028bf1cafa15abd0c50b76c1ddf53f867a26bb07231a0d38a7ce WHIRLPOOL a593d699ec61386119d8eb103062cd9f2adf749ddc475799390dfe68e228aa78d150d33eb08348ee5bf4f7193d173ec472418459349608be70dfabae114f03d2
-EBUILD qt-creator-3.4.0_rc1.ebuild 4171 SHA256 c09bdfa35795af78743cc493cf53cfab9de4b6956d1c5476ac5305e6d88e10a8 SHA512 6543330f3a2f58606e916d4a824c3c3fa0c13b2c8393dcd3e8e12e6ec8a2cef4cd93fa6faff753f0678382bbd84ca84064322a214a76cb9fcd3773b07e16fe0c WHIRLPOOL a15e63f666df79534468e4b3fa3432d6baeeba00fc596409042fb89fe93207532d7f295c90a3a34b1a02927a6d4ad9fa8bda0a295ef87f5be3d043413b71957e
-MISC ChangeLog 28829 SHA256 66026d6013f8b30cefe951fd5931e977497e93b16343799b306dd25c2566f08a SHA512 2b3d7c8ab521e3c56a15921a4305f6e49c94412a577041d83cd8ffb59b11b90dd5c2bd38e237bcceed9c5bbb99c46c11f8594e9fa1e79480547e5431dc058412 WHIRLPOOL eb8e30e1088615a7a0ebf3c44bb6b0d00e6385154cb53e00fb02af6709a8ab62f0bd7a3f4923c3bdd03e5d4d3ff44152c77cdfae524b6033eeb72176060292a2
+EBUILD qt-creator-3.4.0.ebuild 4167 SHA256 ad7277940ff0cda21f14735208b7abd964bb88ae6f93b73d9facd7c13a60c367 SHA512 ed0cffbe2efe11dcb16d4fb6a19b2922c68b45eac42d3e5a57eeb03645821fbc36df09a74cdcccf365dc9f6f6f56b191dd1bb943b7078aa682a15f08d7a1f5c3 WHIRLPOOL 63131451e46f2a5a13cab66ea1b628357d41c7644db85c0258667a1fec69091559661c4ed55bd87b80d3039ac1ca296d71a3cf24c006a2e5cf3d77e78bb5efbf
+MISC ChangeLog 29013 SHA256 4cc8f24bd967b0f41d1f25632b0cb8e36ef29ddbbc46afe9922f057e36f23868 SHA512 1d5b5106d59a7d5aa4823ae68b9d7a5fe89eefacbf7d8b87a8c356de632a996a277b521fc4715b0159f6c9aa60deba1ba681d6736b03966c357e246d44d30e9a WHIRLPOOL 0498bb43d76929eef564da3706f48aa9dd04319350fa7607e6987d56ac60e19a3795554fe0a637b15688ea3329905b0142fadaccfd2ad930065c766ac754b480
 MISC metadata.xml 1820 SHA256 e438e4152bace75a28ff1ca22324d0e1ade63d2bbafa81b4b5a33a456ae130e4 SHA512 351e7f71c578552fa8e167307372a300ecba64a59aa089184dcd7d20ebe3763c4ee294bdfd0262b95b0995e238412f02ef90d18f43db87bb8360ab0cc8b3f7ea WHIRLPOOL 2eeb30fc5eea23140d462169f2f1fee019f518f44cfbfe07cc841f3a8117b20c1c5b8af9692ab1a4774359c9822312deaef431395f17c1b80dca0cb99d82c466
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVHFvUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVORDzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9IasP/RR3RtJsgZbsmYFuT34RWkLC
-LnBRptr69iKh5RZkWR6bsmqlAIkhi0aZKMFcbZ2ale8UcsGJVQtKWE2kx3Svnc7V
-AH8uOLkIdED14WvtHnaqdotmHVUvV7WrT/xuSAt27oQYklLnCQU3j+BmUr1+YamZ
-31gDWYXcPgsUW7DW8sTT3FtL97rP6BYHELpMEMrWJoIcmJmQICDkptm6WW6mnTQs
-7GhPKcu9DNZpjP6El0rzX5hvDj5n3WFSKXVoITrEin+xjUhqBH+KGn5yR0gA3/du
-Zi3I5YEOXoaV+9YhK+S/N5KTm58QN+YZqUT6EEFveXRI/Lamt8QRY59EEIQcKCX3
-Yywxgs1Bzb9hk6s3mclVImlv1WVLnWNueiDLfEeQQLH0Q2svbLy+nZ4642I+PgFF
-l8qPrWmfcfq4rZgpKOnIYYKnIdHtg7ApdOvKXMaEsXsDulJ3mW+QEjn9kBhfDF1a
-y9B5FZmrYvp8D46sK2i1o2jLHL+pW6MWVoMa8fwLLTAKapZ3equJTmIV5AiZSmo5
-aBG3JX9v+mEJFZvqDbTpAhr0hvP21+8L2CoCmX5+PNQoBRGFtWqeDuOLMKGte+OD
-ScCqf24H6RSKNmPFyA7Ef4TySng3a8RmJ1dX0MId62hQuEkB/KOcJ7l0xr9SN5cm
-2ISYqNlxYnGkJCgClzzu
-=RoCX
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9ZcUP/0p/42HAd/02/bBPI6h8qnSE
+ALeGzcLR1Dn/AP56Nv5vKhcpddIwC+DtKWCaRELod0bKBVYKA03XXAb0Tn0l6rFg
+Uu5aIz2d1tBWtHuKPmuSSYtwWjnzIhSuxEP7izpQ44HHlV2P2fby0re/DcdKzVao
+iHB7v9ae7LLgF3eSZyYNo40kxPTMlLzmCaZl1yuv3lBdvSLPIjxjRmJxIQq0VMPU
+dtDAeJ78oXGLVVRk6II9q2CBapvJgI5d/HVxUaJDaa3c5fHs6GgdeXllV6sYrpyc
+6WUpU2DT5zN2NjmMa9+F5GVH4W2ROhG9xSXCPeoqoYT+dRhEKCYfpwnmRbv5HhP4
+eLBo3Z/lqYAkEppyYtFxvXtpspR5ZU8oWSMNA3CgL826tD/UM/0DGHTukqQH5dgW
+Lu1D+H4LwEFvEDSs3TUU+PLzlxmGG8QSAmopojC4l0sLGNxnagggrQibWNbiQ13C
+ZL8OVvcPRXsrQ5T8z9AEk1O4tTMNGEh/WvsR+3lQ13FlZ+lc4VMBlv4kTsaCrB5C
+KZ987s6rTmIkZVkA3FE1JayKZXwvs+Pj/oUB0G3HQCDr5+q8tG3EZ2XXCxiFNbKF
+kNUV2oDAwYu8L4Ej6InCbjXfh8KM/P+CsinvjfZ41I1dp2bnWIU1b8tr1u49Wc9S
+aHkNG+8G9Fjx35ewbSk4
+=z55s
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt-creator/qt-creator-3.3.2.ebuild b/dev-qt/qt-creator/qt-creator-3.3.2.ebuild
deleted file mode 100644
index 8c7a60a36a3d..000000000000
--- a/dev-qt/qt-creator/qt-creator-3.3.2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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.3.2.ebuild,v 1.4 2015/04/01 20:57:55 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://doc.qt.io/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 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.4[client(+),python]
-	clang? ( >=sys-devel/clang-3.2:= )
-	qbs? ( >=dev-util/qbs-1.3.4 )
-"
-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 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'
-}
diff --git a/dev-qt/qt-creator/qt-creator-3.4.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-3.4.0.ebuild
index d1c66d41b790..021767743ffc 100644
--- a/dev-qt/qt-creator/qt-creator-3.4.0_rc1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2015/04/01 20:57:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0.ebuild,v 1.1 2015/04/23 15:34:04 pesa Exp $
 
 EAPI=5