From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/
Date: Fri, 20 Jul 2018 04:46:22 +0000 (UTC) [thread overview]
Message-ID: <1532061975.6fd0b4ce6a2b28b65fdb8900f5f0a5d5f60c6e8d.pesa@gentoo> (raw)
commit: 6fd0b4ce6a2b28b65fdb8900f5f0a5d5f60c6e8d
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 04:45:35 2018 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 04:46:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd0b4ce
dev-util/qbs: 1.12.0 version bump
Package-Manager: Portage-2.3.41, Repoman-2.3.9
dev-util/qbs/Manifest | 1 +
dev-util/qbs/qbs-1.12.0.ebuild | 114 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 115 insertions(+)
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 7cb561198cb..a738f2f0031 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1 +1,2 @@
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
diff --git a/dev-util/qbs/qbs-1.12.0.ebuild b/dev-util/qbs/qbs-1.12.0.ebuild
new file mode 100644
index 00000000000..87c294f4160
--- /dev/null
+++ b/dev-util/qbs/qbs-1.12.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+}
next reply other threads:[~2018-07-20 4:46 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-20 4:46 Davide Pesavento [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-25 22:19 [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/ Jakov Smolić
2024-12-03 8:58 Ionen Wolkens
2024-11-04 16:15 Ionen Wolkens
2024-10-22 8:04 Jakov Smolić
2024-10-02 4:35 Ionen Wolkens
2024-09-25 12:48 Joonas Niilola
2024-09-13 23:25 Ionen Wolkens
2024-08-31 13:53 Ionen Wolkens
2024-05-30 15:52 Ionen Wolkens
2024-05-13 5:49 Ionen Wolkens
2024-05-12 20:25 Ionen Wolkens
2024-05-07 19:34 Ionen Wolkens
2024-05-05 2:41 Ionen Wolkens
2024-05-05 2:41 Ionen Wolkens
2023-08-30 6:33 Sam James
2022-08-08 9:40 Andreas Sturmlechner
2021-07-10 21:00 Davide Pesavento
2021-07-10 21:00 Davide Pesavento
2021-01-13 7:02 Davide Pesavento
2021-01-13 7:02 Davide Pesavento
2020-06-30 23:31 Davide Pesavento
2020-01-03 5:57 Davide Pesavento
2020-01-03 5:57 Davide Pesavento
2019-11-28 19:24 Davide Pesavento
2019-11-28 18:53 Davide Pesavento
2019-06-23 18:51 Davide Pesavento
2019-06-23 0:49 Davide Pesavento
2019-06-07 5:10 Davide Pesavento
2019-06-07 5:10 Davide Pesavento
2019-04-28 19:37 Davide Pesavento
2018-12-23 18:42 Davide Pesavento
2018-12-15 22:01 Davide Pesavento
2018-07-20 2:58 Davide Pesavento
2018-07-20 2:58 Davide Pesavento
2018-05-13 3:26 Davide Pesavento
2018-04-30 3:09 Davide Pesavento
2018-04-30 3:09 Davide Pesavento
2018-03-24 1:29 Davide Pesavento
2018-03-24 1:25 Davide Pesavento
2018-03-16 20:07 Davide Pesavento
2018-01-23 23:06 Davide Pesavento
2017-12-11 1:23 Davide Pesavento
2017-10-05 19:33 Davide Pesavento
2017-10-05 19:08 Davide Pesavento
2017-09-16 21:02 Davide Pesavento
2017-09-16 21:02 Davide Pesavento
2017-08-19 17:15 Davide Pesavento
2017-07-18 18:43 Davide Pesavento
2017-07-18 18:23 Davide Pesavento
2017-05-27 16:48 Davide Pesavento
2017-05-27 0:25 Davide Pesavento
2017-05-26 10:30 David Seifert
2017-05-26 10:00 David Seifert
2017-05-26 5:00 Davide Pesavento
2017-03-14 22:33 Davide Pesavento
2016-12-17 5:06 Davide Pesavento
2016-11-22 9:08 Davide Pesavento
2016-11-21 20:18 Davide Pesavento
2016-09-11 11:44 Davide Pesavento
2016-07-09 14:06 Davide Pesavento
2016-06-16 15:03 Davide Pesavento
2016-06-16 13:57 Michael Palimaka
2016-06-16 11:31 Davide Pesavento
2016-06-16 6:07 Patrick Lauer
2016-06-16 0:57 Davide Pesavento
2016-06-10 1:45 Davide Pesavento
2016-06-10 1:45 Davide Pesavento
2016-06-10 0:54 Davide Pesavento
2016-06-10 0:54 Davide Pesavento
2016-05-12 17:39 Davide Pesavento
2016-05-12 14:13 Davide Pesavento
2016-05-12 14:13 Davide Pesavento
2016-04-02 18:40 Davide Pesavento
2015-12-17 2:34 Davide Pesavento
2015-11-20 0:04 Davide Pesavento
2015-10-18 1:48 Davide Pesavento
2015-09-13 23:00 Davide Pesavento
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1532061975.6fd0b4ce6a2b28b65fdb8900f5f0a5d5f60c6e8d.pesa@gentoo \
--to=pesa@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox