Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt4/
Date: Sun, 01 Jan 2017 14:20:43
Message-Id: 1483280429.91c15027444a93206fee2e00f0d6e77ae8e7af35.kensington@gentoo
1 commit: 91c15027444a93206fee2e00f0d6e77ae8e7af35
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 1 14:18:22 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 1 14:20:29 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c15027
7
8 dev-python/PyQt4: remove old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-python/PyQt4/Manifest | 2 -
13 dev-python/PyQt4/PyQt4-4.11.1.ebuild | 211 ---------------------
14 .../PyQt4/PyQt4-4.12_pre1606101416-r1.ebuild | 198 -------------------
15 3 files changed, 411 deletions(-)
16
17 diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
18 index a12e63d..694dc28 100644
19 --- a/dev-python/PyQt4/Manifest
20 +++ b/dev-python/PyQt4/Manifest
21 @@ -1,4 +1,2 @@
22 -DIST PyQt-x11-gpl-4.11.1.tar.gz 11118850 SHA256 df9d7358d70748efa5b84fa3fe9e182a80c39ac590157daaabcc2618df176da3 SHA512 3851d4e61d9c6a0c62cbfd2a08153972fa3446c1982fc925796eb1d4c6524e7054cdb14ed2f4566386727e9e0cf67246765de19fab79152b0834477452681113 WHIRLPOOL 17e23997afcf06b99028d0d2115bc9328848acaaa1b6bcd8ec7397409ab2001d5fa29ca08bf42e0cef6dcd0441d0cff04e349fa8913a2b0fc86da878b79b5a5d
23 DIST PyQt-x11-gpl-4.11.4.tar.gz 11317088 SHA256 fc1fe77495432ba3b0d74ff5cb164d375a97f5dddb728256330f615a7cdcf407 SHA512 58d0c5e30b0480c1b6ce1a3cc3ef0a1841bb15631830fb937d1f17f5d3d8cbe66a5e2adcfb2c3990fae38db66dd430668bd25413e254e72064a38c48f689f170 WHIRLPOOL cf635d6399bd04def2648eee65e038d720f06dddfac70f3df6f87deb7483e023ee1a4aa07285a5075adc19dc91bca4500b82f65b342e07a8845023cf98bb6233
24 -DIST PyQt4_gpl_x11-4.12.dev1606101416.tar.xz 8519016 SHA256 9ce63a77f0de7eac56e49a996d19f0145907ea19cfbc8847642d03cdd8164b97 SHA512 ebdf45a0dc04e1f92c140f582265598d3e24f98a0fa4e0c638dc8bafc0f4501b68e9d9fa376310ed660d58ddb808f0ee0c045260b1d95b3f0e054863df92a7c5 WHIRLPOOL 3cdae4aecbdd3245826ee2a2d837d49167a008c01ce703e55f3f21fe11288d15dd57b7c7e984514e4da16e1b4d7bba821946e16aa3480999a2a2196c62f4bfee
25 DIST PyQt4_gpl_x11-4.12.tar.gz 11325395 SHA256 3c1d4b55314adb3e1132de8fc2a92eed216d37e58aceed41294dbca210ca88db SHA512 bc5ee53e6ab8d32e240bbbd85aec9ce18a398848c0ee73d874763156256f7942a4a452a26f34fe035fdbeba5fb1df060910688f8a1bc7f7f183543d3dd0fd731 WHIRLPOOL 001df301c9620873794c33f5294ae30ec9d4a32359d26a8607377fe2468dd33a313ef09e96d2491056cdc066edc5d80b4e80afa19976dfb2a7d291cd829e2791
26
27 diff --git a/dev-python/PyQt4/PyQt4-4.11.1.ebuild b/dev-python/PyQt4/PyQt4-4.11.1.ebuild
28 deleted file mode 100644
29 index 7ac4442..00000000
30 --- a/dev-python/PyQt4/PyQt4-4.11.1.ebuild
31 +++ /dev/null
32 @@ -1,211 +0,0 @@
33 -# Copyright 1999-2015 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -EAPI=5
38 -PYTHON_COMPAT=( python{2_7,3_4} )
39 -
40 -inherit eutils multibuild python-r1 qmake-utils toolchain-funcs
41 -
42 -DESCRIPTION="Python bindings for the Qt toolkit"
43 -HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/intro
44 - https://pypi.python.org/pypi/PyQt4"
45 -
46 -if [[ ${PV} == *_pre* ]]; then
47 - MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
48 - SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
49 -else
50 - MY_P="PyQt-x11-gpl-${PV}"
51 - SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
52 -fi
53 -
54 -LICENSE="|| ( GPL-2 GPL-3 )"
55 -SLOT="0"
56 -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
57 -
58 -IUSE="X dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
59 -REQUIRED_USE="
60 - ${PYTHON_REQUIRED_USE}
61 - declarative? ( X )
62 - designer? ( X )
63 - help? ( X )
64 - multimedia? ( X )
65 - opengl? ( X )
66 - phonon? ( X )
67 - scripttools? ( X script )
68 - sql? ( X )
69 - svg? ( X )
70 - webkit? ( X )
71 -"
72 -
73 -# Minimal supported version of Qt.
74 -QT_PV="4.8.5:4"
75 -
76 -RDEPEND="
77 - ${PYTHON_DEPS}
78 - >=dev-python/sip-4.16:=[${PYTHON_USEDEP}]
79 - >=dev-qt/qtcore-${QT_PV}
80 - X? (
81 - >=dev-qt/qtgui-${QT_PV}
82 - >=dev-qt/qttest-${QT_PV}
83 - )
84 - dbus? (
85 - >=dev-python/dbus-python-0.80[${PYTHON_USEDEP}]
86 - >=dev-qt/qtdbus-${QT_PV}
87 - )
88 - declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
89 - designer? ( >=dev-qt/designer-${QT_PV} )
90 - help? ( >=dev-qt/qthelp-${QT_PV} )
91 - multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
92 - opengl? ( >=dev-qt/qtopengl-${QT_PV} )
93 - phonon? (
94 - kde? ( media-libs/phonon[qt4] )
95 - !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon[qt4] ) )
96 - )
97 - script? ( >=dev-qt/qtscript-${QT_PV} )
98 - sql? ( >=dev-qt/qtsql-${QT_PV} )
99 - svg? ( >=dev-qt/qtsvg-${QT_PV} )
100 - webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
101 - xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
102 -"
103 -DEPEND="${RDEPEND}
104 - dbus? ( virtual/pkgconfig )
105 -"
106 -
107 -S=${WORKDIR}/${MY_P}
108 -
109 -src_prepare() {
110 - # Support qreal on arm architecture (bug 322349).
111 - use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
112 -
113 - # Allow building against KDE's phonon (bug 433944 and others).
114 - sed -i \
115 - -e "s:VideoWidget()\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/qt4/QtGui\"]:" \
116 - -e "s:^\s\+generate_code(\"phonon\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/phonon\"]:" \
117 - configure.py || die
118 -
119 - if ! use dbus; then
120 - sed -i -e 's/^\(\s\+\)check_dbus()/\1pass/' configure.py || die
121 - fi
122 -
123 - python_copy_sources
124 -
125 - preparation() {
126 - if [[ ${EPYTHON} == python3.* ]]; then
127 - rm -fr pyuic/uic/port_v2
128 - else
129 - rm -fr pyuic/uic/port_v3
130 - fi
131 - }
132 - python_foreach_impl run_in_build_dir preparation
133 -}
134 -
135 -pyqt4_use_enable() {
136 - use $1 && echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
137 -}
138 -
139 -src_configure() {
140 - configuration() {
141 - local myconf=(
142 - "${PYTHON}" configure.py
143 - --confirm-license
144 - --bindir="${EPREFIX}/usr/bin"
145 - --destdir="$(python_get_sitedir)"
146 - --sipdir="${EPREFIX}/usr/share/sip"
147 - --assume-shared
148 - --no-timestamp
149 - --qsci-api
150 - $(use debug && echo --debug)
151 - --enable=QtCore
152 - --enable=QtNetwork
153 - --enable=QtXml
154 - $(pyqt4_use_enable X QtGui)
155 - $(pyqt4_use_enable X QtTest)
156 - $(pyqt4_use_enable dbus QtDBus)
157 - $(pyqt4_use_enable declarative)
158 - $(pyqt4_use_enable designer) $(use designer || echo --no-designer-plugin)
159 - $(pyqt4_use_enable help)
160 - $(pyqt4_use_enable multimedia)
161 - $(pyqt4_use_enable opengl QtOpenGL)
162 - $(pyqt4_use_enable phonon phonon)
163 - $(pyqt4_use_enable script)
164 - $(pyqt4_use_enable scripttools QtScriptTools)
165 - $(pyqt4_use_enable sql)
166 - $(pyqt4_use_enable svg)
167 - $(pyqt4_use_enable webkit QtWebKit)
168 - $(pyqt4_use_enable xmlpatterns QtXmlPatterns)
169 - AR="$(tc-getAR) cqs"
170 - CC="$(tc-getCC)"
171 - CFLAGS="${CFLAGS}"
172 - CFLAGS_RELEASE=
173 - CXX="$(tc-getCXX)"
174 - CXXFLAGS="${CXXFLAGS}"
175 - CXXFLAGS_RELEASE=
176 - LINK="$(tc-getCXX)"
177 - LINK_SHLIB="$(tc-getCXX)"
178 - LFLAGS="${LDFLAGS}"
179 - LFLAGS_RELEASE=
180 - RANLIB=
181 - STRIP=
182 - )
183 - echo "${myconf[@]}"
184 - "${myconf[@]}" || die
185 -
186 - local mod
187 - for mod in QtCore \
188 - $(use X && echo QtGui) \
189 - $(use dbus && echo QtDBus) \
190 - $(use declarative && echo QtDeclarative) \
191 - $(use designer && echo QtDesigner) \
192 - $(use opengl && echo QtOpenGL); do
193 - # Run eqmake4 inside the qpy subdirectories to respect
194 - # CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping.
195 - pushd qpy/${mod} > /dev/null || return
196 - eqmake4 $(ls w_qpy*.pro)
197 - popd > /dev/null || return
198 -
199 - # Fix insecure runpaths.
200 - sed -i -e "/^LFLAGS\s*=/ s:-Wl,-rpath,${BUILD_DIR}/qpy/${mod}::" \
201 - ${mod}/Makefile || die "failed to fix rpath for ${mod}"
202 - done
203 -
204 - # Avoid stripping of libpythonplugin.so.
205 - if use designer; then
206 - pushd designer > /dev/null || return
207 - eqmake4 python.pro
208 - popd > /dev/null || return
209 - fi
210 - }
211 - python_foreach_impl run_in_build_dir configuration
212 -}
213 -
214 -src_compile() {
215 - python_foreach_impl run_in_build_dir default
216 -}
217 -
218 -src_install() {
219 - installation() {
220 - local tmp_root=${D%/}/tmp
221 -
222 - # INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
223 - emake DESTDIR="${tmp_root}" INSTALL_ROOT="${tmp_root}" install
224 -
225 - python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4
226 - rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die
227 -
228 - multibuild_merge_root "${tmp_root}" "${D}"
229 - python_optimize
230 - }
231 - python_foreach_impl run_in_build_dir installation
232 -
233 - dodoc NEWS THANKS
234 -
235 - if use doc; then
236 - dodoc -r doc/html
237 - fi
238 -
239 - if use examples; then
240 - insinto /usr/share/doc/${PF}
241 - doins -r examples
242 - fi
243 -}
244
245 diff --git a/dev-python/PyQt4/PyQt4-4.12_pre1606101416-r1.ebuild b/dev-python/PyQt4/PyQt4-4.12_pre1606101416-r1.ebuild
246 deleted file mode 100644
247 index 870a6b5..00000000
248 --- a/dev-python/PyQt4/PyQt4-4.12_pre1606101416-r1.ebuild
249 +++ /dev/null
250 @@ -1,198 +0,0 @@
251 -# Copyright 1999-2016 Gentoo Foundation
252 -# Distributed under the terms of the GNU General Public License v2
253 -# $Id$
254 -
255 -EAPI=6
256 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
257 -
258 -inherit multibuild python-r1 qmake-utils toolchain-funcs
259 -
260 -DESCRIPTION="Python bindings for the Qt framework"
261 -HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/intro
262 - https://pypi.python.org/pypi/PyQt4"
263 -
264 -MY_P=${PN}_gpl_x11-${PV/_pre/.dev}
265 -if [[ ${PV} == *_pre* ]]; then
266 - SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
267 -else
268 - SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
269 -fi
270 -
271 -LICENSE="GPL-3"
272 -SLOT="0"
273 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
274 -
275 -IUSE="X compat dbus debug declarative designer doc examples help kde multimedia
276 - opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
277 -REQUIRED_USE="
278 - ${PYTHON_REQUIRED_USE}
279 - sql? ( X )
280 - testlib? ( X )
281 -"
282 -
283 -# Minimal supported version of Qt.
284 -QT_PV="4.8.5:4"
285 -
286 -RDEPEND="
287 - ${PYTHON_DEPS}
288 - >=dev-python/sip-4.18:=[${PYTHON_USEDEP}]
289 - >=dev-qt/qtcore-${QT_PV}
290 - X? ( >=dev-qt/qtgui-${QT_PV} )
291 - dbus? (
292 - dev-python/dbus-python[${PYTHON_USEDEP}]
293 - >=dev-qt/qtdbus-${QT_PV}
294 - )
295 - declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
296 - designer? ( >=dev-qt/designer-${QT_PV} )
297 - help? ( >=dev-qt/qthelp-${QT_PV} )
298 - multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
299 - opengl? ( >=dev-qt/qtopengl-${QT_PV} )
300 - phonon? (
301 - kde? ( >=media-libs/phonon-4.7[qt4] )
302 - !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} >=media-libs/phonon-4.7[qt4] ) )
303 - )
304 - script? ( >=dev-qt/qtscript-${QT_PV} )
305 - scripttools? ( >=dev-qt/qtgui-${QT_PV} )
306 - sql? ( >=dev-qt/qtsql-${QT_PV} )
307 - svg? ( >=dev-qt/qtsvg-${QT_PV} )
308 - testlib? ( >=dev-qt/qttest-${QT_PV} )
309 - webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
310 - xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
311 -"
312 -DEPEND="${RDEPEND}
313 - dbus? ( virtual/pkgconfig )
314 -"
315 -
316 -S=${WORKDIR}/${MY_P}
317 -
318 -DOCS=( "${S}"/{ChangeLog,NEWS,THANKS} )
319 -PATCHES=(
320 - # Allow building against KDE's phonon (bug 525354)
321 - "${FILESDIR}/${PN}-4.11.2-phonon.patch"
322 -)
323 -
324 -src_prepare() {
325 - # Support qreal on arm architecture (bug 322349)
326 - use arm && PATCHES+=("${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch")
327 -
328 - default
329 -}
330 -
331 -pyqt_run() {
332 - echo "$@"
333 - "${PYTHON}" "$@"
334 -}
335 -
336 -pyqt_use_enable() {
337 - use "$1" || return
338 -
339 - echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
340 -}
341 -
342 -src_configure() {
343 - configuration() {
344 - local myconf=(
345 - $(usex debug '--debug --trace' '')
346 - --verbose
347 - --confirm-license
348 - --qmake="$(qt4_get_bindir)"/qmake
349 - --bindir="${EPREFIX}/usr/bin"
350 - --destdir="$(python_get_sitedir)"
351 - --qsci-api
352 - --enable=QtCore
353 - --enable=QtNetwork
354 - --enable=QtXml
355 - $(pyqt_use_enable X QtGui)
356 - $(pyqt_use_enable dbus QtDBus)
357 - $(pyqt_use_enable declarative)
358 - $(pyqt_use_enable designer)
359 - $(usex designer '' --no-designer-plugin)
360 - $(pyqt_use_enable help)
361 - $(pyqt_use_enable multimedia)
362 - $(pyqt_use_enable opengl QtOpenGL)
363 - $(pyqt_use_enable phonon phonon)
364 - $(pyqt_use_enable script)
365 - $(pyqt_use_enable scripttools QtScriptTools)
366 - $(pyqt_use_enable sql)
367 - $(pyqt_use_enable svg)
368 - $(pyqt_use_enable testlib QtTest)
369 - $(pyqt_use_enable webkit QtWebKit)
370 - $(pyqt_use_enable xmlpatterns QtXmlPatterns)
371 - )
372 -
373 - if use compat; then
374 - local compat_build_dir=${BUILD_DIR%/}-compat
375 - cp -Rp "${S}" "${compat_build_dir}" || die
376 - pushd "${compat_build_dir}" >/dev/null || die
377 -
378 - local mycompatconf=(
379 - "${myconf[@]}"
380 - AR="$(tc-getAR) cqs"
381 - CC="$(tc-getCC)"
382 - CFLAGS="${CFLAGS}"
383 - CFLAGS_RELEASE=
384 - CXX="$(tc-getCXX)"
385 - CXXFLAGS="${CXXFLAGS}"
386 - CXXFLAGS_RELEASE=
387 - LINK="$(tc-getCXX)"
388 - LINK_SHLIB="$(tc-getCXX)"
389 - LFLAGS="${LDFLAGS}"
390 - LFLAGS_RELEASE=
391 - RANLIB=
392 - STRIP=
393 - )
394 - pyqt_run configure.py "${mycompatconf[@]}" || die
395 -
396 - popd >/dev/null || die
397 - fi
398 -
399 - myconf+=(
400 - --sip-incdir="$(python_get_includedir)"
401 - $(usex dbus '' --no-python-dbus)
402 - )
403 - pyqt_run "${S}"/configure-ng.py "${myconf[@]}" || die
404 -
405 - eqmake4 -recursive ${PN}.pro
406 - }
407 - python_foreach_impl run_in_build_dir configuration
408 -}
409 -
410 -src_compile() {
411 - python_foreach_impl run_in_build_dir default
412 -}
413 -
414 -src_install() {
415 - installation() {
416 - local tmp_root=${D%/}/tmp
417 - emake INSTALL_ROOT="${tmp_root}" install
418 -
419 - local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
420 - if python_is_python3; then
421 - rm -r "${uic_dir}"/port_v2 || die
422 - else
423 - rm -r "${uic_dir}"/port_v3 || die
424 - fi
425 -
426 - python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4
427 - rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die
428 -
429 - multibuild_merge_root "${tmp_root}" "${D}"
430 -
431 - if use compat; then
432 - local compat_build_dir=${BUILD_DIR%/}-compat
433 - python_moduleinto ${PN}
434 - python_domodule "${compat_build_dir}"/pyqtconfig.py
435 - fi
436 -
437 - python_optimize
438 - }
439 - python_foreach_impl run_in_build_dir installation
440 -
441 - einstalldocs
442 - use doc && dodoc -r doc/html
443 -
444 - if use examples; then
445 - insinto /usr/share/doc/${PF}
446 - doins -r examples
447 - fi
448 -}