Gentoo Archives: gentoo-commits

From: "Davide Pesavento (pesa)" <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/qbs: qbs-1.4.0.ebuild ChangeLog qbs-1.3.4.ebuild
Date: Tue, 28 Apr 2015 16:08:36
Message-Id: 20150428160829.3B20399F@oystercatcher.gentoo.org
1 pesa 15/04/28 16:08:28
2
3 Modified: ChangeLog
4 Added: qbs-1.4.0.ebuild
5 Removed: qbs-1.3.4.ebuild
6 Log:
7 Version bump. Also enable the API for updating project files, required by qt-creator[qbs], thanks to Dennis Schridde in bug 537244.
8
9 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
10
11 Revision Changes Path
12 1.14 dev-util/qbs/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/ChangeLog?rev=1.14&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/ChangeLog?rev=1.14&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/ChangeLog?r1=1.13&r2=1.14
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v
21 retrieving revision 1.13
22 retrieving revision 1.14
23 diff -u -r1.13 -r1.14
24 --- ChangeLog 18 Mar 2015 20:39:40 -0000 1.13
25 +++ ChangeLog 28 Apr 2015 16:08:28 -0000 1.14
26 @@ -1,6 +1,13 @@
27 # ChangeLog for dev-util/qbs
28 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.13 2015/03/18 20:39:40 pesa Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.14 2015/04/28 16:08:28 pesa Exp $
31 +
32 +*qbs-1.4.0 (28 Apr 2015)
33 +
34 + 28 Apr 2015; Davide Pesavento <pesa@g.o> +qbs-1.4.0.ebuild,
35 + -qbs-1.3.4.ebuild:
36 + Version bump. Also enable the API for updating project files, required by qt-
37 + creator[qbs], thanks to Dennis Schridde in bug 537244.
38
39 *qbs-1.3.4 (18 Mar 2015)
40
41
42
43
44 1.1 dev-util/qbs/qbs-1.4.0.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/qbs-1.4.0.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/qbs-1.4.0.ebuild?rev=1.1&content-type=text/plain
48
49 Index: qbs-1.4.0.ebuild
50 ===================================================================
51 # Copyright 1999-2015 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.0.ebuild,v 1.1 2015/04/28 16:08:28 pesa Exp $
54
55 EAPI=5
56
57 inherit multilib pax-utils qmake-utils
58
59 DESCRIPTION="Qt Build Suite"
60 HOMEPAGE="http://wiki.qt.io/Qbs"
61 SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${P}.src.tar.gz"
62
63 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
64 SLOT="0"
65 KEYWORDS="~amd64 ~arm ~x86"
66 IUSE="doc test"
67
68 RDEPEND="
69 dev-qt/qtcore:5
70 dev-qt/qtgui:5
71 dev-qt/qtscript:5
72 dev-qt/qtwidgets:5
73 dev-qt/qtxml:5
74 "
75 DEPEND="${RDEPEND}
76 doc? (
77 dev-qt/qdoc:5
78 dev-qt/qthelp:5
79 )
80 test? (
81 dev-qt/qtdeclarative:5
82 dev-qt/qttest:5
83 )
84 "
85
86 src_prepare() {
87 # fix plugins libdir
88 sed -i -e "/destdirPrefix/ s:/lib:/$(get_libdir):" \
89 src/plugins/plugins.pri || die
90
91 # disable tests that require nodejs (bug 527652)
92 sed -i -e 's/!haveNodeJs()/true/' \
93 tests/auto/blackbox/tst_blackbox.cpp || die
94
95 if use test; then
96 sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
97 else
98 sed -i -e '/SUBDIRS =/ d' tests/tests.pro || die
99 fi
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 QBS_INSTALL_PREFIX="${EPREFIX}/usr"
109 QBS_LIBRARY_DIRNAME="$(get_libdir)"
110 )
111 eqmake5 "${myqmakeargs[@]}"
112 }
113
114 src_compile() {
115 default
116
117 # disable mprotect wrt bug 526664
118 pax-mark m "${S}"/bin/qbs{,-config,-config-ui}
119 }
120
121 src_test() {
122 # disable mprotect wrt bug 526664
123 pax-mark m "${S}"/bin/tst_*
124
125 einfo "Setting up test environment in ${T}"
126
127 export HOME=${T}
128 export LD_LIBRARY_PATH=${S}/$(get_libdir)
129
130 "${S}"/bin/qbs-setup-toolchains "${EROOT}usr/bin/gcc" gcc || die
131 "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die
132
133 einfo "Running autotests"
134 default
135 }
136
137 src_install() {
138 emake INSTALL_ROOT="${D}" install
139
140 # install documentation
141 if use doc; then
142 emake docs
143 dodoc -r doc/html
144 dodoc doc/qbs.qch
145 docompress -x /usr/share/doc/${PF}/qbs.qch
146 fi
147 }