1 |
commit: 4ce477216d0ad384fee5bb963ef72177ad6e8346 |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 24 01:29:13 2018 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 24 01:29:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ce47721 |
7 |
|
8 |
dev-util/qbs: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
dev-util/qbs/Manifest | 2 - |
13 |
dev-util/qbs/qbs-1.10.0.ebuild | 120 ----------------------------------------- |
14 |
dev-util/qbs/qbs-1.9.1.ebuild | 115 --------------------------------------- |
15 |
3 files changed, 237 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest |
18 |
index 8941a147af4..44d5445ca18 100644 |
19 |
--- a/dev-util/qbs/Manifest |
20 |
+++ b/dev-util/qbs/Manifest |
21 |
@@ -1,3 +1 @@ |
22 |
-DIST qbs-src-1.10.0.tar.gz 4130630 BLAKE2B 9a692dc3cd65cbe8b8f09ca86e8da1ea47fa6770dbcdfc5fc34d65156f8a92932893fa382f510e516fe67a77b95024052d442d3e295a22423a544b61ff2eaf25 SHA512 a7d15acb46b5b32f0c54b40e4a5469f68cdcff54b062a46656174694d7abbade682b66f5dc4cdfa9ac87b9573ed3947d775d55638cfc1b4ffc24101ebea85618 |
23 |
DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8 SHA512 e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac |
24 |
-DIST qbs-src-1.9.1.tar.gz 4007946 BLAKE2B fa7744a321fec2f7b928b89e511aa542d935a61af79714d730e0c4c5fdab1f62e0da5cccf055622997cfbe441e5375212aa9cd8af3b1d69af933c438c94b8d21 SHA512 6b400a06b4f2c2cb531095a0c3eadb112335fe0f91c2077f01c7d2dc6ea329d250e7af70f70ebeb972368aa8fa0ee9548b84b75dc877230de6dea0b10468b7fd |
25 |
|
26 |
diff --git a/dev-util/qbs/qbs-1.10.0.ebuild b/dev-util/qbs/qbs-1.10.0.ebuild |
27 |
deleted file mode 100644 |
28 |
index 5b93b79331c..00000000000 |
29 |
--- a/dev-util/qbs/qbs-1.10.0.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,120 +0,0 @@ |
32 |
-# Copyright 1999-2017 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=6 |
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 |
- |
50 |
-# see bug 581874 for the qttest dep in RDEPEND |
51 |
-RDEPEND=" |
52 |
- dev-qt/qtcore:5= |
53 |
- dev-qt/qtgui:5 |
54 |
- dev-qt/qtnetwork:5 |
55 |
- dev-qt/qtscript:5 |
56 |
- dev-qt/qtwidgets:5 |
57 |
- dev-qt/qtxml:5 |
58 |
- test? ( dev-qt/qttest:5 ) |
59 |
-" |
60 |
-DEPEND="${RDEPEND} |
61 |
- doc? ( |
62 |
- dev-qt/qdoc:5 |
63 |
- dev-qt/qthelp:5 |
64 |
- ) |
65 |
- test? ( dev-qt/qtdeclarative:5 ) |
66 |
-" |
67 |
- |
68 |
-S=${WORKDIR}/${MY_P} |
69 |
- |
70 |
-src_prepare() { |
71 |
- default |
72 |
- |
73 |
- # don't add /usr/include to INCLUDEPATH |
74 |
- # avoids a build failure in qt-creator with gcc-6 (bug 618424) |
75 |
- sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die |
76 |
- |
77 |
- if ! use examples; then |
78 |
- sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die |
79 |
- fi |
80 |
- |
81 |
- if use test; then |
82 |
- sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die |
83 |
- else |
84 |
- sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die |
85 |
- fi |
86 |
- |
87 |
- # TestApi seems broken in 1.10.0 |
88 |
- sed -i -e '/\<api\>/ d' tests/auto/auto.pro || die |
89 |
- |
90 |
- # skip several tests that fail and/or have additional deps |
91 |
- sed -i \ |
92 |
- -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \ |
93 |
- -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \ |
94 |
- -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \ |
95 |
- -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \ |
96 |
- tests/auto/blackbox/tst_blackbox.cpp || die |
97 |
- |
98 |
- # requires jdk, fails, bug 585398 |
99 |
- sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die |
100 |
-} |
101 |
- |
102 |
-src_configure() { |
103 |
- local myqmakeargs=( |
104 |
- qbs.pro # bug 523218 |
105 |
- -recursive |
106 |
- CONFIG+=qbs_disable_rpath |
107 |
- CONFIG+=qbs_enable_project_file_updates |
108 |
- $(usex test 'CONFIG+=qbs_enable_unit_tests' '') |
109 |
- QBS_INSTALL_PREFIX="${EPREFIX}/usr" |
110 |
- QBS_LIBRARY_DIRNAME="$(get_libdir)" |
111 |
- ) |
112 |
- eqmake5 "${myqmakeargs[@]}" |
113 |
-} |
114 |
- |
115 |
-src_test() { |
116 |
- einfo "Setting up test environment in ${T}" |
117 |
- |
118 |
- export HOME=${T} |
119 |
- export LD_LIBRARY_PATH=${S}/$(get_libdir) |
120 |
- |
121 |
- "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die |
122 |
- "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die |
123 |
- |
124 |
- einfo "Running autotests" |
125 |
- |
126 |
- # simply exporting LD_LIBRARY_PATH doesn't work |
127 |
- # we have to use a custom testrunner script |
128 |
- local testrunner=${WORKDIR}/gentoo-testrunner |
129 |
- cat <<-EOF > "${testrunner}" |
130 |
- #!/bin/sh |
131 |
- export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}" |
132 |
- exec "\$@" |
133 |
- EOF |
134 |
- chmod +x "${testrunner}" |
135 |
- |
136 |
- emake TESTRUNNER="'${testrunner}'" check |
137 |
-} |
138 |
- |
139 |
-src_install() { |
140 |
- emake INSTALL_ROOT="${D}" install |
141 |
- |
142 |
- dodoc -r changelogs |
143 |
- |
144 |
- # install documentation |
145 |
- if use doc; then |
146 |
- emake docs |
147 |
- dodoc -r doc/qbs/html |
148 |
- dodoc doc/qbs.qch |
149 |
- docompress -x /usr/share/doc/${PF}/qbs.qch |
150 |
- fi |
151 |
-} |
152 |
|
153 |
diff --git a/dev-util/qbs/qbs-1.9.1.ebuild b/dev-util/qbs/qbs-1.9.1.ebuild |
154 |
deleted file mode 100644 |
155 |
index cba25cda6a7..00000000000 |
156 |
--- a/dev-util/qbs/qbs-1.9.1.ebuild |
157 |
+++ /dev/null |
158 |
@@ -1,115 +0,0 @@ |
159 |
-# Copyright 1999-2018 Gentoo Foundation |
160 |
-# Distributed under the terms of the GNU General Public License v2 |
161 |
- |
162 |
-EAPI=6 |
163 |
- |
164 |
-inherit qmake-utils |
165 |
- |
166 |
-MY_P=${PN}-src-${PV} |
167 |
- |
168 |
-DESCRIPTION="Modern build tool for software projects" |
169 |
-HOMEPAGE="https://wiki.qt.io/Qbs" |
170 |
-SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz" |
171 |
- |
172 |
-LICENSE="|| ( LGPL-2.1 LGPL-3 )" |
173 |
-SLOT="0" |
174 |
-KEYWORDS="amd64 ~arm ~x86" |
175 |
-IUSE="doc examples test" |
176 |
- |
177 |
-# see bug 581874 for the qttest dep in RDEPEND |
178 |
-RDEPEND=" |
179 |
- dev-qt/qtcore:5= |
180 |
- dev-qt/qtgui:5 |
181 |
- dev-qt/qtnetwork:5 |
182 |
- dev-qt/qtscript:5 |
183 |
- dev-qt/qtwidgets:5 |
184 |
- dev-qt/qtxml:5 |
185 |
- test? ( dev-qt/qttest:5 ) |
186 |
-" |
187 |
-DEPEND="${RDEPEND} |
188 |
- doc? ( |
189 |
- dev-qt/qdoc:5 |
190 |
- dev-qt/qthelp:5 |
191 |
- ) |
192 |
- test? ( dev-qt/qtdeclarative:5 ) |
193 |
-" |
194 |
- |
195 |
-S=${WORKDIR}/${MY_P} |
196 |
- |
197 |
-src_prepare() { |
198 |
- default |
199 |
- |
200 |
- # don't add /usr/include to INCLUDEPATH |
201 |
- # avoids a build failure in qt-creator with gcc-6 (bug 618424) |
202 |
- sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die |
203 |
- |
204 |
- if ! use examples; then |
205 |
- sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die |
206 |
- fi |
207 |
- |
208 |
- if use test; then |
209 |
- sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die |
210 |
- else |
211 |
- sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die |
212 |
- fi |
213 |
- |
214 |
- # skip several tests that fail and/or have additional deps |
215 |
- sed -i \ |
216 |
- -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \ |
217 |
- -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \ |
218 |
- -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \ |
219 |
- -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \ |
220 |
- tests/auto/blackbox/tst_blackbox.cpp || die |
221 |
- |
222 |
- # requires jdk, fails, bug 585398 |
223 |
- sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die |
224 |
-} |
225 |
- |
226 |
-src_configure() { |
227 |
- local myqmakeargs=( |
228 |
- qbs.pro # bug 523218 |
229 |
- -recursive |
230 |
- CONFIG+=qbs_disable_rpath |
231 |
- CONFIG+=qbs_enable_project_file_updates |
232 |
- $(usex test 'CONFIG+=qbs_enable_unit_tests' '') |
233 |
- QBS_INSTALL_PREFIX="${EPREFIX}/usr" |
234 |
- QBS_LIBRARY_DIRNAME="$(get_libdir)" |
235 |
- ) |
236 |
- eqmake5 "${myqmakeargs[@]}" |
237 |
-} |
238 |
- |
239 |
-src_test() { |
240 |
- einfo "Setting up test environment in ${T}" |
241 |
- |
242 |
- export HOME=${T} |
243 |
- export LD_LIBRARY_PATH=${S}/$(get_libdir) |
244 |
- |
245 |
- "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die |
246 |
- "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die |
247 |
- |
248 |
- einfo "Running autotests" |
249 |
- |
250 |
- # simply exporting LD_LIBRARY_PATH doesn't work |
251 |
- # we have to use a custom testrunner script |
252 |
- local testrunner=${WORKDIR}/gentoo-testrunner |
253 |
- cat <<-EOF > "${testrunner}" |
254 |
- #!/bin/sh |
255 |
- export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}" |
256 |
- exec "\$@" |
257 |
- EOF |
258 |
- chmod +x "${testrunner}" |
259 |
- |
260 |
- emake TESTRUNNER="'${testrunner}'" check |
261 |
-} |
262 |
- |
263 |
-src_install() { |
264 |
- emake INSTALL_ROOT="${D}" install |
265 |
- |
266 |
- # install documentation |
267 |
- if use doc; then |
268 |
- emake docs |
269 |
- dodoc -r doc/qbs/html |
270 |
- dodoc doc/qbs.qch |
271 |
- docompress -x /usr/share/doc/${PF}/qbs.qch |
272 |
- fi |
273 |
-} |