summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2014-11-03 02:59:59 +0000
committerDavide Pesavento <pesa@gentoo.org>2014-11-03 02:59:59 +0000
commit968a04e292e55ed329f16896614c0c0fb4fc43ac (patch)
tree5cedf7a21115ea257d5ecb5683c60dc039334071 /dev-util
parentversion bump, bug 528018, proxy for Jason Zaman (diff)
downloadhistorical-968a04e292e55ed329f16896614c0c0fb4fc43ac.tar.gz
historical-968a04e292e55ed329f16896614c0c0fb4fc43ac.tar.bz2
historical-968a04e292e55ed329f16896614c0c0fb4fc43ac.zip
Disable tests that require nodejs (bug 527652).
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xDADED6B2671CB57D!
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/qbs/ChangeLog5
-rw-r--r--dev-util/qbs/Manifest32
-rw-r--r--dev-util/qbs/qbs-1.3.2.ebuild7
3 files changed, 26 insertions, 18 deletions
diff --git a/dev-util/qbs/ChangeLog b/dev-util/qbs/ChangeLog
index de3479dff426..7c9a1d96ffe8 100644
--- a/dev-util/qbs/ChangeLog
+++ b/dev-util/qbs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/qbs
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.9 2014/10/24 21:42:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.10 2014/11/03 02:59:50 pesa Exp $
+
+ 03 Nov 2014; Davide Pesavento <pesa@gentoo.org> qbs-1.3.2.ebuild:
+ Disable tests that require nodejs (bug 527652).
24 Oct 2014; Davide Pesavento <pesa@gentoo.org> qbs-1.3.2.ebuild:
Manually setup a toolchain profile for tests rather than using autodetection,
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index edf37984f971..5ff8bb12400c 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -2,25 +2,25 @@
Hash: SHA256
DIST qbs-1.3.2.src.tar.gz 710058 SHA256 03ce02bc1e5d6985e79318a7e49b95052166de5fe464c9149ce2828368292a9f SHA512 689507d4caa951b29e1f06cd7f0bae14d483b00e21d82b53fb9410b7c50f8b0d1bfb71d102dc4bcb733f91b7e6e817d128f1c56fd85caec54c797cd7cbc5a05a WHIRLPOOL 2f4e72a80da930d7ad71b10a385476d367ab419165e6821bbedd097069359e83935a1ec677b857e601991a04654599497aa52c311351cd8ea420dbe3afe66242
-EBUILD qbs-1.3.2.ebuild 2166 SHA256 ae9aa3c4e8ea0597d88ddf3715d796e41406de068d16e44f5672aa3622cac7c7 SHA512 add5500fe7bdba07d60fbdc7dd4607e59b89eb2aef7ed4bf963dc9cad359037a496f0e6626f08444b93547dcd9e0c637c3eca8be52ad55eadc12a04ea6bc6322 WHIRLPOOL b8ded9fbf294eb82c640e89e54ca756bab5fec7a22d0cb007299dbc09b33cfaf00851bfcc53e6a88cb668549c3768f1a28735c654b0271beb3ceeb07a0522c15
-MISC ChangeLog 1559 SHA256 6c678b6f9ddbee86e8cce2828187fff27770fac3395d51868f788457d16421f3 SHA512 250fe7f6e4db5d393a44fea4632ca17c00c13943bd0dcb09bfa46f5286c83505aca95d48f686f677d8250d9806fc056627e1460bed27cdb3393b31219c453d4b WHIRLPOOL 98b9e044719a8e9f5e2adbefbb1e74d47ea8ab6ae5c41115f7d6da6dd12ba9cb1ba06e30896ca817d86b0d5069d2525a46013514bedf6a5fa2a0d3205da1a0a9
+EBUILD qbs-1.3.2.ebuild 2322 SHA256 d82276a25d3e90ece22b15f5ea985fead015f762ef32f6d0d0699030e028783e SHA512 4646117e42daf353c1a05e00e2c50b29a6c9bac97d26d3a9b8f601eb9027aacfdd7c7f7d8514f078f6ba88f102a93595f3a451352ad19be46c8906add70856ce WHIRLPOOL d9162acb5cd991213473dcd87dda753e647d2430222d08d023dad1858704deab540808569b861ed9172ec131846dd2fd0c0f5ac0d26a628ac4e91627df647f03
+MISC ChangeLog 1679 SHA256 2e1295208059f8b1b47e5ef853c0e5a450a8f8d7c376ddf581dd91e5b5df5650 SHA512 033f4da74243113dae896d3bc26977ce94b08eca3badbfd77686338246f409ee5beaa1b82d7ad3de84b2fe26023a5b8944ed581156def275d2b959fd7ad892f1 WHIRLPOOL c58f0799c54a555fa967ed53d204b3153cd6bb7fa44869a87da4bca80395465d387f34df197f68b6a508e6636e02be64c945a07317f8ad1fcadd3c41c452d914
MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCABmBQJUSse+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUVu+vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9NzsP/i0Jhq5Z7rHtzfsLKqN6lDAX
-DZOKla3xU/vNkma1Oh5VDIuMy/ufAirlRd53g5ECqDwHOJ7/GHhFE5plXBRwjZEu
-cfyjUn4JRVkKEMV/43TLW04omJ44MH3IdQmRtx6Vo55PHXjFh6if4/G/Hj36LoOV
-oQ9ZVzpuY2qGOA72UxwDiBe2LPVkz6l93M3o+6ZOWAfcFciHBQ9oWtHuTTpiR+mJ
-rjJTLQoEnnv/r0+4zrpsGmR/Qj+6Ewr44tezybVkCs4KjJ8jxnFjTJDvQysQi2dB
-Im9ds5BZxp1HHEQzh03kDWIOlnycCWWpdDRkgMvTg4zZNwZRFtoEDb1A1qA99Mvz
-xpz/GK4joyxyheXkiCLiGULjQ3B93LkOR3Mz4zI+dN6ctpQ/dQZrvkSpTGYZF3IZ
-GZw0jd+VjOxJok8WzCIyhmOPc8RakPxigbv9D1Q7wkc9UK6LeEjPD/0yb/b6COu/
-6/r/ZIjMmPVJ6KiayEP3GV/bgSM/NxCawnsvzLQYxWWWXzqRS7TR49JlBMTsCUWm
-4k2lFm5np+mYGjOYm+PxW4XuX4+HNPTVi/94KLOfHL+rF+5okyouv8xd4QlYi13f
-Nfp1HEpEsEx0mfmom/3ohnJoNaoEjSw6bMGMSaOEMXTfWjJj4q5iIk+NLNlqEzRm
-DtUOVxrwRRU4rFtX2q6I
-=344j
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV99YwQAJe/n4vNXnm6eF7fCaDn/P1N
+i55M11OdsUkel5yCcQEpFa+Chlrt602FsP+9NhPbj8cI9Bb1T4q/mCS5+0FayD6R
+ypxgW3oghlt3GdQVn/wAKRK54OKd9Jo6w4K9qU+pb22vGWign25Gb2HdA1vg+DtO
+KBh+WKFwcji+ZQCyZoYALbJEXpEPgWrSawTzSqN3eCXCRgC10gMYUiniBCR1IyPe
+X1zXXRnHa4BYm0i0uNc5XvxSPlFehxj5JxrFLnNRY8hX5fN/nPs8FVt+jxCW0z1z
+IFumlHIiTAaGS0jypiuOKvjxJ4v2xPepatDFTKApKSgT/vWQpnCQ9emTEhU71yQi
+zjvNM1bD9kQXxyy9tmJeBE68JwPHdeoQBRYQEFgQEovz/iGOqk7+9ZoI5Sx1m38h
+oroVEmn0E3vfpncvlwSKfFBQbdyhbuzjUxHjqhTVOErawOtX6hdPA68zl0JqyJYq
+SUzSxcGUbN3dSNmES9CIQHItXpxlXHL4WqeqfWwZCgm8GWuv6MwGif9dUtVG0YJi
+AzX1nvMpW6Yuj81AJHWFa8yNHon9P3yojQKwGe3KbwO6IQtIT77bjlzAPICQcFkV
+prBlW2mcMnPMH0m/zsbC6BEs+xHP13gARZm8N/+uYGm15jdiWcbeXRf54G4gcc47
+Yt+6wBTW/FgOjDGdyFSP
+=vY5O
-----END PGP SIGNATURE-----
diff --git a/dev-util/qbs/qbs-1.3.2.ebuild b/dev-util/qbs/qbs-1.3.2.ebuild
index f6d27df5da61..66e46ff86bf4 100644
--- a/dev-util/qbs/qbs-1.3.2.ebuild
+++ b/dev-util/qbs/qbs-1.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.3.2.ebuild,v 1.3 2014/10/24 21:42:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.3.2.ebuild,v 1.4 2014/11/03 02:59:50 pesa Exp $
EAPI=5
@@ -43,9 +43,14 @@ DEPEND="${RDEPEND}
REQUIRED_USE="^^ ( qt4 qt5 )"
src_prepare() {
+ # fix plugins libdir
sed -i -e "/destdirPrefix/ s:/lib:/$(get_libdir):" \
src/plugins/plugins.pri || die
+ # disable tests that require nodejs (bug 527652)
+ sed -i -e 's/!haveNodeJs()/true/' \
+ tests/auto/blackbox/tst_blackbox.cpp || die
+
if ! use test; then
sed -i -e '/SUBDIRS = auto/d' \
tests/tests.pro || die