dev-qt/qt-creator: version bump

Gentoo-Bug: 592148
Gentoo-Bug: 596178

Package-Manager: portage-2.3.2

1 files changed, 22 insertions, 11 deletions

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 0a6f46bb7207..f2e2ab2bb917 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 
-inherit eutils l10n qmake-utils toolchain-funcs virtualx
+inherit eutils l10n qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -22,18 +22,17 @@ 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"
+	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
 # TODO: unbundle sqlite
-#	allow disabling modeleditor plugin
-#	it should be possible to skip building some internal libs (clangbackendipc, glsl, modelinglib, sqlite) when the plugins that use them are disabled
 
 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
 	clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
-	ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+	ios mercurial modeling:modeleditor nim perforce python:pythoneditor qbs:qbsprojectmanager qnx
+	subversion valgrind winrt)
 IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
 
 REQUIRED_USE="?? ( webengine webkit )"
@@ -58,9 +57,9 @@ RDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	>=sys-devel/gdb-7.5[client,python]
-	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( >=dev-util/qbs-1.5.2 )
+	sys-devel/gdb[client,python]
+	clangcodemodel? ( >=sys-devel/clang-3.8.0:= )
+	qbs? ( >=dev-util/qbs-1.6.0 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
@@ -80,7 +79,7 @@ unset x
 PDEPEND="
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( sys-devel/clang )
+	clangstaticanalyzer? ( >=sys-devel/clang-3.8.0 )
 	cmake? ( dev-util/cmake )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
@@ -117,6 +116,17 @@ src_prepare() {
 		fi
 	done
 
+	# avoid building unused support libraries
+	if ! use clangcodemodel; then
+		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+	fi
+
 	# automagic dep on qtwebkit (bug 538236)
 	if ! use webkit; then
 		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
@@ -172,6 +182,7 @@ src_install() {
 		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
 	fi
 
-	# install desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+	# create a desktop file
+	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Development;IDE;Qt;' \
+		'MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;'
 }