commit: 15a4060f3f2a4e6b5d63e837df2657a90416c105
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 12 18:11:14 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 12 18:11:14 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a4060f
dev-util/qbs: drop 2.5.1, 3.0.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-util/qbs/Manifest | 2 -
dev-util/qbs/qbs-2.5.1.ebuild | 91 -------------------------------------------
dev-util/qbs/qbs-3.0.1.ebuild | 91 -------------------------------------------
3 files changed, 184 deletions(-)
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index ce297d26d195..181c35f3bc9b 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1 @@
-DIST qbs-src-2.5.1.tar.gz 5723765 BLAKE2B
b9dce154a84cbc719aa7bdaec1cc2f2c29d07e8e20bea206b0248471a8b3b975d393b2163aaf333995544901dc800d7c83cedf5638d7d412cb5ec19f7bfe8d1c
SHA512
93a94aa669a530b649b75c5144abd719aa1b57fba833aacb3abf5ff3b2edac145671993299301e6cb486397dbe3e0afd591acb81f1a091afd5e88a5a48014882
-DIST qbs-src-3.0.1.tar.gz 5818756 BLAKE2B
3dcd2f04f0b559a3266cb971b103f4d015a0bc504957420e618e289b0710b28ab86345a4e6a50aea5934370d188ada63053a224b90b119b24b4fc7a8823b0753
SHA512
568b70cb861f671a99509ab21706ad0aa0c7102e51d25e009a6df13e022019fe815bf20f1ed851aa8e4ff980afc2cb963c6f17c3abadd3b2ed033cdd4300649f
DIST qbs-src-3.0.3.tar.gz 5796778 BLAKE2B
d0e5409a88c8e166453ad579c7317a18a06218c6107892bf0305b05c05beb0d526edfa992a5fa3c021f6d30ca6b65833c26738c512ecde11487c9499b26a2027
SHA512
b31c5163a9348059a2843ef28c3d62a97994c3d20dcc33686c72a15ef73e4a732456b8e023b19d7e927bb45f8fef84cbd8b746a5bbbdb1a454a21f7ef50724a9
diff --git a/dev-util/qbs/qbs-2.5.1.ebuild b/dev-util/qbs/qbs-2.5.1.ebuild
deleted file mode 100644
index 4d4afb31d754..000000000000
--- a/dev-util/qbs/qbs-2.5.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2024-2025 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 ) Boost-1.0 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
-}
diff --git a/dev-util/qbs/qbs-3.0.1.ebuild b/dev-util/qbs/qbs-3.0.1.ebuild
deleted file mode 100644
index 0f38281c4858..000000000000
--- a/dev-util/qbs/qbs-3.0.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2024-2025 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 )"
-
-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
-}
