Switch to qmake-utils eclass; always enable fakevim plugin; add slot operator to clang dep; require Qt 4.8.5; fix LLVM_INSTALL_DIR.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

4 files changed, 19 insertions, 145 deletions

diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog
index 794a56d0bc68..0d247838fd6b 100644
--- a/dev-qt/qt-creator/ChangeLog
+++ b/dev-qt/qt-creator/ChangeLog
@@ -1,6 +1,11 @@
 # 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.30 2014/08/03 14:09:49 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.31 2014/08/03 22:53:06 pesa Exp $
+
+  03 Aug 2014; Davide Pesavento <pesa@gentoo.org> -qt-creator-3.0.1.ebuild,
+  metadata.xml, qt-creator-3.2.0_rc1.ebuild:
+  Switch to qmake-utils eclass; always enable fakevim plugin; add slot operator
+  to clang dep; require Qt 4.8.5; fix LLVM_INSTALL_DIR.
 
 *qt-creator-3.2.0_rc1 (03 Aug 2014)
 
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index aec3238bd1c4..60f5b3eb9945 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -11,6 +11,7 @@
 	<flag name="autotools">Enable autotools project manager plugin</flag>
 	<flag name="baremetal">Build plugin for bare metal devices</flag>
 	<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
+	<flag name="clang">Build clang-based code model plugin</flag>
 	<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 	<flag name="cmake">Enable cmake project manager plugin</flag>
 	<flag name="fakevim">Enable support for vim-like key bindings</flag>
@@ -21,6 +22,5 @@
 	<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.0.1.ebuild b/dev-qt/qt-creator/qt-creator-3.0.1.ebuild
deleted file mode 100644
index af09786b3815..000000000000
--- a/dev-qt/qt-creator/qt-creator-3.0.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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.0.1.ebuild,v 1.1 2014/03/03 04:02:15 pesa 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
-	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}
-"
-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
-}
-
-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'
-}
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
index 1a3ef9ec7a9f..d4c635fdc47c 100644
--- a/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild
@@ -1,12 +1,12 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild,v 1.2 2014/08/03 22:53:06 pesa Exp $
 
 EAPI=5
 
 PLOCALES="cs de fr ja pl ru sl zh_CN zh_TW"
 
-inherit eutils l10n multilib qt4-r2
+inherit eutils l10n multilib qmake-utils
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
@@ -29,27 +29,26 @@ fi
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
+# TODO: qbs:qbsprojectmanager, winrt (both require qt5)
 QTC_PLUGINS=(android autotools:autotoolsprojectmanager baremetal bazaar
-	clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs fakevim git
+	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.0:4"
+QT_PV="4.8.5:4"
 
 CDEPEND="
 	=dev-libs/botan-1.10*[threads]
+	>=dev-qt/designer-${QT_PV}
 	>=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/qtgui-${QT_PV}
 	>=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 )
+	clang? ( >=sys-devel/clang-3.2:= )
 "
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
@@ -71,8 +70,6 @@ PDEPEND="
 "
 
 src_prepare() {
-	qt4-r2_src_prepare
-
 	# disable unwanted plugins
 	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
 		if ! use ${plugin%:*}; then
@@ -86,8 +83,7 @@ src_prepare() {
 	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
+	# remove bundled qbs
 	rm -rf src/shared/qbs || die
 }
 
@@ -96,9 +92,9 @@ src_configure() {
 			tests/*"
 	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
+		LLVM_INSTALL_DIR="${EPREFIX}/usr" \
 		TEST=$(use test && echo 1 || echo 0) \
-		USE_SYSTEM_BOTAN=1 \
-		LLVM_INSTALL_DIR=$(use clang && echo $(get_libdir))
+		USE_SYSTEM_BOTAN=1
 }
 
 src_test() {
@@ -108,7 +104,7 @@ src_test() {
 	EQMAKE4_EXCLUDE="valgrind/*"
 	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)"
 
-	emake check
+	default
 }
 
 src_install() {