From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A31531582EF for ; Sat, 22 Feb 2025 03:07:35 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 8B431343240 for ; Sat, 22 Feb 2025 03:07:35 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 5EB6B110477; Sat, 22 Feb 2025 03:07:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 52BF2110477 for ; Sat, 22 Feb 2025 03:07:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A8453431D1 for ; Sat, 22 Feb 2025 03:07:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0ADC12762 for ; Sat, 22 Feb 2025 03:07:20 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1740191693.8da491e67f9c2ba2b56bbf7681c978752b8b0d59.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/qbs/Manifest dev-util/qbs/qbs-2.5.1.ebuild X-VCS-Directories: dev-util/qbs/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 8da491e67f9c2ba2b56bbf7681c978752b8b0d59 X-VCS-Branch: master Date: Sat, 22 Feb 2025 03:07:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 085a6815-612f-43b9-b9de-a1ee6fad9133 X-Archives-Hash: 14af40bc01a161d2608866be71706f2e commit: 8da491e67f9c2ba2b56bbf7681c978752b8b0d59 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Feb 21 22:57:15 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Feb 22 02:34:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da491e6 dev-util/qbs: add 2.5.1 Signed-off-by: Ionen Wolkens gentoo.org> dev-util/qbs/Manifest | 1 + dev-util/qbs/qbs-2.5.1.ebuild | 91 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index c9fb2b143afd..570e4714aa18 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1 +1,2 @@ DIST qbs-src-2.5.0.tar.gz 5726362 BLAKE2B 3757b17750078ceddc45b88688a51b3f6e1659c9c845683a11e92a5acdfa44a6b6cac61aeb551ccde21282fcd971484bdec1e002b8a8c47e5fc6fd9d23523011 SHA512 60bfbac4fa7435da93431be50603bb19fbdf7a5bafc8a3a1129b792d323cbd4e42c2fd7b7b24c30c8a4a2b4b01b65ac72c366e54e01e1c6da2699ff6dedaf35f +DIST qbs-src-2.5.1.tar.gz 5723765 BLAKE2B b9dce154a84cbc719aa7bdaec1cc2f2c29d07e8e20bea206b0248471a8b3b975d393b2163aaf333995544901dc800d7c83cedf5638d7d412cb5ec19f7bfe8d1c SHA512 93a94aa669a530b649b75c5144abd719aa1b57fba833aacb3abf5ff3b2edac145671993299301e6cb486397dbe3e0afd591acb81f1a091afd5e88a5a48014882 diff --git a/dev-util/qbs/qbs-2.5.1.ebuild b/dev-util/qbs/qbs-2.5.1.ebuild new file mode 100644 index 000000000000..f45252c38061 --- /dev/null +++ b/dev-util/qbs/qbs-2.5.1.ebuild @@ -0,0 +1,91 @@ +# 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 +}