From 4df3bf9762850b34cd1ead5c80374d1a0fc3362e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 12 Jul 2021 08:41:54 +0100 Subject: gentoo resync : 12.07.2021 --- dev-util/qbs/Manifest | 6 +-- dev-util/qbs/metadata.xml | 12 +++-- dev-util/qbs/qbs-1.16.0.ebuild | 116 --------------------------------------- dev-util/qbs/qbs-1.19.1.ebuild | 120 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+), 123 deletions(-) delete mode 100644 dev-util/qbs/qbs-1.16.0.ebuild create mode 100644 dev-util/qbs/qbs-1.19.1.ebuild (limited to 'dev-util/qbs') diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index 16e8e8d61f45..38bd0e59a292 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,5 +1,5 @@ -DIST qbs-src-1.16.0.tar.gz 4571788 BLAKE2B 4fb06314d0d0a532574e0d245ea85b6d596850ffe4b81b621406d1bc99e0529fc491bf5c7db514d90026c0bf4916f9fa102457aab2bbaaddbbe2e90c03aa04a4 SHA512 65c5398ffad54e10e251bed79a5b58abd722c0f95a031c536fc8647d915dd696923401c767a7a8ac029f4f571b6bbf96ef4b7493bb30768f675477bd68fcc21c DIST qbs-src-1.18.0.tar.gz 4921432 BLAKE2B 4c081434596c58d433e52ca9e335e3b4d62b75e401290895719b7fbe4f3c20cf8b34ab0753ae79a34b4e29c8859751a6276da8d6dbd5f3c711581af16ab61415 SHA512 bdef30200c7e74749c363b1d68232fd90d1dfc998722bee0e058ffcaff8e003599e0404b49f86cbeae098d59ccb5663316db5094d77b50a217fcf4ab5ae64d83 -EBUILD qbs-1.16.0.ebuild 2850 BLAKE2B 82b62eb6de4f2d0061ce036a5a88162095bfd7a3d8283d8c5e66bb031245f8164d2e65260de5bffa597ac22faea2c7f9697c3ee64f0a9410cebd4cab35cbfd0a SHA512 e44b46ad21d97356fad8d6e884afb9bae9444b1acab8d979aa7820a541d0f334f6911ca56279a636fcb9cb667de5f60e49680193f8d2cc0463d1e66e810af100 +DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29 SHA512 b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d EBUILD qbs-1.18.0.ebuild 2734 BLAKE2B c7333128929e27c74b86805b232e392c271796994d9caa09131ba51f5586177f67928d0d215ce256e3b6f1787a73b318341025eb7832dff566556756a6c40369 SHA512 dbdcff5f53ed0c0877062c603250f1776ffa025453f4780e2a41fb2c5eed042f162852112debac6517d962a31df06296913fba2aec1475d48738341dfff0288c -MISC metadata.xml 949 BLAKE2B 9952ba0471f53c5cfc8c25aec8efa9fb49802b2281a2c8f0d881d2ed6e6f02a3613476ecab2649450f9fab10ed3ed7b7e049fbf903c253de0443bd46fc457555 SHA512 f3aedd229fde8cde837f5958888fa6db0a46106cae33887e20a2c0688bf97142453e27401f5334295ca618ed3ccbf69e98cb333a9a079c0a38b1125f97363a3f +EBUILD qbs-1.19.1.ebuild 2861 BLAKE2B 6866b411f7034cd1cc94204d7ee3ed4c761148fe90d300a5860445b2c2b4320982b9ec4b2d1809e1f4f91574b24fd2f55e11b405a54539a1d08ba0734f14e9f4 SHA512 6044e182fcbd25d88e69a93a21c49e7bca0385f67c197caba10d13a2e464d530c1a34f35d09e26c80a072caedf9e12798695074d6a3df96e0df09ba1447ce067 +MISC metadata.xml 1195 BLAKE2B 2701111c08ccf68cb6225592b32c74030dcde02ca5f8f48c0428c198571586858092578479609c4148952cd804cdaadaeb1e2467db85de90c9db02924ca0c14e SHA512 03d2923608917ddc00ee66cbbabc068dbc03469f89a815b07849855c25ea555b22e02ed71f4f3f926bf6626dbf3afd801fb0412687b85e0362a5139cd7e3bd18 diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml index 4311f5d8ba92..06efa80b24ba 100644 --- a/dev-util/qbs/metadata.xml +++ b/dev-util/qbs/metadata.xml @@ -14,10 +14,14 @@ projects across multiple platforms. Qbs can be used for any software 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 - undertakes the task of executing the commands in the low-level build - graph (like make). + Qbs projects are specified in a QML dialect. QML is a concise, easy to + learn, and intuitive language that is used successfully in the Qt project. + Its core is declarative, but it can be extended with JavaScript snippets + for extra flexibility. + + Qbs is an all-in-one tool that generates a build graph from a high-level + project description (like qmake or CMake) and additionally undertakes the + task of executing the commands in the low-level build graph (like make). https://bugreports.qt.io/ diff --git a/dev-util/qbs/qbs-1.16.0.ebuild b/dev-util/qbs/qbs-1.16.0.ebuild deleted file mode 100644 index 2ecd2be09ac4..000000000000 --- a/dev-util/qbs/qbs-1.16.0.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# 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 -} diff --git a/dev-util/qbs/qbs-1.19.1.ebuild b/dev-util/qbs/qbs-1.19.1.ebuild new file mode 100644 index 000000000000..3339bb574287 --- /dev/null +++ b/dev-util/qbs/qbs-1.19.1.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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="https://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="|| ( LGPL-2.1 LGPL-3 )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="doc examples gui test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-qt/qtcore:5= + dev-qt/qtnetwork:5 + dev-qt/qtscript:5 + dev-qt/qtxml:5 + gui? ( + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND="${RDEPEND} + test? ( + dev-qt/linguist-tools:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qttest:5 + ) +" +BDEPEND=" + dev-qt/qtcore:5 + doc? ( + dev-qt/qdoc:5 + dev-qt/qthelp:5 + ) +" + +src_prepare() { + default + + if ! use examples; then + sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die + fi + + if ! use gui; then + sed -i -e '/SUBDIRS += config-ui/ d' src/app/app.pro || die + fi + + echo "SUBDIRS = $(usev test auto)" >> tests/tests.pro + + # skip several tests that fail and/or have additional deps + sed -i \ + -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 + sed -i -re '/blackbox-(android|apple|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 + $(usev 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 -j1 INSTALL_ROOT="${D}" install + + dodoc -r changelogs CONTRIBUTING.md 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 +} -- cgit v1.2.3