From a25cc082a26782e5d39ded4559c91ff11bc3c299 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 13 May 2024 00:01:18 +0100 Subject: gentoo auto-resync : 13:05:2024 - 00:01:18 --- dev-util/qbs/Manifest | 4 -- dev-util/qbs/qbs-1.19.1.ebuild | 124 ----------------------------------------- dev-util/qbs/qbs-2.3.0.ebuild | 81 --------------------------- 3 files changed, 209 deletions(-) delete mode 100644 dev-util/qbs/qbs-1.19.1.ebuild delete mode 100644 dev-util/qbs/qbs-2.3.0.ebuild (limited to 'dev-util/qbs') diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index 543b1c39e4ee..5462083e8bff 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,8 +1,4 @@ AUX qbs-2.3.1-qtver.patch 196 BLAKE2B 6cfabd1bbd16b2e342ff9eeb2748ce2215ed25d18203f59e0f181f465e02dfe1e2416b8ab2b5c8eb3b5aa6ec9e7c37e938e389165b1a995ed7f48233f257af79 SHA512 f3f95fc9d1a96767d9a3e74ac428e9b00f4e460959d04298f3f6ecc99f5eb72a57290e6d248f82d1ba8ca7e655fe729b8320a77da585b145c48ac90b9a315181 -DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29 SHA512 b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d -DIST qbs-src-2.3.0.tar.gz 5615799 BLAKE2B f7e10d1dffe7d188c4ab5c6ed1b02837b41044f93083e052105638ed3c091a5be2d4f3bffeb39238baf6e8a1ba2cfc316fefea5f80871c851be3d7c873847c74 SHA512 6611ce02b0dc4f4a0cc68a13a7c684c07061d3fff57d2ca16470fffa253ff23f45349d86ad4ba4c0eab681f74f3c92cddd85daedf1f31fd1a7eae5bddb606cb6 DIST qbs-src-2.3.1.tar.gz 5614581 BLAKE2B 92fa24d75248a3732cbd99b660141e56654574f1388d50d5359afef7b442889fa59c4ab4f029f055ee618c0222f94faba47ae9fff85f0fae26e95f2ba34995f9 SHA512 27ba33805b942cf8180e55bdd6c37ccfd2aeaa2e8c01ca7e7485720030dfad7c5f1a3f92b77bff97a7ebf8878e455758c8729005e8b03959d18106f945d8d42c -EBUILD qbs-1.19.1.ebuild 2903 BLAKE2B 311441e8a8fdd8c4be254ec784129216120dffe85a7a8172dc0abd8c26c15723eac4c4d18f22901761b10dd0883464f9864d646ff2820fc610665614a32f4116 SHA512 b04c16648754d322fe115858dd99e36ce67355063b44680d6cea3042f5b062efe59716bf3d55c8fb21e96a81f6c7e74998942cdabb8974e2c598c28ad4875bf6 -EBUILD qbs-2.3.0.ebuild 2158 BLAKE2B 847ad66aa051598ac69dac278f9e299328542f3a8ebb553bf29d1e43544ee234219f08effddf15e842fb444f944f8506d80014c87ee0e0260524b4fba2d92e84 SHA512 1523c686e9300db262c3296dc548ebb85d75f840723addf2597af4da751c15bc94b96577e1f86f4d4aea5576d4a2ce5b78dfcf9e1f74f8ee044307efef891048 EBUILD qbs-2.3.1.ebuild 2241 BLAKE2B 710f74820cf93424cf79673339fd80d935de0d3cf944d45239518816256233a6ed9220bc8a3c05b314e5f0a3e123c13609a9474bec08a85ef5b8216a69060621 SHA512 15bfa0650a706bc849d68368ec9a3f04fc3877a7ddc139ea9caa8df6ae5400d71c9cc9d9908a3f285d03c533bba4a31b08244244d1da0d331db12236907d61ff MISC metadata.xml 1135 BLAKE2B 389cfca2f13552aa0da4e29204014c678d2e710cc96fed8f68616431d5a5d0b9bcd5505b396f843dd065c66c0bd8d955ae6137637eb19226552b6b36509fe296 SHA512 854fb0ce9d21b6ff61c4ed32efeffda84d31ec809faa830b921804dc59e5d6d49d8b7326877705f94346f677d72cc17be5ed4099a6e51dbf381f7456c57567d6 diff --git a/dev-util/qbs/qbs-1.19.1.ebuild b/dev-util/qbs/qbs-1.19.1.ebuild deleted file mode 100644 index 28e160fd13ed..000000000000 --- a/dev-util/qbs/qbs-1.19.1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2023 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 - local SKIP_TESTS_ARGS=( - # requires zip and jar - -e 's/findArchiver(binaryName,.*/"";/' - # requires nodejs, bug 527652 - -e 's/p\.value("nodejs\./true||&/' - # requires nodejs and typescript - -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' - ) - sed -i tests/auto/blackbox/tst_blackbox.cpp "${SKIP_TESTS_ARGS[@]}" || 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 -} diff --git a/dev-util/qbs/qbs-2.3.0.ebuild b/dev-util/qbs/qbs-2.3.0.ebuild deleted file mode 100644 index c00fae7ed834..000000000000 --- a/dev-util/qbs/qbs-2.3.0.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake flag-o-matic python-any-r1 - -DESCRIPTION="Modern build tool for software projects" -HOMEPAGE="https://doc.qt.io/qbs/" -SRC_URI="https://download.qt.io/official_releases/qbs/${PV}/${PN}-src-${PV}.tar.gz" -S=${WORKDIR}/${PN}-src-${PV} - -LICENSE="|| ( LGPL-2.1 LGPL-3 ) BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-qt/qt5compat:6 - dev-qt/qtbase:6[concurrent,gui,network,widgets,xml] -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - $(python_gen_any_dep ' - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - ') - dev-qt/qttools:6[assistant,qdoc] - ) -" - -CMAKE_SKIP_TESTS=( - # QBS does not inherit toolchain/flags knowlege from cmake, and - # while can use ${BUILD_DIR}/bin/qbs-config to improve this it - # remains very fickle and will fail in varied ways with clang, - # musl, -native-symlinks, and libc++. After consideration it is - # not worth worrying about affected tests here (even if notable). - tst_api - tst_blackbox # also skips blackbox-* (intended) - tst_language -) - -python_check_deps() { - # _find_python_module in cmake/QbsDocumentation.cmake - python_has_version "dev-python/beautifulsoup4[${PYTHON_USEDEP}]" && - python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - # temporary workaround for musl-1.2.4 (bug #906929), this ideally - # needs fixing in qtbase as *64 usage comes from its headers' macros - use elibc_musl && append-lfs-flags - - local mycmakeargs=( - -DQBS_DOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF} - -DQBS_INSTALL_HTML_DOCS=$(usex doc) - -DQBS_INSTALL_MAN_PAGE=yes - -DQBS_INSTALL_QCH_DOCS=$(usex doc) - -DQBS_LIB_INSTALL_DIR="$(get_libdir)" - -DWITH_TESTS=$(usex test) - -DWITH_UNIT_TESTS=$(usex test) - ) - - cmake_src_configure -} - -src_install() { - local DOCS=( README.md changelogs ) - cmake_src_install - - use !test || rm -- "${ED}"/usr/bin/{tst_*,qbs_*,clang-format-test} || die - - docompress -x /usr/share/doc/${PF}/qbs.qch -} -- cgit v1.2.3