Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/
Date: Fri, 03 Jan 2020 05:57:32
Message-Id: 1578031038.c56d4c9de8b543dd245a6b7d38bbd0b32428a12c.pesa@gentoo
1 commit: c56d4c9de8b543dd245a6b7d38bbd0b32428a12c
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 3 03:46:46 2020 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 3 05:57:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56d4c9d
7
8 dev-util/qbs: remove 1.13.1
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
12
13 dev-util/qbs/Manifest | 1 -
14 dev-util/qbs/qbs-1.13.1.ebuild | 123 -----------------------------------------
15 2 files changed, 124 deletions(-)
16
17 diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
18 index b574101fcda..ab1f44a2a46 100644
19 --- a/dev-util/qbs/Manifest
20 +++ b/dev-util/qbs/Manifest
21 @@ -1,3 +1,2 @@
22 DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13 SHA512 eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147
23 -DIST qbs-src-1.13.1.tar.gz 4324622 BLAKE2B d64145f38aea95f4b7539a9652c276f4dddb4af8424142b45df77083c2c8821f0858827c6d8390ca70835e9bbd3eda02163b7e180ebb82eb90976afe727b4dd7 SHA512 1626a218665d380a8030bf4930be857399806643e7868bace6cafe269054ec560eb47e37e358acdb3edbbb15bc8f4ec9af55142d6bfe2ab5db0c8a08aa40d597
24 DIST qbs-src-1.14.1.tar.gz 4365537 BLAKE2B 5a51ddea64023c76b6934634f72ab19d54a3e857efe30d7698a3970d099e436599b53b369d81434cc8e721606513bd487010047e60ccfa289574f606cf020dc5 SHA512 df9031e2749ba598129daef0a6b4322ad964c87a33bfd079bb231170da49c42708740ec63e351607b7e9da1dd11310802b14917eaf2ec97bb747a6df9890f2f3
25
26 diff --git a/dev-util/qbs/qbs-1.13.1.ebuild b/dev-util/qbs/qbs-1.13.1.ebuild
27 deleted file mode 100644
28 index 0ce9c72b16a..00000000000
29 --- a/dev-util/qbs/qbs-1.13.1.ebuild
30 +++ /dev/null
31 @@ -1,123 +0,0 @@
32 -# Copyright 1999-2019 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -inherit qmake-utils
38 -
39 -MY_P=${PN}-src-${PV}
40 -
41 -DESCRIPTION="Modern build tool for software projects"
42 -HOMEPAGE="https://wiki.qt.io/Qbs"
43 -SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
44 -
45 -LICENSE="|| ( LGPL-2.1 LGPL-3 )"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~arm ~x86"
48 -IUSE="doc examples test"
49 -RESTRICT="!test? ( test )"
50 -
51 -# see bug 581874 for the qttest dep in RDEPEND
52 -RDEPEND="
53 - dev-qt/qtcore:5=
54 - dev-qt/qtgui:5
55 - dev-qt/qtnetwork:5
56 - dev-qt/qtscript:5
57 - dev-qt/qtwidgets:5
58 - dev-qt/qtxml:5
59 - test? ( dev-qt/qttest:5 )
60 -"
61 -DEPEND="${RDEPEND}
62 - doc? (
63 - dev-qt/qdoc:5
64 - dev-qt/qthelp:5
65 - )
66 - test? (
67 - dev-qt/linguist-tools:5
68 - dev-qt/qtdbus:5
69 - dev-qt/qtdeclarative:5
70 - )
71 -"
72 -
73 -S=${WORKDIR}/${MY_P}
74 -
75 -src_prepare() {
76 - default
77 -
78 - if ! use examples; then
79 - sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
80 - fi
81 -
82 - # replace hardcoded "lib" with QBS_LIBRARY_DIRNAME
83 - sed -i -e '1i include(src/library_dirname.pri)' \
84 - -e '/qbslibdir =/ s:/lib:/$$QBS_LIBRARY_DIRNAME:' \
85 - static-res.pro || die
86 -
87 - # respect LDFLAGS
88 - sed -i -e '/QMAKE_LFLAGS =/ s/ = / += /' src/lib/library.pri || die
89 -
90 - echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
91 -
92 - # skip several tests that fail and/or have additional deps
93 - sed -i \
94 - -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \
95 - -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \
96 - -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \
97 - -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
98 - tests/auto/blackbox/tst_blackbox.cpp || die
99 -
100 - # requires jdk, fails, bug 585398
101 - sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
102 -}
103 -
104 -src_configure() {
105 - local myqmakeargs=(
106 - qbs.pro # bug 523218
107 - -recursive
108 - CONFIG+=qbs_disable_rpath
109 - CONFIG+=qbs_enable_project_file_updates
110 - $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
111 - QBS_INSTALL_PREFIX="${EPREFIX}/usr"
112 - QBS_LIBRARY_DIRNAME="$(get_libdir)"
113 - )
114 - eqmake5 "${myqmakeargs[@]}"
115 -}
116 -
117 -src_test() {
118 - einfo "Setting up test environment in ${T}"
119 -
120 - export HOME=${T}
121 - export LD_LIBRARY_PATH=${S}/$(get_libdir)
122 - export QBS_AUTOTEST_PROFILE=autotests
123 -
124 - "${S}"/bin/qbs-setup-toolchains --detect || die
125 - "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die
126 -
127 - einfo "Running autotests"
128 -
129 - # simply exporting LD_LIBRARY_PATH doesn't work
130 - # we have to use a custom testrunner script
131 - local testrunner=${WORKDIR}/gentoo-testrunner
132 - cat <<-EOF > "${testrunner}"
133 - #!/bin/sh
134 - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
135 - exec "\$@"
136 - EOF
137 - chmod +x "${testrunner}"
138 -
139 - emake TESTRUNNER="'${testrunner}'" check
140 -}
141 -
142 -src_install() {
143 - emake INSTALL_ROOT="${D}" install
144 -
145 - dodoc -r changelogs
146 -
147 - # install documentation
148 - if use doc; then
149 - emake docs
150 - dodoc -r doc/qbs/html
151 - dodoc doc/qbs.qch
152 - docompress -x /usr/share/doc/${PF}/qbs.qch
153 - fi
154 -}