commit:     12a8ff4e14598d1ad9033a73855655c47b44984b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 23:30:21 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 23:31:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a8ff4e

dev-util/qbs: add 1.16.0

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-util/qbs/Manifest          |   1 +
 dev-util/qbs/metadata.xml      |   4 +-
 dev-util/qbs/qbs-1.16.0.ebuild | 116 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 119 insertions(+), 2 deletions(-)

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index aacb348c605..ed20307b545 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,4 @@
 DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 
8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13
 SHA512 
eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147
 DIST qbs-src-1.14.1.tar.gz 4365537 BLAKE2B 
5a51ddea64023c76b6934634f72ab19d54a3e857efe30d7698a3970d099e436599b53b369d81434cc8e721606513bd487010047e60ccfa289574f606cf020dc5
 SHA512 
df9031e2749ba598129daef0a6b4322ad964c87a33bfd079bb231170da49c42708740ec63e351607b7e9da1dd11310802b14917eaf2ec97bb747a6df9890f2f3
 DIST qbs-src-1.15.0.tar.gz 4531882 BLAKE2B 
95ef24a3c63972a5c4111b68c19d57d83552c8c2fd771bda6291d99564c2e3e80488700ceaf88e64bf6edca1d156dc912757ebe682cb5e3d5aec015640e8641f
 SHA512 
461ac2e1574c163149b080936233144b3941024e7f61c2b2514e58089b7fa100e576c0336e16a3c51a0f4b77e575081350550e23b543e86a2023d524aba18d07
+DIST qbs-src-1.16.0.tar.gz 4571788 BLAKE2B 
4fb06314d0d0a532574e0d245ea85b6d596850ffe4b81b621406d1bc99e0529fc491bf5c7db514d90026c0bf4916f9fa102457aab2bbaaddbbe2e90c03aa04a4
 SHA512 
65c5398ffad54e10e251bed79a5b58abd722c0f95a031c536fc8647d915dd696923401c767a7a8ac029f4f571b6bbf96ef4b7493bb30768f675477bd68fcc21c

diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index eb2faf76929..4311f5d8ba9 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -12,7 +12,7 @@
        <longdescription lang="en">
        Qbs is a tool that helps simplify the build process for developing
        projects across multiple platforms. Qbs can be used for any software
-       project, whether it is written in Qt or not.
+       project, regardless of programming language, toolkit, or libraries used.
 
        Qbs is an all-in-one tool that generates a build graph from a
        high-level project description (like qmake or cmake) and additionally
@@ -21,6 +21,6 @@
        </longdescription>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
-               <doc>http://doc.qt.io/qbs/</doc>
+               <doc>https://doc.qt.io/qbs/</doc>
        </upstream>
 </pkgmetadata>

diff --git a/dev-util/qbs/qbs-1.16.0.ebuild b/dev-util/qbs/qbs-1.16.0.ebuild
new file mode 100644
index 00000000000..2ecd2be09ac
--- /dev/null
+++ b/dev-util/qbs/qbs-1.16.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://doc.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? ( 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/linguist-tools:5
+               dev-qt/qtdbus:5
+               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
+
+       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=testProfile
+
+       "${S}"/bin/qbs-setup-toolchains "$(tc-getCC)" testToolchain || die
+       "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" 
${QBS_AUTOTEST_PROFILE} || die
+       "${S}"/bin/qbs-config 
profiles.${QBS_AUTOTEST_PROFILE}.qbs.targetPlatform linux || 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 README.md
+
+       # 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
+}

Reply via email to