dev-util/qbs: version bump

PaX marking is no longer necessary. The problem was in the QML
engine JIT, which can now be turned off in qtdeclarative itself.

Package-Manager: portage-2.2.20.1

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index a56c60baac7f5fa93a09b6f5433ab0579e6ce861..e5a35f13592adcbc392fb2ea35bdc7ab4c6983a3 100644 (file)
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1 +1,2 @@
 DIST qbs-src-1.4.1.tar.gz 802383 SHA256 eea8e0c1b2ef71f295fa5f1798a04a9f0509a701094fec11a691a4d7ae0155a9 SHA512 8fd48d27a2599c617ba19494e2716451c38253c964c24fc9685b5e31e75073f2606fb554400af57eab6b2e4e69e04e479dc8cfdf771eeeaf1068e3293ba691b2 WHIRLPOOL f4236866683e378827faae9c30e9fdf35d061804ee69069280cb4da220dd83c1a740186920ec108d708fdb63d08a511364a658fcd8a25d893478e9b5f08e0b7a
+DIST qbs-src-1.4.2.tar.gz 821001 SHA256 b9d36118c3ae0f7d4df6bf7239a0a0163c0340b701d00191fa5f832cef341ce5 SHA512 dc4514f28843d159b695e4da2b94619da91656b57ba839fa62901cd3a48309ffd3a3b5203b7ae1c5f35cab515a6149017fd43093ae9395846b3e46b2f53b93ec WHIRLPOOL 0431823cc54dd7a372473e76d8269207cf439a5ba27d3c099df63a19d222067a41a62299415cae9c9798e5bf5ebf38c27dffa8f23135675a564f51047cecfc67

diff --git a/dev-util/qbs/qbs-1.4.2.ebuild b/dev-util/qbs/qbs-1.4.2.ebuild
new file mode 100644 (file)
index 0000000..b44324b
--- /dev/null
+++ b/dev-util/qbs/qbs-1.4.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Qt Build Suite"
+HOMEPAGE="http://wiki.qt.io/Qbs"
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+       dev-qt/qtcore:5
+       dev-qt/qtgui:5
+       dev-qt/qtscript:5
+       dev-qt/qtwidgets:5
+       dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+       doc? (
+               dev-qt/qdoc:5
+               dev-qt/qthelp:5
+       )
+       test? (
+               dev-qt/qtdeclarative:5
+               dev-qt/qttest:5
+       )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+       # disable tests that require nodejs (bug 527652)
+       sed -i -e 's/!haveNodeJs()/true/' \
+               tests/auto/blackbox/tst_blackbox.cpp || die
+
+       if ! use examples; then
+               sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+       fi
+
+       if use test; then
+               sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
+       else
+               sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
+       fi
+}
+
+src_configure() {
+       local myqmakeargs=(
+               qbs.pro # bug 523218
+               -recursive
+               CONFIG+=qbs_disable_rpath
+               CONFIG+=qbs_enable_project_file_updates
+               $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+               QBS_INSTALL_PREFIX="${EPREFIX}/usr"
+               QBS_LIBRARY_DIRNAME="$(get_libdir)"
+       )
+       eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+       einfo "Setting up test environment in ${T}"
+
+       export HOME=${T}
+       export LD_LIBRARY_PATH=${S}/$(get_libdir)
+
+       "${S}"/bin/qbs-setup-toolchains "${EROOT}usr/bin/gcc" gcc || die
+       "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
+
+       einfo "Running autotests"
+
+       # simply exporting LD_LIBRARY_PATH doesn't work
+       # we have to use a custom testrunner script
+       local testrunner=${S}/gentoo-testrunner
+       cat <<-EOF > "${testrunner}"
+       #!/bin/sh
+       export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
+       exec "\$@"
+       EOF
+       chmod +x "${testrunner}"
+
+       emake TESTRUNNER="'${testrunner}'" check
+}
+
+src_install() {
+       emake INSTALL_ROOT="${D}" install
+
+       # install documentation
+       if use doc; then
+               emake docs
+               dodoc -r doc/html
+               dodoc doc/qbs.qch
+               docompress -x /usr/share/doc/${PF}/qbs.qch
+       fi
+}