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-python/PyQt5/, dev-python/PyQt5/files/
Date: Mon, 02 Jan 2017 01:02:42
Message-Id: 1483317041.46ae37a7e2b850af38145e9d914b4a83d9313e74.pesa@gentoo
1 commit: 46ae37a7e2b850af38145e9d914b4a83d9313e74
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 2 00:30:41 2017 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 2 00:30:41 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46ae37a7
7
8 dev-python/PyQt5: remove old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-python/PyQt5/Manifest | 1 -
13 dev-python/PyQt5/PyQt5-5.7.ebuild | 199 ------------------------
14 dev-python/PyQt5/files/PyQt5-5.7-qt-5.6.2.patch | 11 --
15 3 files changed, 211 deletions(-)
16
17 diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
18 index 8d66fb8..58e3bc3 100644
19 --- a/dev-python/PyQt5/Manifest
20 +++ b/dev-python/PyQt5/Manifest
21 @@ -1,4 +1,3 @@
22 DIST PyQt-gpl-5.5.1.tar.gz 3705749 SHA256 0a70ef94fbffcf674b0dde024aae2a2a7a3f5a8c42806109ff7df2c941bd8386 SHA512 ed9a4f30a50c0879f25b6a0841247f3f0de86942b55c1de9efea963bfbf64ee963a9e5c09be036ff2dec76164863b3b6235e45e8662776425f15378fa0abeab4 WHIRLPOOL 199a36ff1ee3689a76d0aae9d2bee586f9de3a0e3cf23c5b625c1f62b5f19311450afd9d009cbdb4f5be63ba024326c63ff0e6c9ea515216c686db9d8e07bcb3
23 DIST PyQt5_gpl-5.6.1.dev1604271126.tar.xz 2300884 SHA256 2a9ac535ac921bcd3678e33655bb3842a14f4cf6836eb29f32d0a62335ea061b SHA512 281d48cd8a875c454e970d6cecb0af2a2299f2ea6d062de599736d613c413dbab67072c80a80d490980eacf18bb35819b94255cd5891abbf6e291101bcd5b578 WHIRLPOOL e8255192a318529307b67992cdd12f9c9d4983099c1cece82761140bf3615fc36e1db52a9a795645c8ca93e21b801826802fd1b0fb3cf867c0f80d380a45c279
24 DIST PyQt5_gpl-5.7.1.tar.gz 3733746 SHA256 be849f212a074049b9ebc10b6c07dddefb86e6d30e8df8a5c715cbb2cf7fad14 SHA512 7498713f73807522e58ae38ff58548cf80c2f2c418d6c55e20ce613cdc997e4ee7139076f1f152c7c3edb970bde14febc3496009f934e31ff71f01a1605f558f WHIRLPOOL 9322ccaaebf78a9e177703bae26f002cdfe9ad3ba45a9c7b9ccdd3b73cca96550e479b243b302d59eefdc1520a6e5b5f18ac5fabc1f8eff36f7f76d71b7dea11
25 -DIST PyQt5_gpl-5.7.tar.gz 3729111 SHA256 892693ba5f79989abb2061dad2d5c4e6f127e9dd3240f73f8220c7152cd35b05 SHA512 b22fd40f967776c25de9f5fb37a3308df15599f257e4deab23ec3072d4c8f2dceb8aadc2869d1ab7a5068992e86320969b694cf6da3312ddedae54fd388873ec WHIRLPOOL bddc2f4818a8179020b827572e808f87d64fed3c220903b4d879d76581346728592e4dbf6679cc240c5ac2d736d4b1264de35e770e89dc1b01e41e82e6bf82cd
26
27 diff --git a/dev-python/PyQt5/PyQt5-5.7.ebuild b/dev-python/PyQt5/PyQt5-5.7.ebuild
28 deleted file mode 100644
29 index 25a64b8..00000000
30 --- a/dev-python/PyQt5/PyQt5-5.7.ebuild
31 +++ /dev/null
32 @@ -1,199 +0,0 @@
33 -# Copyright 1999-2016 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -EAPI=6
38 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
39 -
40 -inherit multibuild python-r1 qmake-utils
41 -
42 -DESCRIPTION="Python bindings for the Qt framework"
43 -HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/intro
44 - https://pypi.python.org/pypi/PyQt5"
45 -
46 -MY_P=${PN}_gpl-${PV/_pre/.dev}
47 -if [[ ${PV} == *_pre* ]]; then
48 - SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
49 -else
50 - SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
51 -fi
52 -
53 -LICENSE="GPL-3"
54 -SLOT="0"
55 -KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
56 -
57 -# TODO: QtNfc
58 -IUSE="bluetooth dbus debug declarative designer doc examples gles2 gui help location
59 - multimedia network opengl positioning printsupport sensors serialport sql svg
60 - testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
61 -
62 -# The requirements below were extracted from configure.py
63 -# and from the output of 'grep -r "%Import " "${S}"/sip'
64 -REQUIRED_USE="
65 - ${PYTHON_REQUIRED_USE}
66 - bluetooth? ( gui )
67 - declarative? ( gui network )
68 - designer? ( widgets )
69 - help? ( gui widgets )
70 - location? ( positioning )
71 - multimedia? ( gui network )
72 - opengl? ( gui widgets )
73 - positioning? ( gui )
74 - printsupport? ( gui widgets )
75 - sensors? ( gui )
76 - serialport? ( gui )
77 - sql? ( widgets )
78 - svg? ( gui widgets )
79 - testlib? ( gui widgets )
80 - webchannel? ( network )
81 - webengine? ( network widgets? ( webchannel ) )
82 - webkit? ( gui network printsupport widgets )
83 - websockets? ( network )
84 - widgets? ( gui )
85 - xmlpatterns? ( network )
86 -"
87 -
88 -# Minimal supported version of Qt.
89 -QT_PV="5.6.0:5"
90 -
91 -RDEPEND="
92 - ${PYTHON_DEPS}
93 - >=dev-python/sip-4.18:=[${PYTHON_USEDEP}]
94 - >=dev-qt/qtcore-${QT_PV}
95 - >=dev-qt/qtxml-${QT_PV}
96 - bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
97 - dbus? (
98 - dev-python/dbus-python[${PYTHON_USEDEP}]
99 - >=dev-qt/qtdbus-${QT_PV}
100 - )
101 - declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
102 - designer? ( >=dev-qt/designer-${QT_PV} )
103 - gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
104 - help? ( >=dev-qt/qthelp-${QT_PV} )
105 - location? ( >=dev-qt/qtlocation-${QT_PV} )
106 - multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
107 - network? ( >=dev-qt/qtnetwork-${QT_PV} )
108 - opengl? ( >=dev-qt/qtopengl-${QT_PV} )
109 - positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
110 - printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
111 - sensors? ( >=dev-qt/qtsensors-${QT_PV} )
112 - serialport? ( >=dev-qt/qtserialport-${QT_PV} )
113 - sql? ( >=dev-qt/qtsql-${QT_PV} )
114 - svg? ( >=dev-qt/qtsvg-${QT_PV} )
115 - testlib? ( >=dev-qt/qttest-${QT_PV} )
116 - webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
117 - webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
118 - webkit? ( >=dev-qt/qtwebkit-${QT_PV}[printsupport] )
119 - websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
120 - widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
121 - x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
122 - xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
123 -"
124 -DEPEND="${RDEPEND}
125 - dbus? ( virtual/pkgconfig )
126 -"
127 -
128 -S=${WORKDIR}/${MY_P}
129 -
130 -DOCS=( "${S}"/{ChangeLog,NEWS} )
131 -PATCHES=( "${FILESDIR}/${P}-qt-5.6.2.patch" )
132 -
133 -pyqt_use_enable() {
134 - use "$1" || return
135 -
136 - if [[ $# -eq 1 ]]; then
137 - echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
138 - else
139 - shift
140 - echo ${@/#/--enable=}
141 - fi
142 -}
143 -
144 -src_configure() {
145 - configuration() {
146 - local myconf=(
147 - "${PYTHON}"
148 - "${S}"/configure.py
149 - $(usex debug '--debug --trace' '')
150 - --verbose
151 - --confirm-license
152 - --qmake="$(qt5_get_bindir)"/qmake
153 - --bindir="${EPREFIX}/usr/bin"
154 - --destdir="$(python_get_sitedir)"
155 - --sip-incdir="$(python_get_includedir)"
156 - --qsci-api
157 - --enable=QtCore
158 - --enable=QtXml
159 - $(pyqt_use_enable bluetooth)
160 - $(pyqt_use_enable dbus QtDBus)
161 - $(usex dbus '' --no-python-dbus)
162 - $(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
163 - $(usex declarative '' --no-qml-plugin)
164 - $(pyqt_use_enable designer)
165 - $(usex designer '' --no-designer-plugin)
166 - $(pyqt_use_enable gui)
167 - $(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
168 - $(pyqt_use_enable help)
169 - $(pyqt_use_enable location)
170 - $(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
171 - $(pyqt_use_enable network)
172 - $(pyqt_use_enable opengl QtOpenGL)
173 - $(pyqt_use_enable positioning)
174 - $(pyqt_use_enable printsupport QtPrintSupport)
175 - $(pyqt_use_enable sensors)
176 - $(pyqt_use_enable serialport QtSerialPort)
177 - $(pyqt_use_enable sql)
178 - $(pyqt_use_enable svg)
179 - $(pyqt_use_enable testlib QtTest)
180 - $(pyqt_use_enable webchannel QtWebChannel)
181 - $(pyqt_use_enable webengine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
182 - $(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
183 - $(pyqt_use_enable websockets QtWebSockets)
184 - $(pyqt_use_enable widgets)
185 - $(pyqt_use_enable x11extras QtX11Extras)
186 - $(pyqt_use_enable xmlpatterns QtXmlPatterns)
187 - )
188 - echo "${myconf[@]}"
189 - "${myconf[@]}" || die
190 -
191 - eqmake5 -recursive ${PN}.pro
192 - }
193 - python_foreach_impl run_in_build_dir configuration
194 -}
195 -
196 -src_compile() {
197 - python_foreach_impl run_in_build_dir default
198 -}
199 -
200 -src_install() {
201 - installation() {
202 - local tmp_root=${D%/}/tmp
203 - emake INSTALL_ROOT="${tmp_root}" install
204 -
205 - local bin_dir=${tmp_root}${EPREFIX}/usr/bin
206 - local exe
207 - for exe in pylupdate5 pyrcc5 pyuic5; do
208 - python_doexe "${bin_dir}/${exe}"
209 - rm "${bin_dir}/${exe}" || die
210 - done
211 -
212 - local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
213 - if python_is_python3; then
214 - rm -r "${uic_dir}"/port_v2 || die
215 - else
216 - rm -r "${uic_dir}"/port_v3 || die
217 - fi
218 -
219 - multibuild_merge_root "${tmp_root}" "${D}"
220 - python_optimize
221 - }
222 - python_foreach_impl run_in_build_dir installation
223 -
224 - einstalldocs
225 - use doc && dodoc -r doc/html
226 -
227 - if use examples; then
228 - insinto /usr/share/doc/${PF}
229 - doins -r examples
230 - fi
231 -}
232
233 diff --git a/dev-python/PyQt5/files/PyQt5-5.7-qt-5.6.2.patch b/dev-python/PyQt5/files/PyQt5-5.7-qt-5.6.2.patch
234 deleted file mode 100644
235 index 542f6d0..00000000
236 --- a/dev-python/PyQt5/files/PyQt5-5.7-qt-5.6.2.patch
237 +++ /dev/null
238 @@ -1,11 +0,0 @@
239 ---- a/sip/QtCore/QtCoremod.sip
240 -+++ b/sip/QtCore/QtCoremod.sip
241 -@@ -22,7 +22,7 @@
242 -
243 - %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1)
244 -
245 --%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0}
246 -+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_7_0}
247 -
248 - %Platforms {WS_X11 WS_WIN WS_MACX}
249 -