diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index 7951a5ecd2862..116ed3bd308b3 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,2 +1 @@ -DIST qbs-src-3.1.2.tar.gz 5803135 BLAKE2B 762cd97b4140b296c3d3b589b829ee6f21c8423a1482f28702ebaa3d29eaabec9dc2144b787ec8c825374adba61310aac53d72eceec399b9ef7f01102730fc8d SHA512 aed42df2545f3866ead1b99a5efb71c741a3446c8c6974d2eca1d946249445e13bd11b4b9e7633841d7800203c27530f5a96ec39611b6448d9ec7016d27330a8 DIST qbs-src-3.3.0.tar.gz 5912581 BLAKE2B 7a5e8c5f40ace211297ecd497068e111d8df5dc291c005827cd8ba5ffef991b4c82a4c050bbfdf436477908777646aeb98375585f5601ac20ec390972b47dd06 SHA512 63146ef32519c48b447559ec3b19db1b4557984771ea9c385bd5d275f0a3e46c63cc07783548f0ca1076f7a86bb69761c1bc98eb1be77c53f85fbe2d462319c4 diff --git a/dev-util/qbs/qbs-3.1.2.ebuild b/dev-util/qbs/qbs-3.1.2.ebuild deleted file mode 100644 index 46f34513d4158..0000000000000 --- a/dev-util/qbs/qbs-3.1.2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 2024-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..14} ) -inherit cmake flag-o-matic python-any-r1 toolchain-funcs - -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 ) Boost-1.0 BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -# uses CorePrivate wrt qtbase:= -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 knowledge 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 feels - # not worth worrying about affected tests here (even if notable). - tst_api - tst_blackbox # also skips blackbox-* (intended) - tst_language -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.3.1-qtver.patch - "${FILESDIR}"/${PN}-2.4.1-ldconfig.patch -) - -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_prepare() { - cmake_src_prepare - - # test fails to build with Qt 6.10.1 since [1] and, given skipping - # this test either way, may as well also not build it for now - # [1] https://github.com/qt/qtbase/commit/7196bb00ed7 - cmake_comment_add_subdirectory -f tests/auto language -} - -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 - - # tests build failure w/ gcc:14 + -O3 (bug #933187, needs looking into) - use test && tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && - replace-flags -O3 -O2 - - 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)" - -DQT_VERSION_MAJOR=6 #931596 - -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 -}