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

Gentoo Archives: gentoo-commits

From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/PyQt4: ChangeLog PyQt4-4.8.1.ebuild PyQt4-4.8.1-r1.ebuild
Date: Thu, 30 Dec 2010 01:11:30
Message-Id: 20101230011119.4FBD620054@flycatcher.gentoo.org
1 arfrever 10/12/30 01:11:19
2
3 Modified: ChangeLog PyQt4-4.8.1.ebuild
4 Added: PyQt4-4.8.1-r1.ebuild
5 Log:
6 Copy 4.8.1 to 4.8.1-r1. Delete "declarative" USE flag in 4.8.1.
7
8 (Portage version: 2.2.0_alpha10_p17/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.140 dev-python/PyQt4/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.140&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.140&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?r1=1.139&r2=1.140
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v
20 retrieving revision 1.139
21 retrieving revision 1.140
22 diff -u -r1.139 -r1.140
23 --- ChangeLog 25 Dec 2010 15:01:17 -0000 1.139
24 +++ ChangeLog 30 Dec 2010 01:11:19 -0000 1.140
25 @@ -1,6 +1,12 @@
26 # ChangeLog for dev-python/PyQt4
27 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.139 2010/12/25 15:01:17 arfrever Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.140 2010/12/30 01:11:19 arfrever Exp $
30 +
31 +*PyQt4-4.8.1-r1 (30 Dec 2010)
32 +
33 + 30 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
34 + PyQt4-4.8.1.ebuild, +PyQt4-4.8.1-r1.ebuild:
35 + Copy 4.8.1 to 4.8.1-r1. Delete "declarative" USE flag in 4.8.1.
36
37 25 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
38 PyQt4-4.8.2.ebuild:
39
40
41
42 1.5 dev-python/PyQt4/PyQt4-4.8.1.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild?rev=1.5&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild?rev=1.5&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild?r1=1.4&r2=1.5
47
48 Index: PyQt4-4.8.1.ebuild
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild,v
51 retrieving revision 1.4
52 retrieving revision 1.5
53 diff -u -r1.4 -r1.5
54 --- PyQt4-4.8.1.ebuild 19 Dec 2010 18:54:31 -0000 1.4
55 +++ PyQt4-4.8.1.ebuild 30 Dec 2010 01:11:19 -0000 1.5
56 @@ -1,6 +1,6 @@
57 # Copyright 1999-2010 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild,v 1.4 2010/12/19 18:54:31 arfrever Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild,v 1.5 2010/12/30 01:11:19 arfrever Exp $
61
62 EAPI="3"
63 PYTHON_DEPEND="*"
64 @@ -22,7 +22,7 @@
65 LICENSE="|| ( GPL-2 GPL-3 )"
66 SLOT="0"
67 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
68 -IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
69 +IUSE="X assistant +dbus debug doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
70
71 DEPEND=">=dev-python/sip-4.11.2
72 >=x11-libs/qt-core-${QT_VER}:4
73 @@ -34,7 +34,6 @@
74 >=dev-python/dbus-python-0.80
75 >=x11-libs/qt-dbus-${QT_VER}:4
76 )
77 - declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 )
78 multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
79 opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 )
80 phonon? (
81 @@ -104,7 +103,6 @@
82 # QtAssistant module is not available with Qt >=4.7.0.
83 $(pyqt4_use_enable assistant QtAssistant)
84 $(pyqt4_use_enable assistant QtHelp)
85 - $(pyqt4_use_enable declarative QtDeclarative)
86 $(pyqt4_use_enable multimedia QtMultimedia)
87 $(pyqt4_use_enable opengl QtOpenGL)
88 $(pyqt4_use_enable phonon)
89
90
91
92 1.1 dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild
93
94 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild?rev=1.1&view=markup
95 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild?rev=1.1&content-type=text/plain
96
97 Index: PyQt4-4.8.1-r1.ebuild
98 ===================================================================
99 # Copyright 1999-2010 Gentoo Foundation
100 # Distributed under the terms of the GNU General Public License v2
101 # $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild,v 1.1 2010/12/30 01:11:19 arfrever Exp $
102
103 EAPI="3"
104 PYTHON_DEPEND="*"
105 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
106 SUPPORT_PYTHON_ABIS="1"
107 RESTRICT_PYTHON_ABIS="*-jython"
108
109 inherit python qt4-r2 toolchain-funcs
110
111 MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
112
113 # Minimal supported version of Qt.
114 QT_VER="4.6.2"
115
116 DESCRIPTION="Python bindings for the Qt toolkit"
117 HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
118 SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
119
120 LICENSE="|| ( GPL-2 GPL-3 )"
121 SLOT="0"
122 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
123 IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
124
125 DEPEND=">=dev-python/sip-4.11.2
126 >=x11-libs/qt-core-${QT_VER}:4
127 >=x11-libs/qt-script-${QT_VER}:4
128 >=x11-libs/qt-test-${QT_VER}:4
129 X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] )
130 assistant? ( >=x11-libs/qt-assistant-${QT_VER}:4 )
131 dbus? (
132 >=dev-python/dbus-python-0.80
133 >=x11-libs/qt-dbus-${QT_VER}:4
134 )
135 declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 )
136 multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
137 opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 )
138 phonon? (
139 !kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-sound/phonon ) )
140 kde? ( media-sound/phonon )
141 )
142 sql? ( >=x11-libs/qt-sql-${QT_VER}:4 )
143 svg? ( >=x11-libs/qt-svg-${QT_VER}:4 )
144 webkit? ( >=x11-libs/qt-webkit-${QT_VER}:4 )
145 xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )"
146 RDEPEND="${DEPEND}"
147
148 S=${WORKDIR}/${MY_P}
149
150 PATCHES=(
151 "${FILESDIR}/${PN}-4.6.1-configure-multilib.patch"
152 "${FILESDIR}/${PN}-4.7.2-configure.py.patch"
153 )
154
155 src_prepare() {
156 if ! use dbus; then
157 sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed"
158 fi
159
160 # Support qreal for arm architecture (bug #322349).
161 use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
162
163 qt4-r2_src_prepare
164
165 # Use proper include directory.
166 sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed"
167
168 python_copy_sources
169
170 preparation() {
171 if [[ "$(python_get_version --major)" == "3" ]]; then
172 rm -fr pyuic/uic/port_v2
173 else
174 rm -fr pyuic/uic/port_v3
175 fi
176 }
177 python_execute_function -s preparation
178 }
179
180 pyqt4_use_enable() {
181 use $1 && echo "--enable=${2:-$1}"
182 }
183
184 src_configure() {
185 configuration() {
186 local myconf=("$(PYTHON)"
187 configure.py
188 --confirm-license
189 --bindir="${EPREFIX}/usr/bin"
190 --destdir="${EPREFIX}$(python_get_sitedir)"
191 --sipdir="${EPREFIX}/usr/share/sip"
192 --qsci-api
193 $(use debug && echo --debug)
194 --enable=QtCore
195 --enable=QtNetwork
196 --enable=QtScript
197 --enable=QtTest
198 --enable=QtXml
199 $(pyqt4_use_enable X QtGui)
200 $(pyqt4_use_enable X QtDesigner)
201 $(pyqt4_use_enable X QtScriptTools)
202 # QtAssistant module is not available with Qt >=4.7.0.
203 $(pyqt4_use_enable assistant QtAssistant)
204 $(pyqt4_use_enable assistant QtHelp)
205 $(pyqt4_use_enable declarative QtDeclarative)
206 $(pyqt4_use_enable multimedia QtMultimedia)
207 $(pyqt4_use_enable opengl QtOpenGL)
208 $(pyqt4_use_enable phonon)
209 $(pyqt4_use_enable sql QtSql)
210 $(pyqt4_use_enable svg QtSvg)
211 $(pyqt4_use_enable webkit QtWebKit)
212 $(pyqt4_use_enable xmlpatterns QtXmlPatterns)
213 CC="$(tc-getCC)"
214 CXX="$(tc-getCXX)"
215 LINK="$(tc-getCXX)"
216 LINK_SHLIB="$(tc-getCXX)"
217 CFLAGS="${CFLAGS}"
218 CXXFLAGS="${CXXFLAGS}"
219 LFLAGS="${LDFLAGS}")
220 echo "${myconf[@]}"
221 "${myconf[@]}" || return 1
222
223 local mod
224 for mod in QtCore $(use X && echo QtDesigner QtGui); do
225 # Run eqmake4 inside the qpy subdirectories to avoid stripping and many other QA issues.
226 pushd qpy/${mod} > /dev/null || return 1
227 eqmake4 $(ls w_qpy*.pro)
228 popd > /dev/null || return 1
229
230 # Fix insecure runpaths.
231 sed -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of rpaths failed"
232 done
233
234 # Fix pre-stripping of libpythonplugin.so
235 if use X; then
236 cd "${BUILDDIR}/designer"
237 eqmake4 python.pro
238 fi
239 }
240 python_execute_function -s configuration
241 }
242
243 src_compile() {
244 python_src_compile
245 }
246
247 src_install() {
248 installation() {
249 # INSTALL_ROOT is needed for the QtDesigner module, other Makefiles use DESTDIR.
250 emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
251 }
252 python_execute_function -s installation
253
254 dodoc doc/pyqt4ref.txt NEWS THANKS || die "dodoc failed"
255
256 if use doc; then
257 dohtml -r doc/* || die "dohtml failed"
258 fi
259
260 if use examples; then
261 insinto /usr/share/doc/${PF}
262 doins -r examples || die "doins failed"
263 fi
264 }
265
266 pkg_postinst() {
267 python_mod_optimize PyQt4
268 }
269
270 pkg_postrm() {
271 python_mod_cleanup PyQt4
272 }
Report Message
Find on MARC Find on Google Groups