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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 778F2158094 for ; Mon, 8 Aug 2022 09:40:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2E54E0BFF; Mon, 8 Aug 2022 09:40:37 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 1C899E0BFA for ; Mon, 8 Aug 2022 09:40:37 +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 27D2E340EE4 for ; Mon, 8 Aug 2022 09:40:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 468EC56C for ; Mon, 8 Aug 2022 09:40:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1659951618.cf51240663192e974801725e2a3be8f4d4efdc88.asturm@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-1.18.0.ebuild X-VCS-Directories: dev-util/qbs/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: cf51240663192e974801725e2a3be8f4d4efdc88 X-VCS-Branch: master Date: Mon, 8 Aug 2022 09:40:33 +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: 0387579a-7798-4d26-8327-106b2b8d4ad6 X-Archives-Hash: a82a6333d40276b03128a15540dd8431 commit: cf51240663192e974801725e2a3be8f4d4efdc88 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jul 25 17:37:54 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Aug 8 09:40:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf512406 dev-util/qbs: drop 1.18.0 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-util/qbs/Manifest | 1 - dev-util/qbs/qbs-1.18.0.ebuild | 112 ----------------------------------------- 2 files changed, 113 deletions(-) diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index bfcc02f2c5b5..2d0dd5be8400 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,2 +1 @@ -DIST qbs-src-1.18.0.tar.gz 4921432 BLAKE2B 4c081434596c58d433e52ca9e335e3b4d62b75e401290895719b7fbe4f3c20cf8b34ab0753ae79a34b4e29c8859751a6276da8d6dbd5f3c711581af16ab61415 SHA512 bdef30200c7e74749c363b1d68232fd90d1dfc998722bee0e058ffcaff8e003599e0404b49f86cbeae098d59ccb5663316db5094d77b50a217fcf4ab5ae64d83 DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29 SHA512 b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d diff --git a/dev-util/qbs/qbs-1.18.0.ebuild b/dev-util/qbs/qbs-1.18.0.ebuild deleted file mode 100644 index 5dfbdf982a61..000000000000 --- a/dev-util/qbs/qbs-1.18.0.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils toolchain-funcs - -MY_P=${PN}-src-${PV} - -DESCRIPTION="Modern build tool for software projects" -HOMEPAGE="https://doc.qt.io/qbs/" -SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz" - -LICENSE="|| ( LGPL-2.1 LGPL-3 )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-qt/qtcore:5= - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtscript:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 -" -DEPEND="${RDEPEND} - doc? ( - dev-qt/qdoc:5 - dev-qt/qthelp:5 - ) - test? ( - dev-qt/linguist-tools:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qttest:5 - ) -" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - - if ! use examples; then - sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die - fi - - echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro - - # skip several tests that fail and/or have additional deps - sed -i \ - -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \ - -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \ - -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \ - tests/auto/blackbox/tst_blackbox.cpp || die - sed -i -re '/blackbox-(android|apple|java)\.pro/ d' tests/auto/auto.pro || die -} - -src_configure() { - local myqmakeargs=( - qbs.pro # bug 523218 - -recursive - CONFIG+=qbs_disable_rpath - CONFIG+=qbs_enable_project_file_updates - $(usex test 'CONFIG+=qbs_enable_unit_tests' '') - QBS_INSTALL_PREFIX="${EPREFIX}/usr" - QBS_LIBRARY_DIRNAME="$(get_libdir)" - ) - eqmake5 "${myqmakeargs[@]}" -} - -src_test() { - einfo "Setting up test environment in ${T}" - - export HOME=${T} - export LD_LIBRARY_PATH=${S}/$(get_libdir) - export QBS_AUTOTEST_PROFILE=testProfile - - "${S}"/bin/qbs-setup-toolchains "$(tc-getCC)" testToolchain || die - "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" ${QBS_AUTOTEST_PROFILE} || die - "${S}"/bin/qbs-config profiles.${QBS_AUTOTEST_PROFILE}.qbs.targetPlatform linux || die - - einfo "Running autotests" - - # simply exporting LD_LIBRARY_PATH doesn't work - # we have to use a custom testrunner script - local testrunner=${WORKDIR}/gentoo-testrunner - cat <<-EOF > "${testrunner}" - #!/bin/sh - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}" - exec "\$@" - EOF - chmod +x "${testrunner}" - - emake TESTRUNNER="'${testrunner}'" check -} - -src_install() { - emake -j1 INSTALL_ROOT="${D}" install - - dodoc -r changelogs CONTRIBUTING.md README.md - - # install documentation - if use doc; then - emake docs - dodoc -r doc/qbs/html - dodoc doc/qbs.qch - docompress -x /usr/share/doc/${PF}/qbs.qch - fi -}