From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 252601395E2 for ; Mon, 21 Nov 2016 19:38:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9232AE0B74; Mon, 21 Nov 2016 19:37:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6B15FE0B74 for ; Mon, 21 Nov 2016 19:37:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CC77341024 for ; Mon, 21 Nov 2016 19:37:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AF4C4A5 for ; Mon, 21 Nov 2016 19:37:54 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1479757068.c2ee671811b725d5d3a87d81a766093474f25e77.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qt-creator/Manifest dev-qt/qt-creator/metadata.xml dev-qt/qt-creator/qt-creator-4.1.0.ebuild dev-qt/qt-creator/qt-creator-9999.ebuild X-VCS-Directories: dev-qt/qt-creator/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: c2ee671811b725d5d3a87d81a766093474f25e77 X-VCS-Branch: master Date: Mon, 21 Nov 2016 19:37:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f47a4e87-6c09-4f6c-b7db-0dda4f9a9aaf X-Archives-Hash: 0dce1143463868e8e2fa6616cd980128 commit: c2ee671811b725d5d3a87d81a766093474f25e77 Author: Davide Pesavento gentoo org> AuthorDate: Mon Nov 21 19:37:09 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Nov 21 19:37:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ee6718 dev-qt/qt-creator: version bump Gentoo-Bug: 592148 Gentoo-Bug: 596178 Package-Manager: portage-2.3.2 dev-qt/qt-creator/Manifest | 1 + dev-qt/qt-creator/metadata.xml | 2 ++ ...creator-9999.ebuild => qt-creator-4.1.0.ebuild} | 33 ++++++++++++++-------- dev-qt/qt-creator/qt-creator-9999.ebuild | 33 ++++++++++++++-------- 4 files changed, 47 insertions(+), 22 deletions(-) diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 44ab5e3..29e324c 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.0.3.tar.gz 21972901 SHA256 a213a9b66e7e0eb906036a1587256fc0f7bac33912d9ae5e6117459231f56449 SHA512 7b06b9d2cb050008cbbceeb2f18ad2264a2366db9ad37474b63d0a6d30a3bde86ecb770678beb88af4d5be7550e947c689d23956e2062796cbf9476006c0528a WHIRLPOOL 7d515a038dec69980305a43545d952a1083f00add756e82cd0b568bc2c31c8eb81667822295b352cad2c54c3a447a31e9c8203db25d945023fc70ff2f0d01cd5 +DIST qt-creator-opensource-src-4.1.0.tar.xz 16291164 SHA256 d00f84539203c8456a6ebca149228cd22d1bae7f41c95c88f6fc63a02aeed8c3 SHA512 73d1d73d80faeb8ce9052f23720bbc312214256d3b9867447058ce878dca85457ba6f9c69281b95f622f8bc3d9c1739641960c48c6eebba3c48806126e6b57cf WHIRLPOOL 84521639a1054d294144f181175ed696c86d37e1a67373f5e6dbf147a99b2ff9d5216630bce2c91178c066f42778b658e7bd21fd5c9e1b5143183d6986f6c7fc diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml index 7356ce9..0add88d 100644 --- a/dev-qt/qt-creator/metadata.xml +++ b/dev-qt/qt-creator/metadata.xml @@ -22,6 +22,8 @@ Enable GLSL source code editor Build plugin for Apple iOS devices Add support for dev-vcs/mercurial version control system + Enable graphical model editor plugin + Enable Nim source code editor Add support for Perforce version control system (requires manual installation of Perforce client) Enable Python source code editor Enable QBS project manager plugin diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-4.1.0.ebuild similarity index 83% copy from dev-qt/qt-creator/qt-creator-9999.ebuild copy to dev-qt/qt-creator/qt-creator-4.1.0.ebuild index 0a6f46b..f2e2ab2 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.1.0.ebuild @@ -5,7 +5,7 @@ EAPI=6 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW" -inherit eutils l10n qmake-utils toolchain-funcs virtualx +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/" @@ -22,18 +22,17 @@ 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.gz" + 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 -# allow disabling modeleditor plugin -# it should be possible to skip building some internal libs (clangbackendipc, glsl, modelinglib, sqlite) when the plugins that use them are disabled QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor - ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt) + ios mercurial modeling:modeleditor nim perforce python:pythoneditor qbs:qbsprojectmanager qnx + subversion valgrind winrt) IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}" REQUIRED_USE="?? ( webengine webkit )" @@ -58,9 +57,9 @@ RDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - >=sys-devel/gdb-7.5[client,python] - clangcodemodel? ( >=sys-devel/clang-3.6.2:= ) - qbs? ( >=dev-util/qbs-1.5.2 ) + sys-devel/gdb[client,python] + clangcodemodel? ( >=sys-devel/clang-3.8.0:= ) + qbs? ( >=dev-util/qbs-1.6.0 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) webkit? ( >=dev-qt/qtwebkit-${QT_PV} ) @@ -80,7 +79,7 @@ unset x PDEPEND=" autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) - clangstaticanalyzer? ( sys-devel/clang ) + clangstaticanalyzer? ( >=sys-devel/clang-3.8.0 ) cmake? ( dev-util/cmake ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) @@ -117,6 +116,17 @@ src_prepare() { 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 qtwebkit (bug 538236) if ! use webkit; then sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \ @@ -172,6 +182,7 @@ src_install() { docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch fi - # install desktop file - make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE' + # 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;' } diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 0a6f46b..f2e2ab2 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW" -inherit eutils l10n qmake-utils toolchain-funcs virtualx +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/" @@ -22,18 +22,17 @@ 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.gz" + 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 -# allow disabling modeleditor plugin -# it should be possible to skip building some internal libs (clangbackendipc, glsl, modelinglib, sqlite) when the plugins that use them are disabled QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor - ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt) + ios mercurial modeling:modeleditor nim perforce python:pythoneditor qbs:qbsprojectmanager qnx + subversion valgrind winrt) IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}" REQUIRED_USE="?? ( webengine webkit )" @@ -58,9 +57,9 @@ RDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - >=sys-devel/gdb-7.5[client,python] - clangcodemodel? ( >=sys-devel/clang-3.6.2:= ) - qbs? ( >=dev-util/qbs-1.5.2 ) + sys-devel/gdb[client,python] + clangcodemodel? ( >=sys-devel/clang-3.8.0:= ) + qbs? ( >=dev-util/qbs-1.6.0 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) webkit? ( >=dev-qt/qtwebkit-${QT_PV} ) @@ -80,7 +79,7 @@ unset x PDEPEND=" autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) - clangstaticanalyzer? ( sys-devel/clang ) + clangstaticanalyzer? ( >=sys-devel/clang-3.8.0 ) cmake? ( dev-util/cmake ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) @@ -117,6 +116,17 @@ src_prepare() { 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 qtwebkit (bug 538236) if ! use webkit; then sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \ @@ -172,6 +182,7 @@ src_install() { docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch fi - # install desktop file - make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE' + # 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;' }