commit: 678983f0b0ea805d2f868c1edf0461cd2211f64a Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> AuthorDate: Sat Apr 29 19:44:41 2017 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Sat Apr 29 19:45:03 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=678983f0
dev-qt/qt-creator: sync live ebuild Package-Manager: Portage-2.3.5, Repoman-2.3.2 dev-qt/qt-creator/qt-creator-9999.ebuild | 46 +++++++++++++++++--------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index bbdb5126434..7cfd8374e2d 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW" -inherit eutils l10n qmake-utils toolchain-funcs virtualx xdg +inherit eutils l10n llvm qmake-utils toolchain-funcs virtualx xdg DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" HOMEPAGE="http://doc.qt.io/qtcreator/"; @@ -29,17 +29,17 @@ fi # TODO: unbundle sqlite QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar - clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor - ios mercurial modeling:modeleditor nim perforce python:pythoneditor qbs:qbsprojectmanager qnx - scxml:scxmleditor subversion valgrind winrt) + '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=" +CDEPEND=" =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] @@ -54,13 +54,13 @@ RDEPEND=" >=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} +DEPEND="${CDEPEND} >=dev-qt/linguist-tools-${QT_PV} virtual/pkgconfig doc? ( >=dev-qt/qdoc-${QT_PV} ) @@ -70,16 +70,11 @@ DEPEND="${RDEPEND} >=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=" +RDEPEND="${CDEPEND} + sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) - clangstaticanalyzer? ( >=sys-devel/clang-3.9 ) + clangstaticanalyzer? ( >=sys-devel/clang-3.9:* ) cmake? ( dev-util/cmake ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) @@ -87,13 +82,18 @@ PDEPEND=" subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) " +# 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 src_unpack() { if tc-is-gcc; then if [[ $(gcc-major-version) -lt 4 ]] || \ - [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; then - eerror "GCC version 4.8 or later is required to build Qt Creator ${PV}" - die "GCC >= 4.8 required" + [[ $(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 @@ -139,9 +139,11 @@ src_prepare() { 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 path to some clang headers + sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die + # fix translations - sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \ - share/qtcreator/translations/translations.pro || die + sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die # remove bundled qbs rm -rf src/shared/qbs || die @@ -150,7 +152,7 @@ src_prepare() { src_configure() { eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ - $(use clangcodemodel && echo LLVM_INSTALL_DIR="$(llvm-config --prefix)") \ + $(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ CONFIG+=qbs_disable_rpath \ CONFIG+=qbs_enable_project_file_updates \
