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 DCC6E138330 for ; Sun, 11 Sep 2016 11:44:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F451E0B1B; Sun, 11 Sep 2016 11:44:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D5374E0B1B for ; Sun, 11 Sep 2016 11:44:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF540340B30 for ; Sun, 11 Sep 2016 11:44:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B88D247C for ; Sun, 11 Sep 2016 11:44:02 +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: <1473594235.62df0481ab364d6f7ad0e2a5731851c380458a08.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.6.0.ebuild X-VCS-Directories: dev-util/qbs/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 62df0481ab364d6f7ad0e2a5731851c380458a08 X-VCS-Branch: master Date: Sun, 11 Sep 2016 11:44:02 +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: 96366359-53ba-41e6-b8cc-e70ca095998d X-Archives-Hash: a7bca797f4df178aeaed9356db48aa0c commit: 62df0481ab364d6f7ad0e2a5731851c380458a08 Author: Davide Pesavento gentoo org> AuthorDate: Sun Sep 11 11:37:57 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Sep 11 11:43:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62df0481 dev-util/qbs: version bump Package-Manager: portage-2.3.0 dev-util/qbs/Manifest | 1 + dev-util/qbs/qbs-1.6.0.ebuild | 114 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index 506d597..122f6c5 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,2 +1,3 @@ DIST qbs-src-1.4.5.tar.gz 825278 SHA256 f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a WHIRLPOOL 2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca DIST qbs-src-1.5.2.tar.gz 902972 SHA256 059b4f64c1f599379a17bbf859dd9658fafe8cb2b65b31634974ff1c381928c1 SHA512 80aa32a4951703bf08f217c216006b057c3c866e5f10cda687714edadb39a8316b63866a493bb947093bb55406ab38269b46bc2ce2e9e09629a68b2e57440d70 WHIRLPOOL 0545aef4a14f804a00287cd6aa9f5a0d9139857badfd5169f541fd9a980a78938956936ed1faaf070f00febafd54b35983af3f5e10ba2209b2c538bcb99b43b3 +DIST qbs-src-1.6.0.tar.gz 928684 SHA256 ae850e957e4a811a193b02a067321722dd0e5fc50b7c370ec34273c1565e78ab SHA512 20e3a0837a5503db9a150df566122b85bb74a8f4e604afd32b83464ddbb36eb4ea93de0b05aaaa7f7403477f56664326f8e43bdf92d9a3a15512918e83e5c56a WHIRLPOOL cba7b95a3aa3941336f2e14f315634c8910a4f205ecf60c99ef2d75dbb69eff24209d9cad41096cb3912fa37c8d011cc6c44b5b229ece55d5cf936e898ec0a4c diff --git a/dev-util/qbs/qbs-1.6.0.ebuild b/dev-util/qbs/qbs-1.6.0.ebuild new file mode 100644 index 00000000..8ef1ef8 --- /dev/null +++ b/dev-util/qbs/qbs-1.6.0.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit qmake-utils + +MY_P=${PN}-src-${PV} + +DESCRIPTION="Cross-platform build tool" +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" + +RESTRICT="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 + + 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 + + # 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("java\./true||&/' `# requires jdk, fails, bug 585398` \ + -e 's/!haveMakeNsis/true/' `# requires nsis` \ + -e 's/!haveWiX(profile)/true/' `# requires wix` \ + -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 +} + +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 /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=${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 + + # 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 +}