From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- dev-util/qbs/Manifest | 4 +- dev-util/qbs/qbs-1.13.1.ebuild | 123 ----------------------------------------- dev-util/qbs/qbs-1.15.0.ebuild | 116 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 125 deletions(-) delete mode 100644 dev-util/qbs/qbs-1.13.1.ebuild create mode 100644 dev-util/qbs/qbs-1.15.0.ebuild (limited to 'dev-util/qbs') diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index 968aa5b76a85..f2948493f33f 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,7 +1,7 @@ DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13 SHA512 eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147 -DIST qbs-src-1.13.1.tar.gz 4324622 BLAKE2B d64145f38aea95f4b7539a9652c276f4dddb4af8424142b45df77083c2c8821f0858827c6d8390ca70835e9bbd3eda02163b7e180ebb82eb90976afe727b4dd7 SHA512 1626a218665d380a8030bf4930be857399806643e7868bace6cafe269054ec560eb47e37e358acdb3edbbb15bc8f4ec9af55142d6bfe2ab5db0c8a08aa40d597 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 EBUILD qbs-1.12.2.ebuild 2890 BLAKE2B 3ffa01f8ebc8ed8f762f5823f846fedf560db1c49d2488a4c0956b7176f70bcfe521863360c6d04a74754bb354538018b7e2a6ab172f74cbd4354a22374456ef SHA512 9c0a50d5bacb06238ef04f6b788130d228e7d8ad230691b41af62c986394fc65655a2c580ebfa0613f52df41d024c5439697365ca6e2077ee8eafee60b4547e5 -EBUILD qbs-1.13.1.ebuild 2972 BLAKE2B 771f5921f520c57ed2a91f3e1b8aec4bfb0049a384537d2d7aa857bebe9a519a624c29748b3a9746213609e51bd1071026d478de54ad2de4e70327008e9fa6eb SHA512 6da9b15a6fe824d7a1aa257a901a34e35188bd9ac9a52691c14360a210d01c9990f55cb71fc57747d81898ea0e45846576ff360cb8cb4c4933f621f4eaf92a8c EBUILD qbs-1.14.1.ebuild 2701 BLAKE2B 6c7453e1fd3997007f7edfcc3b2ac563413ad4c8078e5ed80d271f6e6ca7f1f8b12aef7219db16a3ee7fca43c8c37d75e22586751b602256645f8f67a3de859c SHA512 70c27376061cf0c1f0ee98ac176560b5d8cf103879a33e607b46f5c00330c5e390c5dc43e47046d2937585bad7913192160905bc11cd0f9d47053d630622ea18 +EBUILD qbs-1.15.0.ebuild 2840 BLAKE2B d0a706886502a5034865421025271088de9fbe5da10fea012bfbe844766b2f712b84df8a3af66b39d3988b72644b24752a51854ee23eb25ee026264105b968a0 SHA512 98b927b20cd37dce72b3fda3089b2de83433af471d61369c65537bce1c99c9db31933cd8297a1028ff67997e4b2e20840abfb5ada415741c9ec3671b2c5b3e2c MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da diff --git a/dev-util/qbs/qbs-1.13.1.ebuild b/dev-util/qbs/qbs-1.13.1.ebuild deleted file mode 100644 index 0ce9c72b16a8..000000000000 --- a/dev-util/qbs/qbs-1.13.1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2019 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" -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 - - # replace hardcoded "lib" with QBS_LIBRARY_DIRNAME - sed -i -e '1i include(src/library_dirname.pri)' \ - -e '/qbslibdir =/ s:/lib:/$$QBS_LIBRARY_DIRNAME:' \ - static-res.pro || die - - # respect LDFLAGS - sed -i -e '/QMAKE_LFLAGS =/ s/ = / += /' src/lib/library.pri || 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 -} diff --git a/dev-util/qbs/qbs-1.15.0.ebuild b/dev-util/qbs/qbs-1.15.0.ebuild new file mode 100644 index 000000000000..5fa4f467db39 --- /dev/null +++ b/dev-util/qbs/qbs-1.15.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://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? ( 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 + + # 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