From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C423138334 for ; Sat, 15 Dec 2018 22:01:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE522E0AE7; Sat, 15 Dec 2018 22:01:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E13BE0AE7 for ; Sat, 15 Dec 2018 22:01:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31B57335C31 for ; Sat, 15 Dec 2018 22:01:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 687A744B for ; Sat, 15 Dec 2018 22:01: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: <1544911182.11e7c7786e432908b9d3a1936c9ee891a6a041a0.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.12.2.ebuild X-VCS-Directories: dev-util/qbs/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 11e7c7786e432908b9d3a1936c9ee891a6a041a0 X-VCS-Branch: master Date: Sat, 15 Dec 2018 22:01: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 960ceb8f-5b98-4b8a-a480-67294766be5f X-Archives-Hash: d89f5ccc7da547efb2324072279ae21c commit: 11e7c7786e432908b9d3a1936c9ee891a6a041a0 Author: Davide Pesavento gentoo org> AuthorDate: Sat Dec 15 21:59:42 2018 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Dec 15 21:59:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e7c778 dev-util/qbs: bump to 1.12.2 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Davide Pesavento gentoo.org> dev-util/qbs/Manifest | 1 + dev-util/qbs/qbs-1.12.2.ebuild | 114 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index a738f2f0031..47dc67e0f8a 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,2 +1,3 @@ DIST qbs-src-1.11.1.tar.gz 4299125 BLAKE2B a2b2670b47bb122ccc586fee0c61d941533dc2dbc5e59028a7ab765eb18fe4a71b85cbd7373f88231b9cd75178982a17dddab0ba965de84ca197c49b2c9eefdf SHA512 90833792cb29b7b886df491263b620d2933c398ad8b2f495d0e5ae6acdde3f816ecd25638ae2e74d3efbf517a762644f751b7c01633aed3369bd7bf85c033ff5 DIST qbs-src-1.12.0.tar.gz 4368992 BLAKE2B 5fce4052f349ed787a0948541fbe1397ed8dde5bb6191e6ba37718e4d803b30b1f7a4ba3abb00d0d10078b1cfddeedb45a4c5dc86d800b5a8b941abffb0a5804 SHA512 2d9f23231e3824d67f63f290e4d22bd3d56f161c32b9002e23e615cb2793678eadde033d6e2b744e89ad69f4b6104c69e80095881601d498d9587d3db06c2103 +DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13 SHA512 eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147 diff --git a/dev-util/qbs/qbs-1.12.2.ebuild b/dev-util/qbs/qbs-1.12.2.ebuild new file mode 100644 index 00000000000..73267519de4 --- /dev/null +++ b/dev-util/qbs/qbs-1.12.2.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils + +MY_P=${PN}-src-${PV} + +DESCRIPTION="Modern build tool for software projects" +HOMEPAGE="https://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" + +# see bug 581874 for the qttest dep in RDEPEND +RDEPEND=" + dev-qt/qtcore:5= + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtscript:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + test? ( dev-qt/qttest:5 ) +" +DEPEND="${RDEPEND} + doc? ( + dev-qt/qdoc:5 + dev-qt/qthelp:5 + ) + test? ( dev-qt/qtdeclarative:5 ) +" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + default + + if ! use examples; then + sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die + fi + + # the qbsres target uses the newly built qbs binary, so we have to tell it where to find its libraries + sed -i -e '/qbsres\.commands =/ a\LD_LIBRARY_PATH=$$shell_quote($$shell_path($$QBS_LIBRARY_DIRNAME)) \\' \ + static-res.pro || die + + echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro + + # skip several tests that fail and/or have additional deps + sed -i \ + -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \ + -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \ + -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \ + -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \ + tests/auto/blackbox/tst_blackbox.cpp || die + + # requires jdk, fails, bug 585398 + sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die +} + +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) + export QBS_AUTOTEST_PROFILE=autotests + + "${S}"/bin/qbs-setup-toolchains --detect || die + "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die + + einfo "Running autotests" + + # simply exporting LD_LIBRARY_PATH doesn't work + # we have to use a custom testrunner script + local testrunner=${WORKDIR}/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 + + dodoc -r changelogs + + # install documentation + if use doc; then + emake docs + dodoc -r doc/qbs/html + dodoc doc/qbs.qch + docompress -x /usr/share/doc/${PF}/qbs.qch + fi +}