From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/
Date: Sun, 12 May 2024 20:25:57 +0000 (UTC) [thread overview]
Message-ID: <1715544209.10407b2da20749668473d648bd12dbbb8778c7dd.ionen@gentoo> (raw)
commit: 10407b2da20749668473d648bd12dbbb8778c7dd
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 20:03:29 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun May 12 20:03:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10407b2d
dev-util/qbs: drop 1.19.1, 2.3.0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-util/qbs/Manifest | 2 -
dev-util/qbs/qbs-1.19.1.ebuild | 124 -----------------------------------------
dev-util/qbs/qbs-2.3.0.ebuild | 81 ---------------------------
3 files changed, 207 deletions(-)
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 15ea255dec65..f1834e3241d5 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1 @@
-DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29 SHA512 b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d
-DIST qbs-src-2.3.0.tar.gz 5615799 BLAKE2B f7e10d1dffe7d188c4ab5c6ed1b02837b41044f93083e052105638ed3c091a5be2d4f3bffeb39238baf6e8a1ba2cfc316fefea5f80871c851be3d7c873847c74 SHA512 6611ce02b0dc4f4a0cc68a13a7c684c07061d3fff57d2ca16470fffa253ff23f45349d86ad4ba4c0eab681f74f3c92cddd85daedf1f31fd1a7eae5bddb606cb6
DIST qbs-src-2.3.1.tar.gz 5614581 BLAKE2B 92fa24d75248a3732cbd99b660141e56654574f1388d50d5359afef7b442889fa59c4ab4f029f055ee618c0222f94faba47ae9fff85f0fae26e95f2ba34995f9 SHA512 27ba33805b942cf8180e55bdd6c37ccfd2aeaa2e8c01ca7e7485720030dfad7c5f1a3f92b77bff97a7ebf8878e455758c8729005e8b03959d18106f945d8d42c
diff --git a/dev-util/qbs/qbs-1.19.1.ebuild b/dev-util/qbs/qbs-1.19.1.ebuild
deleted file mode 100644
index 28e160fd13ed..000000000000
--- a/dev-util/qbs/qbs-1.19.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="https://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc examples gui test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-qt/qtcore:5=
- dev-qt/qtnetwork:5
- dev-qt/qtscript:5
- dev-qt/qtxml:5
- gui? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/linguist-tools:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qttest:5
- )
-"
-BDEPEND="
- dev-qt/qtcore:5
- doc? (
- dev-qt/qdoc:5
- dev-qt/qthelp:5
- )
-"
-
-src_prepare() {
- default
-
- if ! use examples; then
- sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
- fi
-
- if ! use gui; then
- sed -i -e '/SUBDIRS += config-ui/ d' src/app/app.pro || die
- fi
-
- echo "SUBDIRS = $(usev test auto)" >> tests/tests.pro
-
- # skip several tests that fail and/or have additional deps
- local SKIP_TESTS_ARGS=(
- # requires zip and jar
- -e 's/findArchiver(binaryName,.*/"";/'
- # requires nodejs, bug 527652
- -e 's/p\.value("nodejs\./true||&/'
- # requires nodejs and typescript
- -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/'
- )
- sed -i tests/auto/blackbox/tst_blackbox.cpp "${SKIP_TESTS_ARGS[@]}" || 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
- $(usev 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
-}
diff --git a/dev-util/qbs/qbs-2.3.0.ebuild b/dev-util/qbs/qbs-2.3.0.ebuild
deleted file mode 100644
index c00fae7ed834..000000000000
--- a/dev-util/qbs/qbs-2.3.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic python-any-r1
-
-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 knowlege 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 is
- # not worth worrying about affected tests here (even if notable).
- tst_api
- tst_blackbox # also skips blackbox-* (intended)
- tst_language
-)
-
-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
-
- 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)"
- -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
-}
next reply other threads:[~2024-05-12 20:26 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-12 20:25 Ionen Wolkens [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-28 15:52 [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/ Arthur Zamarin
2025-06-27 22:01 Ionen Wolkens
2025-04-27 10:52 Ionen Wolkens
2025-03-13 8:59 Sam James
2025-02-22 3:07 Ionen Wolkens
2025-01-24 7:43 Ionen Wolkens
2025-01-24 7:43 Ionen Wolkens
2024-12-25 22:19 Jakov Smolić
2024-12-03 8:58 Ionen Wolkens
2024-11-04 16:15 Ionen Wolkens
2024-10-22 8:04 Jakov Smolić
2024-10-02 4:35 Ionen Wolkens
2024-09-25 12:48 Joonas Niilola
2024-09-13 23:25 Ionen Wolkens
2024-08-31 13:53 Ionen Wolkens
2024-05-30 15:52 Ionen Wolkens
2024-05-13 5:49 Ionen Wolkens
2024-05-07 19:34 Ionen Wolkens
2024-05-05 2:41 Ionen Wolkens
2024-05-05 2:41 Ionen Wolkens
2023-08-30 6:33 Sam James
2022-08-08 9:40 Andreas Sturmlechner
2021-07-10 21:00 Davide Pesavento
2021-07-10 21:00 Davide Pesavento
2021-01-13 7:02 Davide Pesavento
2021-01-13 7:02 Davide Pesavento
2020-06-30 23:31 Davide Pesavento
2020-01-03 5:57 Davide Pesavento
2020-01-03 5:57 Davide Pesavento
2019-11-28 19:24 Davide Pesavento
2019-11-28 18:53 Davide Pesavento
2019-06-23 18:51 Davide Pesavento
2019-06-23 0:49 Davide Pesavento
2019-06-07 5:10 Davide Pesavento
2019-06-07 5:10 Davide Pesavento
2019-04-28 19:37 Davide Pesavento
2018-12-23 18:42 Davide Pesavento
2018-12-15 22:01 Davide Pesavento
2018-07-20 4:46 Davide Pesavento
2018-07-20 2:58 Davide Pesavento
2018-07-20 2:58 Davide Pesavento
2018-05-13 3:26 Davide Pesavento
2018-04-30 3:09 Davide Pesavento
2018-04-30 3:09 Davide Pesavento
2018-03-24 1:29 Davide Pesavento
2018-03-24 1:25 Davide Pesavento
2018-03-16 20:07 Davide Pesavento
2018-01-23 23:06 Davide Pesavento
2017-12-11 1:23 Davide Pesavento
2017-10-05 19:33 Davide Pesavento
2017-10-05 19:08 Davide Pesavento
2017-09-16 21:02 Davide Pesavento
2017-09-16 21:02 Davide Pesavento
2017-08-19 17:15 Davide Pesavento
2017-07-18 18:43 Davide Pesavento
2017-07-18 18:23 Davide Pesavento
2017-05-27 16:48 Davide Pesavento
2017-05-27 0:25 Davide Pesavento
2017-05-26 10:30 David Seifert
2017-05-26 10:00 David Seifert
2017-05-26 5:00 Davide Pesavento
2017-03-14 22:33 Davide Pesavento
2016-12-17 5:06 Davide Pesavento
2016-11-22 9:08 Davide Pesavento
2016-11-21 20:18 Davide Pesavento
2016-09-11 11:44 Davide Pesavento
2016-07-09 14:06 Davide Pesavento
2016-06-16 15:03 Davide Pesavento
2016-06-16 13:57 Michael Palimaka
2016-06-16 11:31 Davide Pesavento
2016-06-16 6:07 Patrick Lauer
2016-06-16 0:57 Davide Pesavento
2016-06-10 1:45 Davide Pesavento
2016-06-10 1:45 Davide Pesavento
2016-06-10 0:54 Davide Pesavento
2016-06-10 0:54 Davide Pesavento
2016-05-12 17:39 Davide Pesavento
2016-05-12 14:13 Davide Pesavento
2016-05-12 14:13 Davide Pesavento
2016-04-02 18:40 Davide Pesavento
2015-12-17 2:34 Davide Pesavento
2015-11-20 0:04 Davide Pesavento
2015-10-18 1:48 Davide Pesavento
2015-09-13 23:00 Davide Pesavento
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1715544209.10407b2da20749668473d648bd12dbbb8778c7dd.ionen@gentoo \
--to=ionen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox