commit: 448c6f5cef800078b56fd4a32027436aefd74a59 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> AuthorDate: Fri Mar 16 22:52:45 2018 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Sat Mar 17 00:15:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448c6f5c
dev-qt/qt-creator: bump to 4.6.0_rc1 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-qt/qt-creator/Manifest | 2 +- ....0_beta1.ebuild => qt-creator-4.6.0_rc1.ebuild} | 22 +++----------------- dev-qt/qt-creator/qt-creator-9999.ebuild | 24 ++++------------------ 3 files changed, 8 insertions(+), 40 deletions(-) diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 93809d0a535..28a9dcbdec6 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,4 +1,4 @@ DIST qt-creator-opensource-src-4.4.1.tar.xz 20822304 BLAKE2B 23c05b5e86fcbc3387cd9e8a82fb97e3b4e20182b41e2b24de7801126b0d5bbd708ca842ddcd828536fb279b6d2e4954909b8c40bfe14e050baa109095889e6d SHA512 f0e836fd2106f909cb405f75457e0d4158ecdd134ec5cfa97b373e5818b5f715245ac8454a657801251302ef817c1de66580f2e45b12b3e23d3107ccf3985336 DIST qt-creator-opensource-src-4.5.0.tar.xz 21641628 BLAKE2B 83d8ef57b87278994451d34b69a17a7d6c872b014c82940593c83c53e4a693054bdcfa38c4706083ed2bc0386ae5fa8afcea4747d1dee67a2a9b1e0a3fa6aeed SHA512 9296ebef4a3d5ae40a9fa3a4039e77b8e407dfb52af3a88b4cc615a89e163d92de420d9db614bc689adc695879f0c2e1906e9a218e7a6b96c4b222d52c94912c DIST qt-creator-opensource-src-4.5.2.tar.xz 21745192 BLAKE2B 4860c6041542758647d27ae3aaac15dbbc72bbecbcf335e3bceab378c720979a3e89777762936a4b68eacec02a7b285dec08a19003ac3260de1e2e4ee12706c0 SHA512 cc3f20c109e810e8958495fd0d84461bc9ead7b4172600229969a6a331341f0b76069a71893f1ba279550293b131f6cca5b79c112d67f3aebb6244415489c223 -DIST qt-creator-opensource-src-4.6.0-beta1.tar.xz 23559992 BLAKE2B 20a89a2e833fd5f618cc8b7301530abe3cb2f54f687fe3f08a3881e3ffdd90f98cf32ccd7e7461bfb4b80547bd5cfbd732257626ea938a6459a69ba9a72f7958 SHA512 034735898b24884822ede430dd777066a5b93f38c383861d85268d0d65a140116f3a2d639b0c33862768127e3e0881a7b08ff710c5a210ccfa42c5e8a9fe1ff6 +DIST qt-creator-opensource-src-4.6.0-rc1.tar.xz 23389240 BLAKE2B 2fbfe5a6a3b09d439439846dbcbad87d1f5032a35c36fa713e8949d1c3f2c44cf1912fd465f9c97f29204803843cff4c4ecdf7083e8963f3512c0dbfa1594a1f SHA512 eb794935bdbe26362a8dc5a7e62dc8004e808d1485039739af06c92b6e98a6b9d4870f68e5912990acd9970bd8ec518aacd759ece60fe6f0eafc7cd1af981d7d diff --git a/dev-qt/qt-creator/qt-creator-4.6.0_beta1.ebuild b/dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild similarity index 91% rename from dev-qt/qt-creator/qt-creator-4.6.0_beta1.ebuild rename to dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild index 609adb4c9e7..502a2a9e1c8 100644 --- a/dev-qt/qt-creator/qt-creator-4.6.0_beta1.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.6.0_rc1.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/"; @@ -53,7 +53,7 @@ CDEPEND=" >=dev-qt/qtxml-${QT_PV} 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 diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 38641edea7d..f7561482786 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/"; @@ -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
