commit: cdcd3965d96eee989ec92090d52ae6d1efa285fd Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> AuthorDate: Sat Oct 26 20:13:17 2019 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Sat Oct 26 20:13:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdcd3965
dev-qt/qt-creator: add 4.10.1 Closes: https://bugs.gentoo.org/695274 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org> dev-qt/qt-creator/Manifest | 1 + ...-creator-9999.ebuild => qt-creator-4.10.1.ebuild} | 20 ++++++++++---------- dev-qt/qt-creator/qt-creator-9999.ebuild | 9 +++++---- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index fb6e343869e..ef507481f10 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,2 +1,3 @@ DIST qt-creator-opensource-src-4.10.0-rc1.tar.xz 26226544 BLAKE2B 5fc66e73d93b2d358c4f3c23e80029b805b1aa841b71fc35077b089bf51d705b6f7f352bd36f2dd573aef0a95efea3573e08af8eea31aeb0f43d33172935cdc1 SHA512 e5f7fb5b67fd803fbcb2a96b26d96e53e5d43fd3733c4867ce9e2f4764220d1772fa788424d917acdc0c78c580ce8ee774e561c6bf5fd54feac320073d5fb263 +DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450 diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild similarity index 90% copy from dev-qt/qt-creator/qt-creator-9999.ebuild copy to dev-qt/qt-creator/qt-creator-4.10.1.ebuild index 6d0e795605f..f161df651cd 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 +LLVM_MAX_SLOT=8 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW" inherit llvm qmake-utils virtualx xdg @@ -25,15 +26,14 @@ fi # TODO: unbundle sqlite and KSyntaxHighlighting -QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt +QTC_PLUGINS=(android +autotest baremetal bazaar beautifier '+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase - cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios - lsp:languageclient mercurial modeling:modeleditor nim perforce perfprofiler python:pythoneditor - qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal - silversearcher subversion valgrind winrt) + cmake:cmakeprojectmanager cppcheck cvs +designer git glsl:glsleditor +help ios lsp:languageclient + mercurial modeling:modeleditor nim perforce perfprofiler python:pythoneditor qbs:qbsprojectmanager + +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion + valgrind winrt) IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}" REQUIRED_USE=" - boot2qt? ( remotelinux ) clang? ( test? ( qbs ) ) qnx? ( remotelinux ) " @@ -55,7 +55,7 @@ CDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - clang? ( >=sys-devel/clang-8:= ) + clang? ( sys-devel/clang:8= ) designer? ( >=dev-qt/designer-${QT_PV} ) help? ( >=dev-qt/qthelp-${QT_PV} @@ -80,7 +80,7 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} sys-devel/gdb[client,python] bazaar? ( dev-vcs/bzr ) - cmake? ( dev-util/cmake[server(+)] ) + cmake? ( dev-util/cmake ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) @@ -129,7 +129,7 @@ src_prepare() { fi if ! use perfprofiler; then rm -rf src/tools/perfparser || die - if ! use ctfvisualizer && ! use qmlprofiler; then + if ! use qmlprofiler; then sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die fi fi @@ -173,7 +173,7 @@ src_prepare() { src_configure() { eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ - $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \ + $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ CONFIG+=qbs_disable_rpath \ CONFIG+=qbs_enable_project_file_updates \ diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 6d0e795605f..2b7b3ee74af 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 +LLVM_MAX_SLOT=8 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW" inherit llvm qmake-utils virtualx xdg @@ -23,7 +24,7 @@ else S=${WORKDIR}/${MY_P} fi -# TODO: unbundle sqlite and KSyntaxHighlighting +# TODO: unbundle sqlite, yaml-cpp, and KSyntaxHighlighting QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase @@ -55,7 +56,7 @@ CDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - clang? ( >=sys-devel/clang-8:= ) + clang? ( sys-devel/clang:8= ) designer? ( >=dev-qt/designer-${QT_PV} ) help? ( >=dev-qt/qthelp-${QT_PV} @@ -80,7 +81,7 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} sys-devel/gdb[client,python] bazaar? ( dev-vcs/bzr ) - cmake? ( dev-util/cmake[server(+)] ) + cmake? ( dev-util/cmake ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) @@ -173,7 +174,7 @@ src_prepare() { src_configure() { eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ - $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \ + $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ CONFIG+=qbs_disable_rpath \ CONFIG+=qbs_enable_project_file_updates \
