--- qt-creator-3.2.2.ebuild	2014-11-14 00:14:20.666761294 +0100
+++ qt-creator-3.3.0_beta1.ebuild	2014-11-25 00:20:02.888375167 +0100
@@ -4,7 +4,8 @@
 
 EAPI=5
 
-PLOCALES="cs de fr ja pl ru sl zh_CN zh_TW"
+# 'hu' is not added here as it is defined in BAD_LANGUAGES in translations.pro file.
+PLOCALES="cs de es fr it ja pl ru sl uk zh_CN zh_TW"
 
 inherit eutils l10n multilib qmake-utils
 
@@ -30,34 +31,48 @@
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
 # TODO: qbs:qbsprojectmanager, winrt (both require qt5)
-QTC_PLUGINS=(android autotools:autotoolsprojectmanager baremetal bazaar
+QTC_PLUGINS=(android:"android qmakeandroidsupport" autotools:autotoolsprojectmanager baremetal bazaar
 	clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git
 	ios mercurial perforce python:pythoneditor qnx subversion valgrind)
 IUSE="debug doc examples test ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
-QT_PV="4.8.5:4"
+QT_PV="5.3.1:5"
 
+# qt-dev/qtcore-5.3.2-r1 is required to build docs (first ebuild that installs global docs needed for qt-creator[doc])
 CDEPEND="
 	=dev-libs/botan-1.10*[threads]
 	>=dev-qt/designer-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}[ssl]
-	>=dev-qt/qtdeclarative-${QT_PV}[accessibility]
-	>=dev-qt/qtgui-${QT_PV}[accessibility]
-	>=dev-qt/qthelp-${QT_PV}[doc?]
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
+	>=dev-qt/qtconcurrent-${QT_PV}	
+	>=dev-qt/qtdeclarative-${QT_PV}
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${QT_PV}
+	>=dev-qt/qtquick1-${QT_PV}
+	>=dev-qt/qtquickcontrols-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtx11extras-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	doc? ( >=dev-qt/qtcore-5.3.2-r1 >=dev-qt/qdoc-${QT_PV} )
 	>=dev-qt/qtscript-${QT_PV}
 	>=dev-qt/qtsql-${QT_PV}
-	>=dev-qt/qtsvg-${QT_PV}[accessibility]
+	>=dev-qt/qtsvg-${QT_PV}
 	clang? ( >=sys-devel/clang-3.2:= )
 "
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
+	>=dev-qt/linguist-tools-${QT_PV}
 	test? ( >=dev-qt/qttest-${QT_PV} )
 "
 RDEPEND="${CDEPEND}
 	>=sys-devel/gdb-7.2[client(+),python]
 	examples? ( >=dev-qt/qtdemo-${QT_PV} )
 "
+# If any LINGUAS use flag is enabled, qttranslations must be installed - otherwise translations won't be usable.
+for x in ${PLOCALES}; do
+	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} ) "
+done
+
 PDEPEND="
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
@@ -74,9 +89,11 @@
 	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"
+			for plugin_directory_name in ${plugin#*:}; do
+				sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)${plugin_directory_name}\>/d" \
+					src/plugins/plugins.pro \
+					|| die "failed to disable ${plugin%:*} plugin"
+			done
 		fi
 	done
 
@@ -89,9 +106,7 @@
 }
 
 src_configure() {
-	EQMAKE4_EXCLUDE="share/qtcreator/templates/*
-			tests/*"
-	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
 		LLVM_INSTALL_DIR="${EPREFIX}/usr" \
 		TEST=$(use test && echo 1 || echo 0) \
@@ -102,8 +117,7 @@
 	echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}"
 	cd tests/auto || die
 
-	EQMAKE4_EXCLUDE="valgrind/*"
-	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)"
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)"
 
 	default
 }
@@ -113,12 +127,12 @@
 
 	dodoc dist/{changes-*,known-issues}
 
-	# install documentation
+	# install documentation - it will be auto-detected by qtcreator only when installed under <qtcreator-path>/../share/qtcreator
 	if use doc; then
 		emake docs
-		insinto /usr/share/doc/${PF}
+		insinto /usr/share/doc/qtcreator
 		doins share/doc/qtcreator/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
 	fi
 
 	# install desktop file