diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index 751ffe7af95f5..c9fb2b143afdd 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,2 +1 @@ -DIST qbs-src-2.4.2.tar.gz 5718110 BLAKE2B 011051b16ec81684cf515e160da706dd2f781077a006e999f6c8bf9c8dc522655e6bd900c833f6fe53a076d83c11424975626e043c673a7d8bc10d7428964af9 SHA512 e584b03e7866991bb5fdfd1caed33beaa9480b820772bdbd0daf049f7d3fbe7d1ab19add520c69fd018e9298ff13ca8dfaae3b76e6245589708b59f976307464 DIST qbs-src-2.5.0.tar.gz 5726362 BLAKE2B 3757b17750078ceddc45b88688a51b3f6e1659c9c845683a11e92a5acdfa44a6b6cac61aeb551ccde21282fcd971484bdec1e002b8a8c47e5fc6fd9d23523011 SHA512 60bfbac4fa7435da93431be50603bb19fbdf7a5bafc8a3a1129b792d323cbd4e42c2fd7b7b24c30c8a4a2b4b01b65ac72c366e54e01e1c6da2699ff6dedaf35f diff --git a/dev-util/qbs/qbs-2.4.2.ebuild b/dev-util/qbs/qbs-2.4.2.ebuild deleted file mode 100644 index 3da4596d9744b..0000000000000 --- a/dev-util/qbs/qbs-2.4.2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -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 ) 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 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_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 -}