Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/
Date: Mon, 08 Aug 2022 09:40:40
Message-Id: 1659951618.cf51240663192e974801725e2a3be8f4d4efdc88.asturm@gentoo
1 commit: cf51240663192e974801725e2a3be8f4d4efdc88
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 25 17:37:54 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 8 09:40:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf512406
7
8 dev-util/qbs: drop 1.18.0
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 dev-util/qbs/Manifest | 1 -
13 dev-util/qbs/qbs-1.18.0.ebuild | 112 -----------------------------------------
14 2 files changed, 113 deletions(-)
15
16 diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
17 index bfcc02f2c5b5..2d0dd5be8400 100644
18 --- a/dev-util/qbs/Manifest
19 +++ b/dev-util/qbs/Manifest
20 @@ -1,2 +1 @@
21 -DIST qbs-src-1.18.0.tar.gz 4921432 BLAKE2B 4c081434596c58d433e52ca9e335e3b4d62b75e401290895719b7fbe4f3c20cf8b34ab0753ae79a34b4e29c8859751a6276da8d6dbd5f3c711581af16ab61415 SHA512 bdef30200c7e74749c363b1d68232fd90d1dfc998722bee0e058ffcaff8e003599e0404b49f86cbeae098d59ccb5663316db5094d77b50a217fcf4ab5ae64d83
22 DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29 SHA512 b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d
23
24 diff --git a/dev-util/qbs/qbs-1.18.0.ebuild b/dev-util/qbs/qbs-1.18.0.ebuild
25 deleted file mode 100644
26 index 5dfbdf982a61..000000000000
27 --- a/dev-util/qbs/qbs-1.18.0.ebuild
28 +++ /dev/null
29 @@ -1,112 +0,0 @@
30 -# Copyright 1999-2021 Gentoo Authors
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=7
34 -
35 -inherit qmake-utils toolchain-funcs
36 -
37 -MY_P=${PN}-src-${PV}
38 -
39 -DESCRIPTION="Modern build tool for software projects"
40 -HOMEPAGE="https://doc.qt.io/qbs/"
41 -SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
42 -
43 -LICENSE="|| ( LGPL-2.1 LGPL-3 )"
44 -SLOT="0"
45 -KEYWORDS="~amd64 ~arm ~x86"
46 -IUSE="doc examples test"
47 -RESTRICT="!test? ( test )"
48 -
49 -RDEPEND="
50 - dev-qt/qtcore:5=
51 - dev-qt/qtgui:5
52 - dev-qt/qtnetwork:5
53 - dev-qt/qtscript:5
54 - dev-qt/qtwidgets:5
55 - dev-qt/qtxml:5
56 -"
57 -DEPEND="${RDEPEND}
58 - doc? (
59 - dev-qt/qdoc:5
60 - dev-qt/qthelp:5
61 - )
62 - test? (
63 - dev-qt/linguist-tools:5
64 - dev-qt/qtdbus:5
65 - dev-qt/qtdeclarative:5
66 - dev-qt/qttest:5
67 - )
68 -"
69 -
70 -S=${WORKDIR}/${MY_P}
71 -
72 -src_prepare() {
73 - default
74 -
75 - if ! use examples; then
76 - sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
77 - fi
78 -
79 - echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
80 -
81 - # skip several tests that fail and/or have additional deps
82 - sed -i \
83 - -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \
84 - -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \
85 - -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
86 - tests/auto/blackbox/tst_blackbox.cpp || die
87 - sed -i -re '/blackbox-(android|apple|java)\.pro/ d' tests/auto/auto.pro || die
88 -}
89 -
90 -src_configure() {
91 - local myqmakeargs=(
92 - qbs.pro # bug 523218
93 - -recursive
94 - CONFIG+=qbs_disable_rpath
95 - CONFIG+=qbs_enable_project_file_updates
96 - $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
97 - QBS_INSTALL_PREFIX="${EPREFIX}/usr"
98 - QBS_LIBRARY_DIRNAME="$(get_libdir)"
99 - )
100 - eqmake5 "${myqmakeargs[@]}"
101 -}
102 -
103 -src_test() {
104 - einfo "Setting up test environment in ${T}"
105 -
106 - export HOME=${T}
107 - export LD_LIBRARY_PATH=${S}/$(get_libdir)
108 - export QBS_AUTOTEST_PROFILE=testProfile
109 -
110 - "${S}"/bin/qbs-setup-toolchains "$(tc-getCC)" testToolchain || die
111 - "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" ${QBS_AUTOTEST_PROFILE} || die
112 - "${S}"/bin/qbs-config profiles.${QBS_AUTOTEST_PROFILE}.qbs.targetPlatform linux || die
113 -
114 - einfo "Running autotests"
115 -
116 - # simply exporting LD_LIBRARY_PATH doesn't work
117 - # we have to use a custom testrunner script
118 - local testrunner=${WORKDIR}/gentoo-testrunner
119 - cat <<-EOF > "${testrunner}"
120 - #!/bin/sh
121 - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
122 - exec "\$@"
123 - EOF
124 - chmod +x "${testrunner}"
125 -
126 - emake TESTRUNNER="'${testrunner}'" check
127 -}
128 -
129 -src_install() {
130 - emake -j1 INSTALL_ROOT="${D}" install
131 -
132 - dodoc -r changelogs CONTRIBUTING.md README.md
133 -
134 - # install documentation
135 - if use doc; then
136 - emake docs
137 - dodoc -r doc/qbs/html
138 - dodoc doc/qbs.qch
139 - docompress -x /usr/share/doc/${PF}/qbs.qch
140 - fi
141 -}