From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (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 58E04158042 for ; Mon, 4 Nov 2024 16:15:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D911E088B; Mon, 4 Nov 2024 16:15:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 61D72E088B for ; Mon, 4 Nov 2024 16:15:20 +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 A62CF341256 for ; Mon, 4 Nov 2024 16:15:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C58451E89 for ; Mon, 4 Nov 2024 16:15:16 +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: <1730736829.5bea72ee02fac7a6e752e0bcd2d1f1bee5a63ddb.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.4.1-r1.ebuild X-VCS-Directories: dev-util/qbs/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 5bea72ee02fac7a6e752e0bcd2d1f1bee5a63ddb X-VCS-Branch: master Date: Mon, 4 Nov 2024 16:15:16 +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: 3674aeda-ae8d-411e-83d1-17c8f1d3eebc X-Archives-Hash: d190f5b9afa06979909ecfe906faac3d commit: 5bea72ee02fac7a6e752e0bcd2d1f1bee5a63ddb Author: Ionen Wolkens gentoo org> AuthorDate: Mon Nov 4 15:22:45 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Nov 4 16:13:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bea72ee dev-util/qbs: drop 2.4.1-r1 Signed-off-by: Ionen Wolkens gentoo.org> dev-util/qbs/Manifest | 1 - dev-util/qbs/qbs-2.4.1-r1.ebuild | 91 ---------------------------------------- 2 files changed, 92 deletions(-) diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index 8894e71720c1..5d151cf13e8b 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,2 +1 @@ -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 diff --git a/dev-util/qbs/qbs-2.4.1-r1.ebuild b/dev-util/qbs/qbs-2.4.1-r1.ebuild deleted file mode 100644 index 3da4596d9744..000000000000 --- a/dev-util/qbs/qbs-2.4.1-r1.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 -}