diff options
| -rw-r--r-- | dev-util/qbs/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/qbs/qbs-1.3.2.ebuild | 7 |
2 files changed, 10 insertions, 2 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/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 |