diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-18 04:54:42 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-18 04:54:42 +0000 |
commit | 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (patch) | |
tree | c968fff3108e2b4d88e4e564a56bfd066f170573 /dev-qt/qt-creator/qt-creator-9999.ebuild | |
parent | 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 (diff) |
gentoo resync : 18.03.2018
Diffstat (limited to 'dev-qt/qt-creator/qt-creator-9999.ebuild')
-rw-r--r-- | dev-qt/qt-creator/qt-creator-9999.ebuild | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 38641edea7de..f607e30d3905 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 llvm qmake-utils toolchain-funcs virtualx xdg +inherit llvm qmake-utils virtualx xdg DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" HOMEPAGE="https://doc.qt.io/qtcreator/" @@ -33,7 +33,7 @@ QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectman IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}" # minimum Qt version required -QT_PV="5.6.2:5" +QT_PV="5.9.0:5" CDEPEND=" =dev-libs/botan-1.10*[-bindist,threads] @@ -51,9 +51,9 @@ CDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - clangcodemodel? ( >=sys-devel/clang-3.9:= ) + clangcodemodel? ( >=sys-devel/clang-5:= ) designer? ( >=dev-qt/designer-${QT_PV} ) - qbs? ( >=dev-util/qbs-1.9.1 ) + qbs? ( >=dev-util/qbs-1.10.1 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] ) " @@ -71,7 +71,7 @@ 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-5:* ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) @@ -90,22 +90,6 @@ pkg_setup() { use clangcodemodel && llvm_pkg_setup } -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 @@ -120,7 +104,7 @@ src_prepare() { # avoid building unused support libraries if ! use clangcodemodel; then - sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die + sed -i -e '/clangsupport/d' src/libs/libs.pro || die fi if ! use glsl; then sed -i -e '/glsl/d' src/libs/libs.pro || die |