commit:     03024b484aef25ad8b2faeb6af6a2d4953499b08
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 05:48:38 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 05:48:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03024b48

dev-qt/qt-creator: version bump

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-qt/qt-creator/Manifest                      |   1 +
 dev-qt/qt-creator/metadata.xml                  |   3 +-
 dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild | 184 ++++++++++++++++++++++++
 3 files changed, 187 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index cdcef136a4c..2fd3a6ce706 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,3 @@
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 
e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 
be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f
 WHIRLPOOL 
c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
 DIST qt-creator-opensource-src-4.2.0.tar.xz 16624096 SHA256 
203e2bc6618590b5e5a7e17f1a05e65b255d742f0b8f0ba3246fb541dfdfbe80 SHA512 
1801611d8db10041332d728a2af6b0c57b28b3ab9847a8875edb788d3b0fe6570103a408a7f52c989e40949743263d444e5db49d290860f2e7231f463fa86f7a
 WHIRLPOOL 
841fb63bb6d25a640fb8db24412b05b93e9240db8c68de9555cc4baef50d6e08d13594f4e7cc675fda90359d8a4a4fbb8110f9cfd73315e1775a636f5f28a54d
+DIST qt-creator-opensource-src-4.3.0-beta1.tar.xz 16339884 SHA256 
9f5e28747281a2e75e5f875d37fad9422ee264357b2e752c450dad5b568229e2 SHA512 
84cee2c29cbe664c7ce10a93ce769e80d9264a707f3e390e13ed0708cdccddd6e48524b5c7c5d2520d66590f5b41361eab00025f52747bc64b16686ed953379f
 WHIRLPOOL 
10f24ef14e1b26405eb7329c1a6112098685d7f233f8b083af3a2de11738acf9242a12d5d0f1a2263dc0b005634c026dc96fe74371a2449b9d249c1ebf94442e

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 72fd1df9089..a4821236d2e 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -15,10 +15,11 @@
                <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="clangcodemodel">Build clang-based code model and 
refactoring plugins</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="designer">Build widget designer 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>

diff --git a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild 
b/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
new file mode 100644
index 00000000000..06309b37c3b
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+
+inherit eutils l10n qmake-utils toolchain-funcs virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="http://doc.qt.io/qtcreator/";
+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.xz";
+       KEYWORDS="~amd64 ~arm ~x86"
+       S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' 
autotools:autotoolsprojectmanager baremetal bazaar
+       'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' 
clangstaticanalyzer clearcase
+       cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios 
mercurial modeling:modeleditor
+       nim perforce python:pythoneditor qbs:qbsprojectmanager qnx 
scxml:scxmleditor subversion valgrind
+       winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.6.0:5"
+
+RDEPEND="
+       =dev-libs/botan-1.10*[-bindist,threads]
+       >=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[client,python]
+       clangcodemodel? ( >=sys-devel/clang-3.9:= )
+       designer? ( >=dev-qt/designer-${QT_PV} )
+       qbs? ( >=dev-util/qbs-1.7.0 )
+       systemd? ( sys-apps/systemd:= )
+       webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+"
+DEPEND="${RDEPEND}
+       >=dev-qt/linguist-tools-${QT_PV}
+       virtual/pkgconfig
+       doc? ( >=dev-qt/qdoc-${QT_PV} )
+       test? (
+               >=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+               >=dev-qt/qtquickcontrols2-${QT_PV}
+               >=dev-qt/qttest-${QT_PV}
+       )
+"
+# qt translations must also be installed or qt-creator translations won't be 
loaded
+for x in ${PLOCALES}; do
+       RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+PDEPEND="
+       autotools? ( sys-devel/autoconf )
+       bazaar? ( dev-vcs/bzr )
+       clangstaticanalyzer? ( >=sys-devel/clang-3.9 )
+       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 tc-is-gcc; then
+               if [[ $(gcc-major-version) -lt 4 ]] || \
+                  [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 
]]; then
+                       eerror "GCC version 4.9 or later is required to build 
Qt Creator ${PV}"
+                       die "GCC >= 4.9 required"
+               fi
+       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
+
+       # avoid building unused support libraries
+       if ! use clangcodemodel; then
+               sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
+       fi
+       if ! use glsl; then
+               sed -i -e '/glsl/d' src/libs/libs.pro || die
+       fi
+       if ! use modeling; then
+               sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+       fi
+
+       # automagic dep on qtwebengine
+       if ! use webengine; then
+               sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' 
src/plugins/help/help.pro || die
+       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 '/\(^char qmlString\|states\.qml$\)/ i return;' 
tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp || die
+       sed -i -e 's/\<timeline\(items\|notes\|selection\)renderpass\>//' 
tests/auto/timeline/timeline.pro || die
+       sed -i -e '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="$(llvm-config 
--prefix)") \
+               $(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
+
+       # create a desktop file
+       make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 
'Development;IDE;Qt;' \
+               
'MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;'
+}

Reply via email to