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: Tue, 18 Jul 2017 18:43:10
Message-Id: 1500403380.b0c4d47a7779e5a7423c212fed0ec9409c4e091f.pesa@gentoo
1 commit: b0c4d47a7779e5a7423c212fed0ec9409c4e091f
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 18 18:42:38 2017 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 18 18:43:00 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c4d47a
7
8 dev-util/qbs: remove old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 dev-util/qbs/Manifest | 1 -
13 dev-util/qbs/qbs-1.7.0.ebuild | 111 ------------------------------------------
14 2 files changed, 112 deletions(-)
15
16 diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
17 index b1428c751dd..ce2c4b4c21d 100644
18 --- a/dev-util/qbs/Manifest
19 +++ b/dev-util/qbs/Manifest
20 @@ -1,4 +1,3 @@
21 DIST qbs-1.8.0.tar.gz 1049245 SHA256 4721f7d4f6411f1609df34b6975bc6b1eac3ffabaccc2b273d3c14586749d697 SHA512 500e2f6fed28327c86012c18d3eaa5b92e41046b6e98005b4d47ff16da24ccfaac0c1bf9f24b69bced2810965b7a852ae0cb9d41c77e547f114e7f88a4306af7 WHIRLPOOL 4b83fc428fb157e13e259611fc1048af802a7883baa27e40725c0bc9f5cf47d0120b533a4e53c0f1254483da2bbb81b9c2061dc077eb11c2f8635f6992e6c062
22 DIST qbs-src-1.4.5.tar.gz 825278 SHA256 f0089b422610cd57d517b146447cd4b45c9f4c4e72797116e3d27472a9cf0d19 SHA512 ed8c75889f44df782ce3b2ca74d3a7b012ff57f765bd8ecc3ca783b5aaa5152d3c13279d6f75417579b9d2ab52e959c1f040c01713b3683b8639501e2880485a WHIRLPOOL 2607ee9e6c2eb1705a8558d1f4023dc6db865d8f7bdbbc4857f44d42243d9ebbad34b95acb51305c1f5a955afd4b87df98a4bc4e5274c1c8562138f32f0c44ca
23 -DIST qbs-src-1.7.0.tar.gz 992213 SHA256 a7271e35f35c015f6deda3bf5b614031019018572cebb9904920f251b583c3ef SHA512 cab913d07be30d147851c9b439cf5b292d4ef92cd0dc23ba184b4f6c476c0d94412581cff79eb7f5525cbb5b940bbe1318f292a585d591124702a1acc863087f WHIRLPOOL e107b2b2a1f233fe2fbb77ebdd31bdf6130ada26a29b4094f6d92cd6cb44039af035791db1830f65b37093529e056f7e1fb80d5b6be74f624992a6bb5ee5f7f6
24 DIST qbs-src-1.8.1.tar.gz 1053395 SHA256 3e94460ecbd1ca43974d62a0ecf691d48866049787c465944866baf52d5b16fc SHA512 2b4657475803e56f911f0bc373692b70f9376ed520499f1c4e7040e4dedddc417bd4e72208c925ed7fdc7fcf0b96434dab8d8f87c454ae08da80d6438dbcbc5c WHIRLPOOL 1a5fa2cc7518b3b324d163224b259e7f44b91599e58ff3c9e2d52d3322d68b0fbb2b0e0ec5abee17e95a4a51a00d10a84397a49d5cf31ec37fbab4759dba7259
25
26 diff --git a/dev-util/qbs/qbs-1.7.0.ebuild b/dev-util/qbs/qbs-1.7.0.ebuild
27 deleted file mode 100644
28 index 5f4b6e25c99..00000000000
29 --- a/dev-util/qbs/qbs-1.7.0.ebuild
30 +++ /dev/null
31 @@ -1,111 +0,0 @@
32 -# Copyright 1999-2016 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="Cross-platform build tool"
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 - if ! use examples; then
74 - sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
75 - fi
76 -
77 - if use test; then
78 - sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
79 - else
80 - sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
81 - fi
82 -
83 - # skip several tests that fail and/or have additional deps
84 - sed -i \
85 - -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \
86 - -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \
87 - -e 's/p\.value("java\./true||&/' `# requires jdk, fails, bug 585398` \
88 - -e 's/!haveMakeNsis/true/' `# requires nsis` \
89 - -e 's/!haveWiX(profile)/true/' `# requires wix` \
90 - -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \
91 - -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
92 - tests/auto/blackbox/tst_blackbox.cpp || die
93 -}
94 -
95 -src_configure() {
96 - local myqmakeargs=(
97 - qbs.pro # bug 523218
98 - -recursive
99 - CONFIG+=qbs_disable_rpath
100 - CONFIG+=qbs_enable_project_file_updates
101 - $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
102 - QBS_INSTALL_PREFIX="${EPREFIX}/usr"
103 - QBS_LIBRARY_DIRNAME="$(get_libdir)"
104 - )
105 - eqmake5 "${myqmakeargs[@]}"
106 -}
107 -
108 -src_test() {
109 - einfo "Setting up test environment in ${T}"
110 -
111 - export HOME=${T}
112 - export LD_LIBRARY_PATH=${S}/$(get_libdir)
113 -
114 - "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die
115 - "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
116 -
117 - einfo "Running autotests"
118 -
119 - # simply exporting LD_LIBRARY_PATH doesn't work
120 - # we have to use a custom testrunner script
121 - local testrunner=${WORKDIR}/gentoo-testrunner
122 - cat <<-EOF > "${testrunner}"
123 - #!/bin/sh
124 - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
125 - exec "\$@"
126 - EOF
127 - chmod +x "${testrunner}"
128 -
129 - emake TESTRUNNER="'${testrunner}'" check
130 -}
131 -
132 -src_install() {
133 - emake INSTALL_ROOT="${D}" install
134 -
135 - # install documentation
136 - if use doc; then
137 - emake docs
138 - dodoc -r doc/html
139 - dodoc doc/qbs.qch
140 - docompress -x /usr/share/doc/${PF}/qbs.qch
141 - fi
142 -}