gentoo auto-resync : 03:10:2024 - 04:43:49

2 files changed, 93 insertions, 0 deletions

diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index a0b62df58345..b10a34b4f49e 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,5 +1,7 @@
 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.1.tar.gz 5739646 BLAKE2B 5455779be27a5eed316372303ec4264a6af8238684e9c4ae46dffcf7f9038b9aaff75dab29c84e761808158ce60f408c46eac829ef226168ad86c85df2fe7cd2 SHA512 caeb9289a208ca227fc2a16c38d88594b3b958c33f9108f74463bfad412a07ac7f7c4f85b6a741d3ee4c842e5a5d980d88b9c279ff8636cb2e98f67a70ee54b3
+DIST qbs-src-2.4.2.tar.gz 5718110 BLAKE2B 011051b16ec81684cf515e160da706dd2f781077a006e999f6c8bf9c8dc522655e6bd900c833f6fe53a076d83c11424975626e043c673a7d8bc10d7428964af9 SHA512 e584b03e7866991bb5fdfd1caed33beaa9480b820772bdbd0daf049f7d3fbe7d1ab19add520c69fd018e9298ff13ca8dfaae3b76e6245589708b59f976307464
 EBUILD qbs-2.4.1-r1.ebuild 2463 BLAKE2B e73512996d3dc7a791517c7a14e17bd129472ccd05fe6f0135fcf334663491f531870298e3a5bd591c9e2e25d1697119a97176ec45eb5d897e84f9a31ccb886d SHA512 b20d8b502ce0ac52a80a4226fce67748c719288dfc6cfd042fca8ba9de210c0b784bc0ab99caaba4e03858d5489e3d844d069dd874936266772893192b5060ed
+EBUILD qbs-2.4.2.ebuild 2464 BLAKE2B 3db130cfbad56cdfb8e8d80088dcc95516fc2b7bb098a765fc802d8df40add84dd7eb5238daa98b7a6900ddbdf236d62ddd994a2d17aaa527b726ef6aa7ace30 SHA512 48731ec065caeb88a5a61c521e4fefde65fceb0d6c9ca885cbd942f4f5f01f1edbb48befb2c673362606294a4f7b262adb68b203cb093ead784d12ab6ffc4b01
 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
new file mode 100644
index 000000000000..c82bed8f744e
--- /dev/null
+++ b/dev-util/qbs/qbs-2.4.2.ebuild
@@ -0,0 +1,91 @@
+# 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
+}