Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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-python/PyQt4: metadata.xml PyQt4-4.9.6-r1.ebuild ChangeLog
Date: Wed, 26 Dec 2012 03:12:15
Message-Id: 20121226031143.ACC102171D@flycatcher.gentoo.org
1 pesa 12/12/26 03:11:43
2
3 Modified: metadata.xml ChangeLog
4 Added: PyQt4-4.9.6-r1.ebuild
5 Log:
6 EAPI=5 to be able to use slot operators in sip dependency. Sync USE flags with pyside: rename assistant to help, add script and scripttools (bug 431460 by Arfrever).
7
8 (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)
9
10 Revision Changes Path
11 1.12 dev-python/PyQt4/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/metadata.xml?rev=1.12&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/metadata.xml?rev=1.12&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/metadata.xml?r1=1.11&r2=1.12
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/metadata.xml,v
20 retrieving revision 1.11
21 retrieving revision 1.12
22 diff -u -r1.11 -r1.12
23 --- metadata.xml 13 May 2012 14:08:01 -0000 1.11
24 +++ metadata.xml 26 Dec 2012 03:11:43 -0000 1.12
25 @@ -7,10 +7,13 @@
26 <flag name="X">Build QtGui, QtDesigner and QtScriptTools modules</flag>
27 <flag name="assistant">Build QtHelp and QtAssistant modules</flag>
28 <flag name="declarative">Build QtDeclarative module</flag>
29 + <flag name="help">Build QtHelp module</flag>
30 <flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag>
31 <flag name="multimedia">Build QtMultimedia module</flag>
32 <flag name="opengl">Build QtOpenGL module</flag>
33 <flag name="phonon">Build phonon module</flag>
34 + <flag name="script">Build QtScript module</flag>
35 + <flag name="scripttools">Build QtScriptTools module</flag>
36 <flag name="sql">Build QtSql module</flag>
37 <flag name="svg">Build QtSvg module</flag>
38 <flag name="webkit">Build QtWebKit module</flag>
39
40
41
42 1.204 dev-python/PyQt4/ChangeLog
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.204&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.204&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?r1=1.203&r2=1.204
47
48 Index: ChangeLog
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v
51 retrieving revision 1.203
52 retrieving revision 1.204
53 diff -u -r1.203 -r1.204
54 --- ChangeLog 10 Dec 2012 11:20:38 -0000 1.203
55 +++ ChangeLog 26 Dec 2012 03:11:43 -0000 1.204
56 @@ -1,6 +1,14 @@
57 # ChangeLog for dev-python/PyQt4
58 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
59 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.203 2012/12/10 11:20:38 pesa Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.204 2012/12/26 03:11:43 pesa Exp $
61 +
62 +*PyQt4-4.9.6-r1 (26 Dec 2012)
63 +
64 + 26 Dec 2012; Davide Pesavento <pesa@g.o> +PyQt4-4.9.6-r1.ebuild,
65 + metadata.xml:
66 + EAPI=5 to be able to use slot operators in sip dependency. Sync USE flags with
67 + pyside: rename assistant to help, add script and scripttools (bug 431460 by
68 + Arfrever).
69
70 *PyQt4-4.9.6 (10 Dec 2012)
71
72
73
74
75 1.1 dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild
76
77 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild?rev=1.1&view=markup
78 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild?rev=1.1&content-type=text/plain
79
80 Index: PyQt4-4.9.6-r1.ebuild
81 ===================================================================
82 # Copyright 1999-2012 Gentoo Foundation
83 # Distributed under the terms of the GNU General Public License v2
84 # $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild,v 1.1 2012/12/26 03:11:43 pesa Exp $
85
86 EAPI=5
87
88 PYTHON_DEPEND="*"
89 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
90 SUPPORT_PYTHON_ABIS="1"
91 RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
92
93 inherit eutils qt4-r2 python toolchain-funcs
94
95 DESCRIPTION="Python bindings for the Qt toolkit"
96 HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
97
98 if [[ ${PV} == *_pre* ]]; then
99 MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
100 SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
101 else
102 MY_P="PyQt-x11-gpl-${PV}"
103 SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
104 fi
105
106 LICENSE="|| ( GPL-2 GPL-3 )"
107 SLOT="0"
108 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
109
110 IUSE="X dbus debug declarative doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
111
112 REQUIRED_USE="
113 declarative? ( X )
114 help? ( X )
115 multimedia? ( X )
116 opengl? ( X )
117 phonon? ( X )
118 scripttools? ( X script )
119 sql? ( X )
120 svg? ( X )
121 webkit? ( X )
122 "
123
124 # Minimal supported version of Qt.
125 QT_PV="4.8.0:4"
126
127 RDEPEND="
128 >=dev-python/sip-4.14.2:=
129 >=x11-libs/qt-core-${QT_PV}
130 X? (
131 >=x11-libs/qt-gui-${QT_PV}[dbus?]
132 >=x11-libs/qt-test-${QT_PV}
133 )
134 dbus? (
135 >=dev-python/dbus-python-0.80
136 >=x11-libs/qt-dbus-${QT_PV}
137 )
138 declarative? ( >=x11-libs/qt-declarative-${QT_PV} )
139 help? ( >=x11-libs/qt-assistant-${QT_PV} )
140 multimedia? ( >=x11-libs/qt-multimedia-${QT_PV} )
141 opengl? ( >=x11-libs/qt-opengl-${QT_PV} )
142 phonon? (
143 kde? ( media-libs/phonon )
144 !kde? ( || ( >=x11-libs/qt-phonon-${QT_PV} media-libs/phonon ) )
145 )
146 script? ( >=x11-libs/qt-script-${QT_PV} )
147 sql? ( >=x11-libs/qt-sql-${QT_PV} )
148 svg? ( >=x11-libs/qt-svg-${QT_PV} )
149 webkit? ( >=x11-libs/qt-webkit-${QT_PV} )
150 xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_PV} )
151 "
152 DEPEND="${RDEPEND}
153 dbus? ( virtual/pkgconfig )
154 "
155
156 S=${WORKDIR}/${MY_P}
157
158 PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4")
159
160 src_prepare() {
161 qt4-r2_src_prepare
162
163 # Support qreal on arm architecture (bug 322349).
164 use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
165
166 # Use proper include directory for phonon.
167 sed -i -e "s:^\s\+generate_code(\"phonon\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/phonon\"]:" \
168 configure.py || die
169
170 if ! use dbus; then
171 sed -i -e 's/^\(\s\+\)check_dbus()/\1pass/' configure.py || die
172 fi
173
174 python_copy_sources
175
176 preparation() {
177 if [[ $(python_get_version -l --major) == 3 ]]; then
178 rm -fr pyuic/uic/port_v2
179 else
180 rm -fr pyuic/uic/port_v3
181 fi
182 }
183 python_execute_function -s preparation
184 }
185
186 pyqt4_use_enable() {
187 use $1 && echo --enable=${2:-Qt$(echo ${1:0:1} | tr '[:lower:]' '[:upper:]')${1:1}}
188 }
189
190 src_configure() {
191 configuration() {
192 local myconf=(
193 "$(PYTHON)" configure.py
194 --confirm-license
195 --bindir="${EPREFIX}/usr/bin"
196 --destdir="${EPREFIX}$(python_get_sitedir)"
197 --sipdir="${EPREFIX}/usr/share/sip"
198 --assume-shared
199 --no-timestamp
200 --qsci-api
201 $(use debug && echo --debug)
202 --enable=QtCore
203 --enable=QtNetwork
204 --enable=QtXml
205 $(pyqt4_use_enable X QtDesigner) $(use X || echo --no-designer-plugin)
206 $(pyqt4_use_enable X QtGui)
207 $(pyqt4_use_enable X QtTest)
208 $(pyqt4_use_enable dbus QtDBus)
209 $(pyqt4_use_enable declarative)
210 $(pyqt4_use_enable help)
211 $(pyqt4_use_enable multimedia)
212 $(pyqt4_use_enable opengl QtOpenGL)
213 $(pyqt4_use_enable phonon phonon)
214 $(pyqt4_use_enable script)
215 $(pyqt4_use_enable scripttools QtScriptTools)
216 $(pyqt4_use_enable sql)
217 $(pyqt4_use_enable svg)
218 $(pyqt4_use_enable webkit QtWebKit)
219 $(pyqt4_use_enable xmlpatterns QtXmlPatterns)
220 AR="$(tc-getAR) cqs"
221 CC="$(tc-getCC)"
222 CFLAGS="${CFLAGS}"
223 CFLAGS_RELEASE=
224 CXX="$(tc-getCXX)"
225 CXXFLAGS="${CXXFLAGS}"
226 CXXFLAGS_RELEASE=
227 LINK="$(tc-getCXX)"
228 LINK_SHLIB="$(tc-getCXX)"
229 LFLAGS="${LDFLAGS}"
230 LFLAGS_RELEASE=
231 RANLIB=
232 STRIP=
233 )
234 echo "${myconf[@]}"
235 "${myconf[@]}" || die
236
237 local mod
238 for mod in QtCore \
239 $(use X && echo QtDesigner QtGui) \
240 $(use dbus && echo QtDBus) \
241 $(use declarative && echo QtDeclarative) \
242 $(use opengl && echo QtOpenGL); do
243 # Run eqmake4 inside the qpy subdirectories to respect
244 # CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping.
245 pushd qpy/${mod} > /dev/null || return
246 eqmake4 $(ls w_qpy*.pro)
247 popd > /dev/null || return
248
249 # Fix insecure runpaths.
250 sed -i -e "/^LFLAGS\s*=/ s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \
251 ${mod}/Makefile || die "Failed to fix rpath for ${mod}"
252 done
253
254 # Avoid stripping of libpythonplugin.so.
255 if use X; then
256 pushd designer > /dev/null || return
257 eqmake4 python.pro
258 popd > /dev/null || return
259 fi
260 }
261 python_execute_function -s configuration
262 }
263
264 src_install() {
265 installation() {
266 # INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
267 emake DESTDIR="${T}/images/${PYTHON_ABI}" INSTALL_ROOT="${T}/images/${PYTHON_ABI}" install
268 }
269 python_execute_function -s installation
270 python_merge_intermediate_installation_images "${T}/images"
271
272 dodoc NEWS THANKS
273
274 if use doc; then
275 dohtml -r doc/html/*
276 fi
277
278 if use examples; then
279 insinto /usr/share/doc/${PF}
280 doins -r examples
281 fi
282 }
283
284 pkg_postinst() {
285 python_mod_optimize PyQt4
286 }
287
288 pkg_postrm() {
289 python_mod_cleanup PyQt4
290 }
Report Message
Find on MARC Find on Google Groups