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 A7658139695 for ; Fri, 26 May 2017 22:57:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12C3521C081; Fri, 26 May 2017 22:57:04 +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 C9B3321C081 for ; Fri, 26 May 2017 22:57:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA43F3416BB for ; Fri, 26 May 2017 22:57:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8025A845 for ; Fri, 26 May 2017 22:57:01 +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: <1495839399.c0982cc1dd226f405fc35ce94d8694cd25b81d4a.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/qt-creator-4.3.0.ebuild dev-qt/qt-creator/qt-creator-4.3.0_beta1.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: c0982cc1dd226f405fc35ce94d8694cd25b81d4a X-VCS-Branch: master Date: Fri, 26 May 2017 22:57:01 +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: 54d98a10-2066-4547-b6b0-22013df7ed1e X-Archives-Hash: 5699ef121643c962d062b798680472e6 commit: c0982cc1dd226f405fc35ce94d8694cd25b81d4a Author: Davide Pesavento gentoo org> AuthorDate: Fri May 26 22:26:25 2017 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri May 26 22:56:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0982cc1 dev-qt/qt-creator: version bump Also fixed bug 616876. Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-qt/qt-creator/Manifest | 2 +- ...reator-4.3.0_beta1.ebuild => qt-creator-4.3.0.ebuild} | 16 ++++++---------- dev-qt/qt-creator/qt-creator-9999.ebuild | 16 ++++++---------- 3 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index 2fd3a6ce706..66d512a22fe 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,3 +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.2.0.tar.xz 16624096 SHA256 203e2bc6618590b5e5a7e17f1a05e65b255d742f0b8f0ba3246fb541dfdfbe80 SHA512 1801611d8db10041332d728a2af6b0c57b28b3ab9847a8875edb788d3b0fe6570103a408a7f52c989e40949743263d444e5db49d290860f2e7231f463fa86f7a WHIRLPOOL 841fb63bb6d25a640fb8db24412b05b93e9240db8c68de9555cc4baef50d6e08d13594f4e7cc675fda90359d8a4a4fbb8110f9cfd73315e1775a636f5f28a54d -DIST qt-creator-opensource-src-4.3.0-beta1.tar.xz 16339884 SHA256 9f5e28747281a2e75e5f875d37fad9422ee264357b2e752c450dad5b568229e2 SHA512 84cee2c29cbe664c7ce10a93ce769e80d9264a707f3e390e13ed0708cdccddd6e48524b5c7c5d2520d66590f5b41361eab00025f52747bc64b16686ed953379f WHIRLPOOL 10f24ef14e1b26405eb7329c1a6112098685d7f233f8b083af3a2de11738acf9242a12d5d0f1a2263dc0b005634c026dc96fe74371a2449b9d249c1ebf94442e +DIST qt-creator-opensource-src-4.3.0.tar.xz 17113068 SHA256 e99eaaf4098d575578424f57936bc5ad678499824523666c32d85c71fc8471d8 SHA512 462d2494d54c5b528ed187a43365a296c08ad2b104ada451a91d381f070472433ef91856f80a4d94091919296c95820e5d546800fc26a43a9709a6329fba02bb WHIRLPOOL ef3b4568bc19aa4c7eb4f1555d6cc24c719ecdde86f73225320b9d9a48a832a34c33dfbd5fb258fb33b733a8906dfc8afd368865aa537e996226fbefaf807782 diff --git a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.0.ebuild similarity index 87% rename from dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild rename to dev-qt/qt-creator/qt-creator-4.3.0.ebuild index 7cfd8374e2d..205855f3c41 100644 --- a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.3.0.ebuild @@ -4,7 +4,7 @@ EAPI=6 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW" -inherit eutils l10n llvm qmake-utils toolchain-funcs virtualx xdg +inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" HOMEPAGE="http://doc.qt.io/qtcreator/" @@ -56,7 +56,7 @@ CDEPEND=" >=dev-qt/qtxml-${QT_PV} clangcodemodel? ( >=sys-devel/clang-3.9:= ) designer? ( >=dev-qt/designer-${QT_PV} ) - qbs? ( >=dev-util/qbs-1.7.0 ) + qbs? ( >=dev-util/qbs-1.8.0 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] ) " @@ -75,7 +75,7 @@ RDEPEND="${CDEPEND} autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) clangstaticanalyzer? ( >=sys-devel/clang-3.9:* ) - cmake? ( dev-util/cmake ) + cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) @@ -133,10 +133,10 @@ src_prepare() { fi # disable broken or unreliable tests - sed -i -e '/SUBDIRS/ s/\//' tests/auto/debugger/debugger.pro || die + sed -i -e '/sdktool/ d' tests/auto/auto.pro || die + sed -i -e '/dumpers\.pro/ d' tests/auto/debugger/debugger.pro || die sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die - sed -i -e '/\(^char qmlString\|states\.qml$\)/ i return;' tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp || die - sed -i -e 's/\//' tests/auto/timeline/timeline.pro || die + sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die sed -i -e 's/\//' tests/auto/valgrind/valgrind.pro || die # fix path to some clang headers @@ -178,8 +178,4 @@ src_install() { doins share/doc/qtcreator/qtcreator{,-dev}.qch docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch fi - - # 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 7cfd8374e2d..205855f3c41 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 llvm qmake-utils toolchain-funcs virtualx xdg +inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" HOMEPAGE="http://doc.qt.io/qtcreator/" @@ -56,7 +56,7 @@ CDEPEND=" >=dev-qt/qtxml-${QT_PV} clangcodemodel? ( >=sys-devel/clang-3.9:= ) designer? ( >=dev-qt/designer-${QT_PV} ) - qbs? ( >=dev-util/qbs-1.7.0 ) + qbs? ( >=dev-util/qbs-1.8.0 ) systemd? ( sys-apps/systemd:= ) webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] ) " @@ -75,7 +75,7 @@ RDEPEND="${CDEPEND} autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) clangstaticanalyzer? ( >=sys-devel/clang-3.9:* ) - cmake? ( dev-util/cmake ) + cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) @@ -133,10 +133,10 @@ src_prepare() { fi # disable broken or unreliable tests - sed -i -e '/SUBDIRS/ s/\//' tests/auto/debugger/debugger.pro || die + sed -i -e '/sdktool/ d' tests/auto/auto.pro || die + sed -i -e '/dumpers\.pro/ d' tests/auto/debugger/debugger.pro || die sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die - sed -i -e '/\(^char qmlString\|states\.qml$\)/ i return;' tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp || die - sed -i -e 's/\//' tests/auto/timeline/timeline.pro || die + sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die sed -i -e 's/\//' tests/auto/valgrind/valgrind.pro || die # fix path to some clang headers @@ -178,8 +178,4 @@ src_install() { doins share/doc/qtcreator/qtcreator{,-dev}.qch docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch fi - - # 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;' }