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

2014-08-03 Thread Jason Donenfeld (zx2c4)
zx2c4   14/08/03 14:09:49

  Modified: metadata.xml ChangeLog
  Added:qt-creator-3.2.0_rc1.ebuild
  Log:
  Bump version. Note that this is still masked, as it's related to Qt5.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
A5DE03AE)

Revision  ChangesPath
1.7  dev-qt/qt-creator/metadata.xml

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

Index: metadata.xml
===
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml23 Oct 2013 13:08:04 -  1.6
+++ metadata.xml3 Aug 2014 14:09:49 -   1.7
@@ -21,5 +21,6 @@
flag name=pythonEnable Python source code editor/flag
flag name=qnxBuild plugin for QNX/Blackberry devices/flag
flag name=valgrindAdd support for memory debugging using 
pkgdev-util/valgrind/pkg/flag
+   flag name=clangBuild clang plugin/flag
 /use
 /pkgmetadata



1.30 dev-qt/qt-creator/ChangeLog

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

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog   3 Mar 2014 04:02:15 -   1.29
+++ ChangeLog   3 Aug 2014 14:09:49 -   1.30
@@ -1,6 +1,12 @@
 # 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.29 
2014/03/03 04:02:15 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.30 
2014/08/03 14:09:49 zx2c4 Exp $
+
+*qt-creator-3.2.0_rc1 (03 Aug 2014)
+
+  03 Aug 2014; Jason A. Donenfeld zx...@gentoo.org
+  +qt-creator-3.2.0_rc1.ebuild, metadata.xml:
+  Bump version. Note that this is still masked, as it's related to Qt5.
 
 *qt-creator-3.0.1 (03 Mar 2014)
 



1.1  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.1view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild?rev=1.1content-type=text/plain

Index: qt-creator-3.2.0_rc1.ebuild
===
# 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 $

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} == * ]]; 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
clang:clangcodemodel 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}
clang? ( =sys-devel/clang-3.2 )

DEPEND=${CDEPEND}
virtual/pkgconfig
test? ( =dev-qt/qttest-${QT_PV} )

RDEPEND=${CDEPEND}
=sys-devel/gdb-7.2[client(+),python]
examples? 

[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

2014-08-03 Thread Davide Pesavento (pesa)
pesa14/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  ChangesPath
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.8view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/metadata.xml?rev=1.8content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/metadata.xml?r1=1.7r2=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.xml3 Aug 2014 14:09:49 -   1.7
+++ metadata.xml3 Aug 2014 22:53:06 -   1.8
@@ -11,6 +11,7 @@
flag name=autotoolsEnable autotools project manager plugin/flag
flag name=baremetalBuild plugin for bare metal devices/flag
flag name=bazaarAdd support for pkgdev-vcs/bzr/pkg version 
control system/flag
+   flag name=clangBuild clang-based code model plugin/flag
flag name=clearcaseAdd support for IBM ClearCase version control 
system (requires manual installation of ClearCase client)/flag
flag name=cmakeEnable cmake project manager plugin/flag
flag name=fakevimEnable support for vim-like key bindings/flag
@@ -21,6 +22,5 @@
flag name=pythonEnable Python source code editor/flag
flag name=qnxBuild plugin for QNX/Blackberry devices/flag
flag name=valgrindAdd support for memory debugging using 
pkgdev-util/valgrind/pkg/flag
-   flag name=clangBuild 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.2view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.0_rc1.ebuild?rev=1.2content-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.1r2=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 -   1.1
+++ qt-creator-3.2.0_rc1.ebuild 3 Aug 2014 22:53:06 -   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