[gentoo-commits] gentoo-x86 commit in dev-qt/qt-creator: metadata.xml qt-creator-3.2.0_rc1.ebuild ChangeLog qt-creator-3.0.1.ebuild

[Davide Pesavento (pesa)]

pesa        14/08/03 22:53:06

  Modified:             metadata.xml qt-creator-3.2.0_rc1.ebuild ChangeLog
  Removed:              qt-creator-3.0.1.ebuild
  Log:
  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!)

Revision  Changes    Path
1.8                  dev-qt/qt-creator/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/metadata.xml?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/metadata.xml?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/metadata.xml?r1=1.7&r2=1.8

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/metadata.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- metadata.xml	3 Aug 2014 14:09:49 -0000	1.7
+++ metadata.xml	3 Aug 2014 22:53:06 -0000	1.8
@@ -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>



1.2                  dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild?r1=1.1&r2=1.2

Index: qt-creator-3.2.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-creator-3.2.0_rc1.ebuild	3 Aug 2014 14:09:49 -0000	1.1
+++ qt-creator-3.2.0_rc1.ebuild	3 Aug 2014 22:53:06 -0000	1.2
@@ -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 @@
 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 @@
 "
 
 src_prepare() {
-	qt4-r2_src_prepare
-
 	# disable unwanted plugins
 	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
 		if ! use ${plugin%:*}; then
@@ -86,8 +83,7 @@
 	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 @@
 			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 @@
 	EQMAKE4_EXCLUDE="valgrind/*"
 	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)"
 
-	emake check
+	default
 }
 
 src_install() {



1.31                 dev-qt/qt-creator/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/ChangeLog?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/ChangeLog?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/ChangeLog?r1=1.30&r2=1.31

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog	3 Aug 2014 14:09:49 -0000	1.30
+++ ChangeLog	3 Aug 2014 22:53:06 -0000	1.31
@@ -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@g.o> -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)