| 1 |
commit: 7e6473d259f4c1cd77003d2f74b6e6af94154ef2 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 9 14:04:49 2016 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 9 14:06:03 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e6473d2 |
| 7 |
|
| 8 |
dev-qt/qt-creator: version bump |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
dev-qt/qt-creator/Manifest | 2 +- |
| 13 |
.../{qt-creator-4.0.2.ebuild => qt-creator-4.0.3.ebuild} | 15 +++++++++------ |
| 14 |
2 files changed, 10 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest |
| 17 |
index 0dabfc8..44ab5e3 100644 |
| 18 |
--- a/dev-qt/qt-creator/Manifest |
| 19 |
+++ b/dev-qt/qt-creator/Manifest |
| 20 |
@@ -1,2 +1,2 @@ |
| 21 |
DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65 |
| 22 |
-DIST qt-creator-opensource-src-4.0.2.tar.gz 21651190 SHA256 c2fce74fef0cc3a8f5c03d7ed1e95ccfe508d855ee750647896876824fcaee10 SHA512 117b3f90a44b509fec47b1c623db76b83f1ead669b3bba5a591d4be09737f677be7a5ff5d4882087ac3118471f664ae012266857c4cdade74dcccf25730044c5 WHIRLPOOL b50b529da52d465fd7c798aff7183bac49f074184c0e29ce383a3f4dd64b2f825f40d9513e086040e22450fcf7dd254b667c9566ad37d6901ee65837aa007e1a |
| 23 |
+DIST qt-creator-opensource-src-4.0.3.tar.gz 21972901 SHA256 a213a9b66e7e0eb906036a1587256fc0f7bac33912d9ae5e6117459231f56449 SHA512 7b06b9d2cb050008cbbceeb2f18ad2264a2366db9ad37474b63d0a6d30a3bde86ecb770678beb88af4d5be7550e947c689d23956e2062796cbf9476006c0528a WHIRLPOOL 7d515a038dec69980305a43545d952a1083f00add756e82cd0b568bc2c31c8eb81667822295b352cad2c54c3a447a31e9c8203db25d945023fc70ff2f0d01cd5 |
| 24 |
|
| 25 |
diff --git a/dev-qt/qt-creator/qt-creator-4.0.2.ebuild b/dev-qt/qt-creator/qt-creator-4.0.3.ebuild |
| 26 |
similarity index 92% |
| 27 |
rename from dev-qt/qt-creator/qt-creator-4.0.2.ebuild |
| 28 |
rename to dev-qt/qt-creator/qt-creator-4.0.3.ebuild |
| 29 |
index d743d86..db3aa79 100644 |
| 30 |
--- a/dev-qt/qt-creator/qt-creator-4.0.2.ebuild |
| 31 |
+++ b/dev-qt/qt-creator/qt-creator-4.0.3.ebuild |
| 32 |
@@ -5,7 +5,7 @@ |
| 33 |
EAPI=6 |
| 34 |
PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW" |
| 35 |
|
| 36 |
-inherit eutils l10n qmake-utils virtualx |
| 37 |
+inherit eutils l10n qmake-utils toolchain-funcs virtualx |
| 38 |
|
| 39 |
DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" |
| 40 |
HOMEPAGE="http://doc.qt.io/qtcreator/" |
| 41 |
@@ -60,7 +60,7 @@ RDEPEND=" |
| 42 |
>=dev-qt/qtxml-${QT_PV} |
| 43 |
>=sys-devel/gdb-7.5[client,python] |
| 44 |
clangcodemodel? ( >=sys-devel/clang-3.6.2:= ) |
| 45 |
- qbs? ( >=dev-util/qbs-1.5.1 ) |
| 46 |
+ qbs? ( >=dev-util/qbs-1.5.2 ) |
| 47 |
systemd? ( sys-apps/systemd:= ) |
| 48 |
webengine? ( >=dev-qt/qtwebengine-5.6.0:5 ) |
| 49 |
webkit? ( >=dev-qt/qtwebkit-${QT_PV} ) |
| 50 |
@@ -71,8 +71,8 @@ DEPEND="${RDEPEND} |
| 51 |
doc? ( >=dev-qt/qdoc-${QT_PV} ) |
| 52 |
test? ( >=dev-qt/qttest-${QT_PV} ) |
| 53 |
" |
| 54 |
+# qt translations must be installed for qt-creator translations to work |
| 55 |
for x in ${PLOCALES}; do |
| 56 |
- # qt translations must be installed for qt-creator translations to work |
| 57 |
RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )" |
| 58 |
done |
| 59 |
unset x |
| 60 |
@@ -90,9 +90,12 @@ PDEPEND=" |
| 61 |
" |
| 62 |
|
| 63 |
src_unpack() { |
| 64 |
- if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then |
| 65 |
- eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}" |
| 66 |
- die "GCC >= 4.7 required" |
| 67 |
+ if tc-is-gcc; then |
| 68 |
+ if [[ $(gcc-major-version) -lt 4 ]] || \ |
| 69 |
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then |
| 70 |
+ eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}" |
| 71 |
+ die "GCC >= 4.7 required" |
| 72 |
+ fi |
| 73 |
fi |
| 74 |
|
| 75 |
if [[ ${PV} == *9999 ]]; then |
Archives