gentoo auto-resync : 25:01:2025 - 06:47:11

3 files changed, 3 insertions, 96 deletions

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index e6c35f0f4a9d..b6c7d3b9db01 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,7 +1,5 @@
 AUX qbs-2.3.1-qtver.patch 196 BLAKE2B 6cfabd1bbd16b2e342ff9eeb2748ce2215ed25d18203f59e0f181f465e02dfe1e2416b8ab2b5c8eb3b5aa6ec9e7c37e938e389165b1a995ed7f48233f257af79 SHA512 f3f95fc9d1a96767d9a3e74ac428e9b00f4e460959d04298f3f6ecc99f5eb72a57290e6d248f82d1ba8ca7e655fe729b8320a77da585b145c48ac90b9a315181
 AUX qbs-2.4.1-ldconfig.patch 696 BLAKE2B eb0339773ebddbf913e09f6e50fc366b50b8a7974262e6f568da879cd96035d8c93cfe7c8e9a891f4716a5af3ceff27e0a753c5e6ccfe78481d696dd068e7cf7 SHA512 07bd268c6e95c306c1f69e29164e2e54b3290d415a96dac143c9438021acf8a8e42fbb1ae750308560279ac4762984dd74b4e18fe3be84a9c9933c9dd7d1a752
-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
-EBUILD qbs-2.4.2.ebuild 2463 BLAKE2B e73512996d3dc7a791517c7a14e17bd129472ccd05fe6f0135fcf334663491f531870298e3a5bd591c9e2e25d1697119a97176ec45eb5d897e84f9a31ccb886d SHA512 b20d8b502ce0ac52a80a4226fce67748c719288dfc6cfd042fca8ba9de210c0b784bc0ab99caaba4e03858d5489e3d844d069dd874936266772893192b5060ed
-EBUILD qbs-2.5.0.ebuild 2473 BLAKE2B 42175ec194cad015c9891beae4a4f5f4fcb4ee28ad38d95984ecbe6aac3088c98684e2f49505a835f1347b7ad855d545d9a2ae7a6e40f7998eeb44ded073405d SHA512 3e7780f2e05e238708fa40df18e8274f5eb3ce6b7fe0cdb8449a584c399c0fd0824e4285684bd97d7dc57c68dcc2b92dd44b026c17f4ea0d1ba025d3c5f915c1
+EBUILD qbs-2.5.0.ebuild 2478 BLAKE2B 0eee4bb82c1f415b9bb123f8fd3bb434c3c2465fe75d91f07a0577c270abf5785a0e6f2fc2713dee872a74a59ad93a93e16b200f5328461f36d61561cb0f9f7e SHA512 104c3a1d3c548098b4c37b834bab8e0810cb87149ae3083bd4f101f402ad79a3ce509ffd1587f29df8ab1a02ef0fa873868d0e13d1bdedabf383052d567007be
 MISC metadata.xml 1135 BLAKE2B 389cfca2f13552aa0da4e29204014c678d2e710cc96fed8f68616431d5a5d0b9bcd5505b396f843dd065c66c0bd8d955ae6137637eb19226552b6b36509fe296 SHA512 854fb0ce9d21b6ff61c4ed32efeffda84d31ec809faa830b921804dc59e5d6d49d8b7326877705f94346f677d72cc17be5ed4099a6e51dbf381f7456c57567d6
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 3da4596d9744..000000000000
--- 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
-}
diff --git a/dev-util/qbs/qbs-2.5.0.ebuild b/dev-util/qbs/qbs-2.5.0.ebuild
index 73ac2d45d6eb..4d4afb31d754 100644
--- a/dev-util/qbs/qbs-2.5.0.ebuild
+++ b/dev-util/qbs/qbs-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-src-${PV}
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) Boost-1.0 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"