* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2015-10-18 1:53 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2015-10-18 1:53 UTC (permalink / raw
To: gentoo-commits
commit: 8fb91824041208a8857202ba298ccc3522e1c0a7
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 01:52:50 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 01:52:50 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8fb91824
dev-qt/qt-creator: sync with gentoo.git
Package-Manager: portage-2.2.23
dev-qt/qt-creator/qt-creator-9999.ebuild | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index e878225..d12592a 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -35,7 +35,7 @@ IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
QT_PV="5.4.0:5"
RDEPEND="
- =dev-libs/botan-1.10*[threads]
+ =dev-libs/botan-1.10*[-bindist,threads]
>=dev-qt/designer-${QT_PV}
>=dev-qt/qtconcurrent-${QT_PV}
>=dev-qt/qtcore-${QT_PV}
@@ -52,7 +52,7 @@ RDEPEND="
>=dev-qt/qtx11extras-${QT_PV}
>=dev-qt/qtxml-${QT_PV}
>=sys-devel/gdb-7.5[client,python]
- clang? ( >=sys-devel/clang-3.2:= )
+ clang? ( >=sys-devel/clang-3.6:= )
qbs? ( >=dev-util/qbs-1.4.2 )
systemd? ( sys-apps/systemd:= )
webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
@@ -86,7 +86,11 @@ src_unpack() {
die "GCC >= 4.7 required"
fi
- default
+ if [[ ${PV} == *9999 ]]; then
+ git-r3_src_unpack
+ else
+ default
+ fi
}
src_prepare() {
@@ -106,10 +110,9 @@ src_prepare() {
fi
# disable broken or unreliable tests
- sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
- sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
+ sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
- sed -i -e '/parsertests\.pro/d' tests/auto/valgrind/memcheck/memcheck.pro || die
+ sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
# fix translations
sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
@@ -122,8 +125,8 @@ src_prepare() {
src_configure() {
eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
IDE_PACKAGE_MODE=1 \
- LLVM_INSTALL_DIR="${EPREFIX}/usr" \
- QBS_INSTALL_DIR="${EPREFIX}/usr" \
+ $(use clang && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
+ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
CONFIG+=qbs_disable_rpath \
CONFIG+=qbs_enable_project_file_updates \
$(use systemd && echo CONFIG+=journald) \
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2016-05-13 16:16 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2016-05-13 16:16 UTC (permalink / raw
To: gentoo-commits
commit: a6f612ea74ec2a7a800e8869310ff8069b1c6000
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 16:14:36 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri May 13 16:16:02 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a6f612ea
dev-qt/qt-creator: moved live ebuild to gentoo.git
dev-qt/qt-creator/metadata.xml | 38 -------
dev-qt/qt-creator/qt-creator-9999.ebuild | 168 -------------------------------
2 files changed, 206 deletions(-)
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
deleted file mode 100644
index 3fec6b3..0000000
--- a/dev-qt/qt-creator/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>pesa@gentoo.org</email>
- <name>Davide Pesavento</name>
- </maintainer>
- <maintainer type="project">
- <email>qt@gentoo.org</email>
- <name>Gentoo Qt Project</name>
- </maintainer>
- <use>
- <flag name="android">Build plugin for Android devices</flag>
- <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="clangcodemodel">Build clang-based code model plugin</flag>
- <flag name="clangstaticanalyzer">Build clang-based static analyzer 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="glsl">Enable GLSL source code editor</flag>
- <flag name="ios">Build plugin for Apple iOS devices</flag>
- <flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
- <flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
- <flag name="python">Enable Python source code editor</flag>
- <flag name="qbs">Enable QBS project manager plugin</flag>
- <flag name="qnx">Build plugin for QNX devices</flag>
- <flag name="systemd">Add support for retrieving application output from journald</flag>
- <flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
- <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> to view documentation</flag>
- <flag name="webkit">Use <pkg>dev-qt/qtwebkit</pkg> to view documentation</flag>
- <flag name="winrt">Build plugin for WinRT devices</flag>
- </use>
- <upstream>
- <bugs-to>https://bugreports.qt.io/</bugs-to>
- <doc>http://doc.qt.io/qtcreator/</doc>
- </upstream>
-</pkgmetadata>
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
deleted file mode 100644
index c636321..0000000
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-
-inherit eutils l10n qmake-utils virtualx
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="GPL-3"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI=(
- "git://code.qt.io/${PN}/${PN}.git"
- "https://code.qt.io/git/${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.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
- S=${WORKDIR}/${MY_P}
-fi
-
-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)
-IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.5.0:5"
-
-RDEPEND="
- =dev-libs/botan-1.10*[-bindist,threads]
- >=dev-qt/designer-${QT_PV}
- >=dev-qt/qtconcurrent-${QT_PV}
- >=dev-qt/qtcore-${QT_PV}
- >=dev-qt/qtdeclarative-${QT_PV}[widgets]
- >=dev-qt/qtgui-${QT_PV}
- >=dev-qt/qthelp-${QT_PV}
- >=dev-qt/qtnetwork-${QT_PV}[ssl]
- >=dev-qt/qtprintsupport-${QT_PV}
- >=dev-qt/qtquickcontrols-${QT_PV}
- >=dev-qt/qtscript-${QT_PV}
- >=dev-qt/qtsql-${QT_PV}[sqlite]
- >=dev-qt/qtsvg-${QT_PV}
- >=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.4.5 )
- systemd? ( sys-apps/systemd:= )
- webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
- webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-"
-DEPEND="${RDEPEND}
- >=dev-qt/linguist-tools-${QT_PV}
- virtual/pkgconfig
- doc? ( >=dev-qt/qdoc-${QT_PV} )
- test? ( >=dev-qt/qttest-${QT_PV} )
-"
-for x in ${PLOCALES}; do
- # qt translations must be installed for qt-creator translations to work
- RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
- autotools? ( sys-devel/autoconf )
- bazaar? ( dev-vcs/bzr )
- clangstaticanalyzer? ( sys-devel/clang )
- 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_unpack() {
- if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
- eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}"
- die "GCC >= 4.7 required"
- fi
-
- if [[ ${PV} == *9999 ]]; then
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- default
-
- # disable unwanted plugins
- 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"
- fi
- done
-
- # automagic dep on qtwebkit (bug 538236)
- if ! use webkit; then
- sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
- src/plugins/help/help.pro || die "failed to disable webkit"
- fi
-
- # automagic dep on qtwebengine
- if ! use webengine; then
- sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' \
- src/plugins/help/help.pro || die "failed to disable webengine"
- fi
-
- # disable broken or unreliable tests
- sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
- sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
- sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
-
- # fix translations
- sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
- share/qtcreator/translations/translations.pro || die
-
- # remove bundled qbs
- rm -rf src/shared/qbs || die
-}
-
-src_configure() {
- eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
- IDE_PACKAGE_MODE=1 \
- $(use clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
- $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
- CONFIG+=qbs_disable_rpath \
- CONFIG+=qbs_enable_project_file_updates \
- $(use systemd && echo CONFIG+=journald) \
- $(use test && echo BUILD_TESTS=1) \
- USE_SYSTEM_BOTAN=1
-}
-
-src_test() {
- cd tests/auto && virtx default
-}
-
-src_install() {
- emake INSTALL_ROOT="${ED}usr" install
-
- dodoc dist/{changes-*,known-issues}
-
- # install documentation
- if use doc; then
- emake docs
- # don't use ${PF} or the doc will not be found
- insinto /usr/share/doc/qtcreator
- doins share/doc/qtcreator/qtcreator{,-dev}.qch
- docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
- fi
-
- # install desktop file
- make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2016-04-21 15:38 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2016-04-21 15:38 UTC (permalink / raw
To: gentoo-commits
commit: 2f3be820264b2c7b3ec415d4f42426a2c10a2a2e
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 15:38:33 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 15:38:33 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2f3be820
dev-qt/qt-creator: update live ebuild and USE descriptions
Package-Manager: portage-2.2.28
dev-qt/qt-creator/metadata.xml | 8 ++++++--
dev-qt/qt-creator/qt-creator-9999.ebuild | 26 +++++++++++++++++---------
2 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 1e2c4f3..3fec6b3 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -14,17 +14,21 @@
<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="clangcodemodel">Build clang-based code model plugin</flag>
+ <flag name="clangstaticanalyzer">Build clang-based static analyzer 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="glsl">Enable GLSL source code editor</flag>
<flag name="ios">Build plugin for Apple iOS devices</flag>
<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
<flag name="python">Enable Python source code editor</flag>
<flag name="qbs">Enable QBS project manager plugin</flag>
- <flag name="qnx">Build plugin for QNX/Blackberry devices</flag>
+ <flag name="qnx">Build plugin for QNX devices</flag>
<flag name="systemd">Add support for retrieving application output from journald</flag>
<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
+ <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> to view documentation</flag>
+ <flag name="webkit">Use <pkg>dev-qt/qtwebkit</pkg> to view documentation</flag>
<flag name="winrt">Build plugin for WinRT devices</flag>
</use>
<upstream>
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index e813af2..c636321 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -9,7 +9,7 @@ inherit eutils l10n qmake-utils virtualx
DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+LICENSE="GPL-3"
SLOT="0"
if [[ ${PV} == *9999 ]]; then
@@ -27,13 +27,13 @@ else
S=${WORKDIR}/${MY_P}
fi
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
- bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
- perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
-IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
+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)
+IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
# minimum Qt version required
-QT_PV="5.4.0:5"
+QT_PV="5.5.0:5"
RDEPEND="
=dev-libs/botan-1.10*[-bindist,threads]
@@ -53,9 +53,10 @@ RDEPEND="
>=dev-qt/qtx11extras-${QT_PV}
>=dev-qt/qtxml-${QT_PV}
>=sys-devel/gdb-7.5[client,python]
- clang? ( >=sys-devel/clang-3.6:= )
- qbs? ( >=dev-util/qbs-1.4.4 )
+ clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
+ qbs? ( >=dev-util/qbs-1.4.5 )
systemd? ( sys-apps/systemd:= )
+ webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
"
DEPEND="${RDEPEND}
@@ -73,6 +74,7 @@ unset x
PDEPEND="
autotools? ( sys-devel/autoconf )
bazaar? ( dev-vcs/bzr )
+ clangstaticanalyzer? ( sys-devel/clang )
cmake? ( dev-util/cmake )
cvs? ( dev-vcs/cvs )
git? ( dev-vcs/git )
@@ -112,6 +114,12 @@ src_prepare() {
src/plugins/help/help.pro || die "failed to disable webkit"
fi
+ # automagic dep on qtwebengine
+ if ! use webengine; then
+ sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' \
+ src/plugins/help/help.pro || die "failed to disable webengine"
+ fi
+
# disable broken or unreliable tests
sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
@@ -128,7 +136,7 @@ src_prepare() {
src_configure() {
eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
IDE_PACKAGE_MODE=1 \
- $(use clang && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
+ $(use clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
CONFIG+=qbs_disable_rpath \
CONFIG+=qbs_enable_project_file_updates \
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2015-12-17 2:39 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2015-12-17 2:39 UTC (permalink / raw
To: gentoo-commits
commit: 7302a67c078138acda3be229e230babb19eba4c5
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 02:39:23 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 02:39:23 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7302a67c
dev-qt/qt-creator: sync
Package-Manager: portage-2.2.26
dev-qt/qt-creator/qt-creator-9999.ebuild | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index d12592a..5248c5b 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -2,9 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-inherit eutils l10n multilib qmake-utils virtualx
+
+inherit eutils l10n qmake-utils virtualx
DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -53,7 +54,7 @@ RDEPEND="
>=dev-qt/qtxml-${QT_PV}
>=sys-devel/gdb-7.5[client,python]
clang? ( >=sys-devel/clang-3.6:= )
- qbs? ( >=dev-util/qbs-1.4.2 )
+ qbs? ( >=dev-util/qbs-1.4.4 )
systemd? ( sys-apps/systemd:= )
webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
"
@@ -82,7 +83,7 @@ PDEPEND="
src_unpack() {
if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
- eerror "GCC version 4.7 or later is required to build Qt Creator"
+ eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}"
die "GCC >= 4.7 required"
fi
@@ -94,6 +95,8 @@ src_unpack() {
}
src_prepare() {
+ default
+
# disable unwanted plugins
for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
if ! use ${plugin%:*}; then
@@ -135,8 +138,7 @@ src_configure() {
}
src_test() {
- cd tests/auto || die
- VIRTUALX_COMMAND=default virtualmake
+ cd tests/auto && virtx default
}
src_install() {
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2015-09-14 0:53 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2015-09-14 0:53 UTC (permalink / raw
To: gentoo-commits
commit: 203cc8f58ee090791ab5554c073488844e4465c2
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 00:52:43 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 00:52:43 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=203cc8f5
dev-qt/qt-creator: sync with gentoo.git
Package-Manager: portage-2.2.20.1
dev-qt/qt-creator/qt-creator-9999.ebuild | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 286c608..e878225 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -44,17 +44,16 @@ RDEPEND="
>=dev-qt/qthelp-${QT_PV}
>=dev-qt/qtnetwork-${QT_PV}[ssl]
>=dev-qt/qtprintsupport-${QT_PV}
- >=dev-qt/qtquick1-${QT_PV}
>=dev-qt/qtquickcontrols-${QT_PV}
>=dev-qt/qtscript-${QT_PV}
- >=dev-qt/qtsql-${QT_PV}
+ >=dev-qt/qtsql-${QT_PV}[sqlite]
>=dev-qt/qtsvg-${QT_PV}
>=dev-qt/qtwidgets-${QT_PV}
>=dev-qt/qtx11extras-${QT_PV}
>=dev-qt/qtxml-${QT_PV}
>=sys-devel/gdb-7.5[client,python]
clang? ( >=sys-devel/clang-3.2:= )
- qbs? ( >=dev-util/qbs-1.4.0-r1 )
+ qbs? ( >=dev-util/qbs-1.4.2 )
systemd? ( sys-apps/systemd:= )
webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
"
@@ -81,6 +80,15 @@ PDEPEND="
valgrind? ( dev-util/valgrind )
"
+src_unpack() {
+ if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
+ eerror "GCC version 4.7 or later is required to build Qt Creator"
+ die "GCC >= 4.7 required"
+ fi
+
+ default
+}
+
src_prepare() {
# disable unwanted plugins
for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2015-05-04 19:52 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2015-05-04 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 50ffa5c1ee8bfab13ef813472b38ccb40ad536ad
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May 4 19:52:32 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 4 19:52:32 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=50ffa5c1
[dev-qt/qt-creator] Sync.
Package-Manager: portage-2.2.18
dev-qt/qt-creator/qt-creator-9999.ebuild | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 5dd78e5..d1e0c5e 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.4.0_rc1.ebuild,v 1.1 2015/04/01 14:52:27 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0.ebuild,v 1.4 2015/05/04 19:50:14 pesa Exp $
EAPI=5
@@ -32,7 +32,7 @@ KEYWORDS=""
QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
-IUSE="debug doc systemd test ${QTC_PLUGINS[@]%:*}"
+IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
# minimum Qt version required
QT_PV="5.4.0:5"
@@ -57,8 +57,9 @@ RDEPEND="
>=dev-qt/qtxml-${QT_PV}
>=sys-devel/gdb-7.5[client,python]
clang? ( >=sys-devel/clang-3.2:= )
- qbs? ( >=dev-util/qbs-1.3.4 )
+ qbs? ( >=dev-util/qbs-1.4.0-r1 )
systemd? ( sys-apps/systemd:= )
+ webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
"
DEPEND="${RDEPEND}
>=dev-qt/linguist-tools-${QT_PV}
@@ -93,6 +94,12 @@ src_prepare() {
fi
done
+ # automagic dep on qtwebkit (bug 538236)
+ if ! use webkit; then
+ sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
+ src/plugins/help/help.pro || die "failed to disable webkit"
+ fi
+
# disable broken or unreliable tests
sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
@@ -112,6 +119,8 @@ src_configure() {
IDE_PACKAGE_MODE=1 \
LLVM_INSTALL_DIR="${EPREFIX}/usr" \
QBS_INSTALL_DIR="${EPREFIX}/usr" \
+ CONFIG+=qbs_disable_rpath \
+ CONFIG+=qbs_enable_project_file_updates \
$(use systemd && echo CONFIG+=journald) \
$(use test && echo BUILD_TESTS=1) \
USE_SYSTEM_BOTAN=1
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2015-04-23 15:38 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2015-04-23 15:38 UTC (permalink / raw
To: gentoo-commits
commit: 54e3c5896438a6d32ed39e4efc71251bd138d546
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 15:38:19 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 15:38:19 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=54e3c589
[dev-qt/qt-creator] Raise Qt dep.
Package-Manager: portage-2.2.18
dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 5a1368e..5dd78e5 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -35,7 +35,7 @@ QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectman
IUSE="debug doc systemd test ${QTC_PLUGINS[@]%:*}"
# minimum Qt version required
-QT_PV="5.3.2:5"
+QT_PV="5.4.0:5"
RDEPEND="
=dev-libs/botan-1.10*[threads]
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2015-04-01 14:55 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2015-04-01 14:55 UTC (permalink / raw
To: gentoo-commits
commit: 46d195fda5ae5156ac1291b774995ec19907382c
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 1 14:55:06 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Apr 1 14:55:06 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=46d195fd
[dev-qt/qt-creator] Sync.
Package-Manager: portage-2.2.18
dev-qt/qt-creator/metadata.xml | 1 +
dev-qt/qt-creator/qt-creator-9999.ebuild | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index d89ff7c..23f5234 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -20,6 +20,7 @@
<flag name="python">Enable Python source code editor</flag>
<flag name="qbs">Enable QBS project manager plugin</flag>
<flag name="qnx">Build plugin for QNX/Blackberry devices</flag>
+ <flag name="systemd">Add support for retrieving application output from journald</flag>
<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
<flag name="winrt">Build plugin for WinRT devices</flag>
</use>
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 25ac392..9369c7f 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.3.2.ebuild,v 1.3 2015/03/29 13:57:41 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0_rc1.ebuild,v 1.1 2015/04/01 14:52:27 pesa Exp $
EAPI=5
@@ -32,7 +32,7 @@ KEYWORDS=""
QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
-IUSE="debug doc test ${QTC_PLUGINS[@]%:*}"
+IUSE="debug doc systemd test ${QTC_PLUGINS[@]%:*}"
# minimum Qt version required
QT_PV="5.3.2:5"
@@ -55,9 +55,10 @@ RDEPEND="
>=dev-qt/qtwidgets-${QT_PV}
>=dev-qt/qtx11extras-${QT_PV}
>=dev-qt/qtxml-${QT_PV}
- >=sys-devel/gdb-7.4[client(+),python]
+ >=sys-devel/gdb-7.5[client,python]
clang? ( >=sys-devel/clang-3.2:= )
qbs? ( >=dev-util/qbs-1.3.4 )
+ systemd? ( sys-apps/systemd:= )
"
DEPEND="${RDEPEND}
>=dev-qt/linguist-tools-${QT_PV}
@@ -111,6 +112,7 @@ src_configure() {
IDE_PACKAGE_MODE=1 \
LLVM_INSTALL_DIR="${EPREFIX}/usr" \
QBS_INSTALL_DIR="${EPREFIX}/usr" \
+ $(use systemd && echo CONFIG+=journald) \
$(use test && echo BUILD_TESTS=1) \
USE_SYSTEM_BOTAN=1
}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2015-03-29 14:01 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2015-03-29 14:01 UTC (permalink / raw
To: gentoo-commits
commit: 9195dc50a31f0ded4b40f10c22fda362ec72c40f
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 14:01:22 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 14:01:22 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9195dc50
[dev-qt/qt-creator] Sync.
Package-Manager: portage-2.2.18
dev-qt/qt-creator/qt-creator-9999.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 489b2ba..25ac392 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.3.1.ebuild,v 1.1 2015/02/24 17:54:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.2.ebuild,v 1.3 2015/03/29 13:57:41 pesa Exp $
EAPI=5
@@ -15,8 +15,8 @@ LICENSE="|| ( LGPL-2.1 LGPL-3 )"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI=(
- "git://gitorious.org/${PN}/${PN}.git"
- "https://git.gitorious.org/${PN}/${PN}.git"
+ "git://code.qt.io/${PN}/${PN}.git"
+ "https://code.qt.io/git/${PN}/${PN}.git"
)
else
MY_PV=${PV/_/-}
@@ -57,7 +57,7 @@ RDEPEND="
>=dev-qt/qtxml-${QT_PV}
>=sys-devel/gdb-7.4[client(+),python]
clang? ( >=sys-devel/clang-3.2:= )
- qbs? ( >=dev-util/qbs-1.3.3[qt5] )
+ qbs? ( >=dev-util/qbs-1.3.4 )
"
DEPEND="${RDEPEND}
>=dev-qt/linguist-tools-${QT_PV}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2015-02-24 18:00 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2015-02-24 18:00 UTC (permalink / raw
To: gentoo-commits
commit: 6de15f768ca5ff04f7c86f33da21f6c4f8e10873
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 24 18:00:16 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Feb 24 18:00:16 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6de15f76
[dev-qt/qt-creator] Sync.
Package-Manager: portage-2.2.17
---
dev-qt/qt-creator/qt-creator-9999.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index a534058..489b2ba 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2015 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.3.0.ebuild,v 1.2 2015/01/25 15:06:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.1.ebuild,v 1.1 2015/02/24 17:54:24 pesa Exp $
EAPI=5
-PLOCALES="cs de fr ja pl ru sl zh_CN zh_TW"
+PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
inherit eutils l10n multilib qmake-utils virtualx
@@ -42,7 +42,7 @@ RDEPEND="
>=dev-qt/designer-${QT_PV}
>=dev-qt/qtconcurrent-${QT_PV}
>=dev-qt/qtcore-${QT_PV}
- >=dev-qt/qtdeclarative-${QT_PV}
+ >=dev-qt/qtdeclarative-${QT_PV}[widgets]
>=dev-qt/qtgui-${QT_PV}
>=dev-qt/qthelp-${QT_PV}
>=dev-qt/qtnetwork-${QT_PV}[ssl]
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2015-01-26 2:58 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2015-01-26 2:58 UTC (permalink / raw
To: gentoo-commits
commit: a1d75d167f9304628b4e20aaab47cf807c90c0f7
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 26 02:58:35 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jan 26 02:58:35 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a1d75d16
[dev-qt/qt-creator] Sync.
Package-Manager: portage-2.2.15
---
dev-qt/qt-creator/qt-creator-9999.ebuild | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index e977dc3..a534058 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2015 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.3.0.ebuild,v 1.1 2015/01/18 04:56:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.0.ebuild,v 1.2 2015/01/25 15:06:13 pesa Exp $
EAPI=5
PLOCALES="cs de fr ja pl ru sl zh_CN zh_TW"
-inherit eutils l10n multilib qmake-utils
+inherit eutils l10n multilib qmake-utils virtualx
DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
@@ -37,7 +37,7 @@ IUSE="debug doc test ${QTC_PLUGINS[@]%:*}"
# minimum Qt version required
QT_PV="5.3.2:5"
-CDEPEND="
+RDEPEND="
=dev-libs/botan-1.10*[threads]
>=dev-qt/designer-${QT_PV}
>=dev-qt/qtconcurrent-${QT_PV}
@@ -55,18 +55,16 @@ CDEPEND="
>=dev-qt/qtwidgets-${QT_PV}
>=dev-qt/qtx11extras-${QT_PV}
>=dev-qt/qtxml-${QT_PV}
+ >=sys-devel/gdb-7.4[client(+),python]
clang? ( >=sys-devel/clang-3.2:= )
qbs? ( >=dev-util/qbs-1.3.3[qt5] )
"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
>=dev-qt/linguist-tools-${QT_PV}
virtual/pkgconfig
doc? ( >=dev-qt/qdoc-${QT_PV} )
test? ( >=dev-qt/qttest-${QT_PV} )
"
-RDEPEND="${CDEPEND}
- >=sys-devel/gdb-7.2[client(+),python]
-"
for x in ${PLOCALES}; do
# qt translations must be installed for qt-creator translations to work
RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
@@ -90,11 +88,16 @@ src_prepare() {
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"
+ src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
fi
done
+ # disable broken or unreliable tests
+ sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
+ sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
+ sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+ sed -i -e '/parsertests\.pro/d' tests/auto/valgrind/memcheck/memcheck.pro || die
+
# fix translations
sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
share/qtcreator/translations/translations.pro || die
@@ -108,17 +111,13 @@ src_configure() {
IDE_PACKAGE_MODE=1 \
LLVM_INSTALL_DIR="${EPREFIX}/usr" \
QBS_INSTALL_DIR="${EPREFIX}/usr" \
- TEST=$(use test && echo 1 || echo 0) \
+ $(use test && echo BUILD_TESTS=1) \
USE_SYSTEM_BOTAN=1
}
src_test() {
- echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}"
cd tests/auto || die
-
- eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)"
-
- default
+ VIRTUALX_COMMAND=default virtualmake
}
src_install() {
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2015-01-20 2:37 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2015-01-20 2:37 UTC (permalink / raw
To: gentoo-commits
commit: 8bfdd3a426ed7de3bbfbc404d0cd8d394bafcf4e
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 20 02:37:33 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jan 20 02:37:33 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8bfdd3a4
[dev-qt/qt-creator] Sync.
Package-Manager: portage-2.2.15
---
dev-qt/qt-creator/metadata.xml | 2 ++
dev-qt/qt-creator/qt-creator-9999.ebuild | 54 ++++++++++++++++++++------------
2 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 6a0df66..d89ff7c 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -18,8 +18,10 @@
<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
<flag name="python">Enable Python source code editor</flag>
+ <flag name="qbs">Enable QBS project manager plugin</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="winrt">Build plugin for WinRT devices</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 94a7154..e977dc3 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.2.ebuild,v 1.1 2014/10/14 23:34:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.0.ebuild,v 1.1 2015/01/18 04:56:40 pesa Exp $
EAPI=5
@@ -22,42 +22,57 @@ 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"
+ SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
S=${WORKDIR}/${MY_P}
fi
SLOT="0"
KEYWORDS=""
-# TODO: qbs:qbsprojectmanager, winrt (both require qt5)
-QTC_PLUGINS=(android 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[@]%:*}"
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
+ bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
+ perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+IUSE="debug doc test ${QTC_PLUGINS[@]%:*}"
# minimum Qt version required
-QT_PV="4.8.5:4"
+QT_PV="5.3.2:5"
CDEPEND="
=dev-libs/botan-1.10*[threads]
>=dev-qt/designer-${QT_PV}
- >=dev-qt/qtcore-${QT_PV}[ssl]
+ >=dev-qt/qtconcurrent-${QT_PV}
+ >=dev-qt/qtcore-${QT_PV}
>=dev-qt/qtdeclarative-${QT_PV}
>=dev-qt/qtgui-${QT_PV}
- >=dev-qt/qthelp-${QT_PV}[doc?]
+ >=dev-qt/qthelp-${QT_PV}
+ >=dev-qt/qtnetwork-${QT_PV}[ssl]
+ >=dev-qt/qtprintsupport-${QT_PV}
+ >=dev-qt/qtquick1-${QT_PV}
+ >=dev-qt/qtquickcontrols-${QT_PV}
>=dev-qt/qtscript-${QT_PV}
>=dev-qt/qtsql-${QT_PV}
>=dev-qt/qtsvg-${QT_PV}
+ >=dev-qt/qtwidgets-${QT_PV}
+ >=dev-qt/qtx11extras-${QT_PV}
+ >=dev-qt/qtxml-${QT_PV}
clang? ( >=sys-devel/clang-3.2:= )
+ qbs? ( >=dev-util/qbs-1.3.3[qt5] )
"
DEPEND="${CDEPEND}
+ >=dev-qt/linguist-tools-${QT_PV}
virtual/pkgconfig
+ doc? ( >=dev-qt/qdoc-${QT_PV} )
test? ( >=dev-qt/qttest-${QT_PV} )
"
RDEPEND="${CDEPEND}
>=sys-devel/gdb-7.2[client(+),python]
- examples? ( >=dev-qt/qtdemo-${QT_PV} )
"
+for x in ${PLOCALES}; do
+ # qt translations must be installed for qt-creator translations to work
+ RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
PDEPEND="
autotools? ( sys-devel/autoconf )
bazaar? ( dev-vcs/bzr )
@@ -74,7 +89,7 @@ src_prepare() {
for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
if ! use ${plugin%:*}; then
einfo "Disabling ${plugin%:*} plugin"
- sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)${plugin#*:}\>/d" \
+ sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
src/plugins/plugins.pro \
|| die "failed to disable ${plugin%:*} plugin"
fi
@@ -89,11 +104,10 @@ src_prepare() {
}
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" \
+ QBS_INSTALL_DIR="${EPREFIX}/usr" \
TEST=$(use test && echo 1 || echo 0) \
USE_SYSTEM_BOTAN=1
}
@@ -102,8 +116,7 @@ src_test() {
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
}
@@ -116,9 +129,10 @@ src_install() {
# install documentation
if use doc; then
emake docs
- insinto /usr/share/doc/${PF}
+ # don't use ${PF} or the doc will not be found
+ 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
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2014-10-21 17:34 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2014-10-21 17:34 UTC (permalink / raw
To: gentoo-commits
commit: d60e12dcfb5c1f9d79e3a2e3ce615205d3a93b98
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 21 17:34:21 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Oct 21 17:34:21 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d60e12dc
[dev-qt/qt-creator] Sync with portage.
Package-Manager: portage-2.2.14
---
dev-qt/qt-creator/metadata.xml | 6 +++++-
dev-qt/qt-creator/qt-creator-9999.ebuild | 31 +++++++++++++++----------------
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 9626a26..46801bc 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -11,9 +11,9 @@
<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>
<flag name="ios">Build plugin for Apple iOS devices</flag>
<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
@@ -21,4 +21,8 @@
<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>
</use>
+<upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/qtcreator/</doc>
+</upstream>
</pkgmetadata>
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 8deb747..94a7154 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,16 +1,16 @@
# 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.0.ebuild,v 1.1 2013/12/19 22:31:44 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v 1.1 2014/10/14 23:34:31 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"
-LICENSE="LGPL-2.1"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
@@ -29,26 +29,26 @@ fi
SLOT="0"
KEYWORDS=""
+# TODO: qbs:qbsprojectmanager, winrt (both require qt5)
QTC_PLUGINS=(android autotools:autotoolsprojectmanager baremetal bazaar
- clearcase cmake:cmakeprojectmanager cvs fakevim git ios mercurial
- perforce python:pythoneditor qnx subversion valgrind)
+ 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:= )
"
DEPEND="${CDEPEND}
virtual/pkgconfig
@@ -70,13 +70,12 @@ PDEPEND="
"
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 \
+ sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)${plugin#*:}\>/d" \
+ src/plugins/plugins.pro \
|| die "failed to disable ${plugin%:*} plugin"
fi
done
@@ -85,8 +84,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
}
@@ -95,6 +93,7 @@ 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
}
@@ -106,7 +105,7 @@ src_test() {
EQMAKE4_EXCLUDE="valgrind/*"
eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)"
- emake check
+ default
}
src_install() {
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2013-12-19 22:34 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2013-12-19 22:34 UTC (permalink / raw
To: gentoo-commits
commit: 4d06a76c3fa5edc3abfc9e4fde3abdb269073ce5
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Dec 19 22:34:07 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Dec 19 22:34:07 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4d06a76c
[dev-qt/qt-creator] Sync with portage.
Package-Manager: portage-2.2.7
---
dev-qt/qt-creator/qt-creator-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 3233668..4cdaf03 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.0_beta.ebuild,v 1.1 2013/10/23 13:08:04 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.0.0.ebuild,v 1.1 2013/12/19 22:31:44 pesa Exp $
EAPI=5
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
)
else
MY_PV=${PV/_/-}
- MY_P=${PN}-${MY_PV}-src
+ 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}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2013-10-23 13:12 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2013-10-23 13:12 UTC (permalink / raw
To: gentoo-commits
commit: 90f1d293b6e14c2ab213924fdcf58900e83870a0
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Oct 23 13:11:56 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 13:11:56 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=90f1d293
[dev-qt/qt-creator] Sync with portage.
Package-Manager: portage-2.2.7
---
dev-qt/qt-creator/metadata.xml | 8 +++++---
dev-qt/qt-creator/qt-creator-9999.ebuild | 22 ++++++++++++----------
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 92a5d23..9626a26 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -7,16 +7,18 @@
</maintainer>
<herd>qt</herd>
<use>
- <flag name="android">Build Android plugin</flag>
+ <flag name="android">Build plugin for Android devices</flag>
<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="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>
- <flag name="madde">Enable integration with MADDE (Maemo Application Development and Debugging Environment)</flag>
+ <flag name="ios">Build plugin for Apple iOS devices</flag>
<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
- <flag name="qnx">Build QNX/Blackberry plugin</flag>
+ <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>
</use>
</pkgmetadata>
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 552a33d..3233668 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.0.ebuild,v 1.2 2013/08/15 08:04:02 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.0.0_beta.ebuild,v 1.1 2013/10/23 13:08:04 pesa Exp $
EAPI=5
-PLOCALES="cs de es fr it ja pl ru sl uk zh_CN zh_TW"
+PLOCALES="cs de fr ja pl ru sl zh_CN zh_TW"
inherit eutils l10n multilib qt4-r2
@@ -12,10 +12,12 @@ 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-2
- EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
- https://git.gitorious.org/${PN}/${PN}.git"
+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}-${MY_PV}-src
@@ -27,9 +29,9 @@ fi
SLOT="0"
KEYWORDS=""
-QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
- clearcase cmake:cmakeprojectmanager cvs fakevim git
- madde mercurial perforce qnx subversion valgrind)
+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
@@ -53,7 +55,7 @@ DEPEND="${CDEPEND}
test? ( >=dev-qt/qttest-${QT_PV} )
"
RDEPEND="${CDEPEND}
- >=sys-devel/gdb-7.2[python]
+ >=sys-devel/gdb-7.2[client(+),python]
examples? ( >=dev-qt/qtdemo-${QT_PV} )
"
PDEPEND="
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2013-08-15 8:23 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2013-08-15 8:23 UTC (permalink / raw
To: gentoo-commits
commit: 055cf310b1ab4f6df5b8ca544f6d08f41ec55558
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Aug 15 08:23:23 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 08:23:23 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=055cf310
[dev-qt/qt-creator] Sync with portage.
Package-Manager: portage-2.2.0
---
dev-qt/qt-creator/metadata.xml | 5 -----
dev-qt/qt-creator/qt-creator-9999.ebuild | 4 ++--
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 027096a..92a5d23 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -5,10 +5,6 @@
<email>pesa@gentoo.org</email>
<name>Davide Pesavento</name>
</maintainer>
-<maintainer>
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
-</maintainer>
<herd>qt</herd>
<use>
<flag name="android">Build Android plugin</flag>
@@ -17,7 +13,6 @@
<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>
- <flag name="git">Add support for <pkg>dev-vcs/git</pkg> version control system</flag>
<flag name="madde">Enable integration with MADDE (Maemo Application Development and Debugging Environment)</flag>
<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 325a737..552a33d 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.0.ebuild,v 1.1 2013/07/27 07:49:01 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.0.ebuild,v 1.2 2013/08/15 08:04:02 pesa Exp $
EAPI=5
@@ -36,7 +36,7 @@ IUSE="debug doc examples test ${QTC_PLUGINS[@]%:*}"
QT_PV="4.8.0:4"
CDEPEND="
- =dev-libs/botan-1.10*
+ =dev-libs/botan-1.10*[threads]
>=dev-qt/qtcore-${QT_PV}[ssl]
>=dev-qt/qtdeclarative-${QT_PV}
|| (
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2013-07-27 8:33 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2013-07-27 8:33 UTC (permalink / raw
To: gentoo-commits
commit: 7288df4e60114d51a8b60c4c7b9f9a991af89b50
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Jul 27 08:33:56 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 08:33:56 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7288df4e
[dev-qt/qt-creator] Sync with portage.
Package-Manager: portage-2.2.0_alpha190
---
dev-qt/qt-creator/metadata.xml | 10 +++++-----
dev-qt/qt-creator/qt-creator-9999.ebuild | 11 +++++++++--
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 78606ab..027096a 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>qt</herd>
-<maintainer>
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
-</maintainer>
<maintainer>
<email>pesa@gentoo.org</email>
<name>Davide Pesavento</name>
</maintainer>
+<maintainer>
+ <email>hwoarang@gentoo.org</email>
+ <name>Markos Chandras</name>
+</maintainer>
+<herd>qt</herd>
<use>
<flag name="android">Build Android plugin</flag>
<flag name="autotools">Enable autotools project manager plugin</flag>
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 0b82e9d..325a737 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.7.1.ebuild,v 1.1 2013/06/03 08:01:44 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.8.0.ebuild,v 1.1 2013/07/27 07:49:01 pesa Exp $
EAPI=5
@@ -39,7 +39,10 @@ CDEPEND="
=dev-libs/botan-1.10*
>=dev-qt/qtcore-${QT_PV}[ssl]
>=dev-qt/qtdeclarative-${QT_PV}
- >=dev-qt/qtgui-${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}
@@ -79,6 +82,10 @@ src_prepare() {
# 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() {
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2013-06-30 23:52 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2013-06-30 23:52 UTC (permalink / raw
To: gentoo-commits
commit: 4caed6cea6aae91e4192c3f9e3c6959238052785
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 30 23:52:34 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 23:52:34 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4caed6ce
[dev-qt/qt-creator] Remove 2.8.0_beta, rc is in tree.
Package-Manager: portage-2.2.0_alpha186
---
dev-qt/qt-creator/Manifest | 1 -
dev-qt/qt-creator/qt-creator-2.8.0_beta.ebuild | 118 -------------------------
2 files changed, 119 deletions(-)
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
deleted file mode 100644
index 2ab0a7f..0000000
--- a/dev-qt/qt-creator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qt-creator-2.8.0-beta-src.tar.gz 22839011 SHA256 00f77b6edb2da05f9fc3173c6fabf7225464afc60ff454118116dbbdc85d4c51 SHA512 67a1b6c52ddfa72eb33f0b2d0edd9fcda3d1bf82599bc476763693e2b23f2d8d98bbe6aa27f2351a9e6bab270e1220edc70af52f4bcdfab49a6d7a53dfc376a5 WHIRLPOOL a0d417d183dc39f3c9d71c0ebad2443d9be94945e21434666f27c47430aa3adacf61407a2d569242ab2a5f0dfa8cf94e17f49b5bc1f9fcf6d89849a3f7313913
diff --git a/dev-qt/qt-creator/qt-creator-2.8.0_beta.ebuild b/dev-qt/qt-creator/qt-creator-2.8.0_beta.ebuild
deleted file mode 100644
index 288b2d8..0000000
--- a/dev-qt/qt-creator/qt-creator-2.8.0_beta.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.7.1.ebuild,v 1.1 2013/06/03 08:01:44 pesa Exp $
-
-EAPI=5
-
-PLOCALES="cs de es fr it ja pl ru sl uk 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-2
- EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git
- https://git.gitorious.org/${PN}/${PN}.git"
-else
- MY_PV=${PV/_/-}
- MY_P=${PN}-${MY_PV}-src
- [[ ${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 bazaar
- clearcase cmake:cmakeprojectmanager cvs fakevim git
- madde mercurial perforce 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*
- >=dev-qt/qtcore-${QT_PV}[ssl]
- >=dev-qt/qtdeclarative-${QT_PV}
- >=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}
-"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- test? ( >=dev-qt/qttest-${QT_PV} )
-"
-RDEPEND="${CDEPEND}
- >=sys-devel/gdb-7.2[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
-}
-
-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'
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2013-06-10 4:30 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2013-06-10 4:30 UTC (permalink / raw
To: gentoo-commits
commit: fee093cfb11da6cafc80c8e69b1d1ff0a784d47e
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 10 04:30:27 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 04:30:27 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fee093cf
[dev-qt/qt-creator] Version bump.
---
dev-qt/qt-creator/Manifest | 1 +
...or-9999.ebuild => qt-creator-2.8.0_beta.ebuild} | 23 +++++++++++++---------
dev-qt/qt-creator/qt-creator-9999.ebuild | 21 ++++++++++++--------
3 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
new file mode 100644
index 0000000..2ab0a7f
--- /dev/null
+++ b/dev-qt/qt-creator/Manifest
@@ -0,0 +1 @@
+DIST qt-creator-2.8.0-beta-src.tar.gz 22839011 SHA256 00f77b6edb2da05f9fc3173c6fabf7225464afc60ff454118116dbbdc85d4c51 SHA512 67a1b6c52ddfa72eb33f0b2d0edd9fcda3d1bf82599bc476763693e2b23f2d8d98bbe6aa27f2351a9e6bab270e1220edc70af52f4bcdfab49a6d7a53dfc376a5 WHIRLPOOL a0d417d183dc39f3c9d71c0ebad2443d9be94945e21434666f27c47430aa3adacf61407a2d569242ab2a5f0dfa8cf94e17f49b5bc1f9fcf6d89849a3f7313913
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-2.8.0_beta.ebuild
similarity index 80%
copy from dev-qt/qt-creator/qt-creator-9999.ebuild
copy to dev-qt/qt-creator/qt-creator-2.8.0_beta.ebuild
index 48b13ff..288b2d8 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-2.8.0_beta.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.7.0_rc.ebuild,v 1.1 2013/03/08 09:24:01 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.7.1.ebuild,v 1.1 2013/06/03 08:01:44 pesa Exp $
EAPI=5
-PLOCALES="cs de es fr hu it ja pl ru sl uk zh_CN zh_TW"
+PLOCALES="cs de es fr it ja pl ru sl uk zh_CN zh_TW"
inherit eutils l10n multilib qt4-r2
@@ -19,12 +19,13 @@ if [[ ${PV} == *9999* ]]; then
else
MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}-src
- SRC_URI="http://releases.qt-project.org/qtcreator/${MY_PV}/${MY_P}.tar.gz"
+ [[ ${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=""
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
clearcase cmake:cmakeprojectmanager cvs fakevim git
@@ -70,8 +71,8 @@ src_prepare() {
for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
if ! use ${plugin%:*}; then
einfo "Disabling ${plugin%:*} plugin"
- sed -i -re "/(^|SUBDIRS\s+\+=)\s+plugin_${plugin#*:}\>/d" src/plugins/plugins.pro \
- || die "failed to disable ${plugin} plugin"
+ sed -i -re "/^\s+${plugin#*:}\>/d" src/plugins/plugins.pro \
+ || die "failed to disable ${plugin%:*} plugin"
fi
done
@@ -81,8 +82,9 @@ src_prepare() {
}
src_configure() {
- eqmake4 qtcreator.pro \
- IDE_LIBRARY_BASENAME="$(get_libdir)" \
+ 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
@@ -91,14 +93,17 @@ src_configure() {
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-2.*,known-issues}
+ dodoc dist/{changes-*,known-issues}
# install documentation
if use doc; then
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 48b13ff..0b82e9d 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.7.0_rc.ebuild,v 1.1 2013/03/08 09:24:01 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.7.1.ebuild,v 1.1 2013/06/03 08:01:44 pesa Exp $
EAPI=5
-PLOCALES="cs de es fr hu it ja pl ru sl uk zh_CN zh_TW"
+PLOCALES="cs de es fr it ja pl ru sl uk zh_CN zh_TW"
inherit eutils l10n multilib qt4-r2
@@ -19,7 +19,8 @@ if [[ ${PV} == *9999* ]]; then
else
MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}-src
- SRC_URI="http://releases.qt-project.org/qtcreator/${MY_PV}/${MY_P}.tar.gz"
+ [[ ${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
@@ -70,8 +71,8 @@ src_prepare() {
for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
if ! use ${plugin%:*}; then
einfo "Disabling ${plugin%:*} plugin"
- sed -i -re "/(^|SUBDIRS\s+\+=)\s+plugin_${plugin#*:}\>/d" src/plugins/plugins.pro \
- || die "failed to disable ${plugin} plugin"
+ sed -i -re "/^\s+${plugin#*:}\>/d" src/plugins/plugins.pro \
+ || die "failed to disable ${plugin%:*} plugin"
fi
done
@@ -81,8 +82,9 @@ src_prepare() {
}
src_configure() {
- eqmake4 qtcreator.pro \
- IDE_LIBRARY_BASENAME="$(get_libdir)" \
+ 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
@@ -91,14 +93,17 @@ src_configure() {
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-2.*,known-issues}
+ dodoc dist/{changes-*,known-issues}
# install documentation
if use doc; then
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/
@ 2013-03-08 9:37 Davide Pesavento
0 siblings, 0 replies; 20+ messages in thread
From: Davide Pesavento @ 2013-03-08 9:37 UTC (permalink / raw
To: gentoo-commits
commit: c74c9b900c5391d9c179d0fe770270b0fde03ab0
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Mar 8 09:36:51 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 09:36:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c74c9b90
[dev-qt/qt-creator] Sync with gx86.
---
dev-qt/qt-creator/metadata.xml | 1 -
dev-qt/qt-creator/qt-creator-9999.ebuild | 63 +++++++++++-------------------
2 files changed, 23 insertions(+), 41 deletions(-)
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 76b9c24..78606ab 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -14,7 +14,6 @@
<flag name="android">Build Android plugin</flag>
<flag name="autotools">Enable autotools project manager plugin</flag>
<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
- <flag name="botan-bundled">Use the bundled copy of <pkg>dev-libs/botan</pkg></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>
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index a274577..48b13ff 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-2.7.0_rc.ebuild,v 1.1 2013/03/08 09:24:01 pesa Exp $
-EAPI=4
+EAPI=5
-PLOCALES="cs de fr hu ja pl ru sl zh_CN"
+PLOCALES="cs de es fr hu it ja pl ru sl uk zh_CN zh_TW"
-inherit eutils flag-o-matic l10n multilib qt4-r2
+inherit eutils l10n multilib qt4-r2
-DESCRIPTION="Lightweight IDE for C++ development centering around Qt"
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator"
LICENSE="LGPL-2.1"
@@ -29,24 +29,24 @@ KEYWORDS=""
QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
clearcase cmake:cmakeprojectmanager cvs fakevim git
madde mercurial perforce qnx subversion valgrind)
-IUSE="+botan-bundled debug doc examples ${QTC_PLUGINS[@]%:*}"
+IUSE="debug doc examples test ${QTC_PLUGINS[@]%:*}"
# minimum Qt version required
QT_PV="4.8.0:4"
CDEPEND="
- >=dev-qt/qthelp-${QT_PV}[doc?]
+ =dev-libs/botan-1.10*
>=dev-qt/qtcore-${QT_PV}[ssl]
>=dev-qt/qtdeclarative-${QT_PV}
>=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}
- debug? ( >=dev-qt/qttest-${QT_PV} )
- !botan-bundled? ( >=dev-libs/botan-1.10.2 )
"
DEPEND="${CDEPEND}
- !botan-bundled? ( virtual/pkgconfig )
+ virtual/pkgconfig
+ test? ( >=dev-qt/qttest-${QT_PV} )
"
RDEPEND="${CDEPEND}
>=sys-devel/gdb-7.2[python]
@@ -70,7 +70,7 @@ src_prepare() {
for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
if ! use ${plugin%:*}; then
einfo "Disabling ${plugin%:*} plugin"
- sed -i -e "/^[[:space:]]\+plugin_${plugin#*:}/d" src/plugins/plugins.pro \
+ sed -i -re "/(^|SUBDIRS\s+\+=)\s+plugin_${plugin#*:}\>/d" src/plugins/plugins.pro \
|| die "failed to disable ${plugin} plugin"
fi
done
@@ -78,39 +78,21 @@ src_prepare() {
# fix translations
sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
share/qtcreator/translations/translations.pro || die
-
- if ! use botan-bundled; then
- # identify system botan and pkg-config file
- local botan_version=$(best_version dev-libs/botan | cut -d '-' -f3 | cut -d '.' -f1,2)
- local lib_botan=$(pkg-config --libs botan-${botan_version})
- einfo "Major version of system's botan library to be used: ${botan_version}"
-
- # drop bundled libBotan. Bug #383033
- rm -rf "${S}"/src/libs/3rdparty/botan || die
- # remove references to bundled botan
- sed -i -e "s:botan::" "${S}"/src/libs/3rdparty/3rdparty.pro || die
- for x in testrunner parsertests modeldemo; do
- sed -i -e "/botan.pri/d" "${S}"/tests/valgrind/memcheck/${x}.pro || die
- done
- sed -i -e "/botan.pri/d" "${S}"/src/libs/utils/utils_dependencies.pri || die
- sed -i -e "/botan.pri/d" "${S}"/tests/manual/preprocessor/preprocessor.pro || die
- # link to system botan
- sed -i -e "/LIBS/s:$: ${lib_botan}:" "${S}"/qtcreator.pri || die
- sed -i -e "s:-lBotan:${lib_botan}:" "${S}"/tests/manual/appwizards/appwizards.pro || die
- # append botan refs to compiler flags
- append-flags $(pkg-config --cflags --libs botan-${botan_version})
- fi
}
src_configure() {
eqmake4 qtcreator.pro \
IDE_LIBRARY_BASENAME="$(get_libdir)" \
- IDE_PACKAGE_MODE=yes
+ IDE_PACKAGE_MODE=1 \
+ TEST=$(use test && echo 1 || echo 0) \
+ USE_SYSTEM_BOTAN=1
}
-src_compile() {
- emake
- use doc && emake docs
+src_test() {
+ echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}"
+ cd tests/auto || die
+ eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)"
+ emake check
}
src_install() {
@@ -118,13 +100,14 @@ src_install() {
dodoc dist/{changes-2.*,known-issues}
- # Install documentation
+ # 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' qtcreator 'Qt;Development;IDE'
+ # install desktop file
+ make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
}
^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2016-05-13 16:16 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-18 1:53 [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/ Davide Pesavento
-- strict thread matches above, loose matches on Subject: below --
2016-05-13 16:16 Davide Pesavento
2016-04-21 15:38 Davide Pesavento
2015-12-17 2:39 Davide Pesavento
2015-09-14 0:53 Davide Pesavento
2015-05-04 19:52 Davide Pesavento
2015-04-23 15:38 Davide Pesavento
2015-04-01 14:55 Davide Pesavento
2015-03-29 14:01 Davide Pesavento
2015-02-24 18:00 Davide Pesavento
2015-01-26 2:58 Davide Pesavento
2015-01-20 2:37 Davide Pesavento
2014-10-21 17:34 Davide Pesavento
2013-12-19 22:34 Davide Pesavento
2013-10-23 13:12 Davide Pesavento
2013-08-15 8:23 Davide Pesavento
2013-07-27 8:33 Davide Pesavento
2013-06-30 23:52 Davide Pesavento
2013-06-10 4:30 Davide Pesavento
2013-03-08 9:37 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox