From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5BECB139B2A for ; Sun, 13 Sep 2015 23:00:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3D7121C01B; Sun, 13 Sep 2015 23:00:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8967E21C01B for ; Sun, 13 Sep 2015 23:00:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB69934095A for ; Sun, 13 Sep 2015 23:00:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44B63187 for ; Sun, 13 Sep 2015 23:00:08 +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: <1442185183.d1a5193a26ca122ba787f39965dc79c5a15bbe60.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/qbs/Manifest dev-util/qbs/qbs-1.4.2.ebuild X-VCS-Directories: dev-util/qbs/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: d1a5193a26ca122ba787f39965dc79c5a15bbe60 X-VCS-Branch: master Date: Sun, 13 Sep 2015 23:00:08 +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: 7dd27595-bd83-4dcb-a1e7-4551b87901d4 X-Archives-Hash: 99f77a06de2589a392f2df258589e2b0 commit: d1a5193a26ca122ba787f39965dc79c5a15bbe60 Author: Davide Pesavento gentoo org> AuthorDate: Sun Sep 13 22:59:43 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Sep 13 22:59:43 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a5193a 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 dev-util/qbs/Manifest | 1 + dev-util/qbs/qbs-1.4.2.ebuild | 103 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index a56c60b..e5a35f1 100644 --- 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 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 +}