Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-util/eric/, dev-util/eric/files/
Date: Tue, 28 Feb 2012 13:20:32
Message-Id: 1330435196.a0a2c58b5ec8743f4cc753e8012e3ce1d279d4d1.pesa@gentoo
1 commit: a0a2c58b5ec8743f4cc753e8012e3ce1d279d4d1
2 Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
3 AuthorDate: Tue Feb 28 13:19:56 2012 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 28 13:19:56 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a0a2c58b
7
8 [dev-util/eric] Remove obsolete snapshot.
9
10 ---
11 dev-util/eric/Manifest | 9 --
12 dev-util/eric/eric-4.5_pre20100523.ebuild | 91 ------------
13 dev-util/eric/files/eric-4.4-no-interactive.patch | 14 --
14 dev-util/eric/files/eric-4.4-no-pykde.patch | 146 --------------------
15 dev-util/eric/files/eric-4.5_remove_coverage.patch | 119 ----------------
16 5 files changed, 0 insertions(+), 379 deletions(-)
17
18 diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
19 deleted file mode 100644
20 index 40bb7de..0000000
21 --- a/dev-util/eric/Manifest
22 +++ /dev/null
23 @@ -1,9 +0,0 @@
24 -DIST eric4-4.5-snapshot-20100523.tar.gz 6704946 RMD160 262591b47b17d1411e8ac7701747b082ca263a01 SHA1 38146f6c9538b3b089aab52bdfa2dbf5c8a19f6d SHA256 c65a3f83936792ab6eef4a0da9c8ed47fb34907be454eb45856ae2a65bbd3e98
25 -DIST eric4-i18n-cs-4.5-snapshot-20100523.tar.gz 452386 RMD160 06dcd49835c06376f0e4adbfc4021279141a3937 SHA1 3146784e45c9e09a1a044832ba6b591a252ef34e SHA256 46158d971c153714dcd53378b312885f0abbebb3eba3024bc2f7e539a46710b8
26 -DIST eric4-i18n-de-4.5-snapshot-20100523.tar.gz 453286 RMD160 0ba7156812023ae67bcad642662ee84728c1f67f SHA1 cdab3283ddc97f98c3e5b543fa1ae3fde6d1a7d0 SHA256 412c3906a1099a417bc5a265b55b638e1d6b0fb74ea610d88514b65cda5ada74
27 -DIST eric4-i18n-es-4.5-snapshot-20100523.tar.gz 457432 RMD160 2d5d75624d8b58bcbd0e8c53228a787c442f8071 SHA1 e5a641b82a046f48781379914fc88a6f670302c9 SHA256 b3006a15071eade6ae2e0d10d7ebda84ebeaaf3bd854b40147667af74369e734
28 -DIST eric4-i18n-fr-4.5-snapshot-20100523.tar.gz 430601 RMD160 d72b4c70765a727e9dab386d248a690115721adb SHA1 86c3b3c6134d171fa43c74130f5afc442d1316bc SHA256 3e9889814fcda3ff474f20e5187502e693c815d29684a096dbce7a2ba9207e9a
29 -DIST eric4-i18n-it-4.5-snapshot-20100523.tar.gz 446559 RMD160 91db5a7fb0dcbcef6b16a178b8d219b1fdf99ea5 SHA1 be8d8eecda16be81020faf4eb9409fd7bf0444ea SHA256 f7f4fb768abef1904b7a2e4607b96b6874ca098ae93458b3601694b643a31550
30 -DIST eric4-i18n-ru-4.5-snapshot-20100523.tar.gz 473127 RMD160 7d0f8b5fc38e8ec7166a3309111372fa223d94c9 SHA1 6671cf6263a4d90bb60d98678a6091389027872f SHA256 301a1c2dcb377f914c7bacbdae322b1079e7a93104b1c83b348ed9bbbfa04d56
31 -DIST eric4-i18n-tr-4.5-snapshot-20100523.tar.gz 358062 RMD160 ac287f403c18761ad5c5250b4e436e1707e23e5c SHA1 2837239e34be3fd6d5263d682434bd6dc17d659a SHA256 b0b2dc6ffd242b142c796f2c3e139ada35599ad941202996d98124e45957ebd1
32 -DIST eric4-i18n-zh_CN.GB2312-4.5-snapshot-20100523.tar.gz 392560 RMD160 ac20f0a2066d0b7fd41b6669f691e8664b77b46f SHA1 39ab86d7d10c39898e751bb787c18cd438ee147b SHA256 163ccfc057f274f98970135e39baec92ec188c324c05a6b8a0ee3cad6c5277c3
33
34 diff --git a/dev-util/eric/eric-4.5_pre20100523.ebuild b/dev-util/eric/eric-4.5_pre20100523.ebuild
35 deleted file mode 100644
36 index e96e5fd..0000000
37 --- a/dev-util/eric/eric-4.5_pre20100523.ebuild
38 +++ /dev/null
39 @@ -1,91 +0,0 @@
40 -# Copyright 1999-2010 Gentoo Foundation
41 -# Distributed under the terms of the GNU General Public License v2
42 -# $Header: $
43 -
44 -EAPI="3"
45 -PYTHON_DEPEND="2:2.6"
46 -SUPPORT_PYTHON_ABIS="1"
47 -
48 -inherit eutils python
49 -
50 -DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
51 -HOMEPAGE="http://eric-ide.python-projects.org/"
52 -
53 -SLOT="4"
54 -MY_PN="${PN}${SLOT}"
55 -MY_PV="${PV/_pre/-snapshot-}"
56 -MY_P="${MY_PN}-${MY_PV}"
57 -
58 -BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/unstable/${PV##*_pre}"
59 -SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
60 -LICENSE="GPL-3"
61 -
62 -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
63 -IUSE="kde spell"
64 -
65 -DEPEND="dev-python/PyQt4[assistant,svg,webkit,X]
66 - dev-python/qscintilla-python
67 - kde? ( kde-base/pykde4 )"
68 -RDEPEND="${DEPEND}
69 - >=dev-python/chardet-2.0.1
70 - >=dev-python/coverage-3.0.1
71 - >=dev-python/pygments-1.1"
72 -PDEPEND="spell? ( dev-python/pyenchant )"
73 -# 2.4 and 2.5 are restricted to avoid conditional dependency on dev-python/simplejson.
74 -RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
75 -
76 -LANGS="cs de es fr it ru tr zh_CN"
77 -for L in ${LANGS}; do
78 - SRC_URI="${SRC_URI}
79 - linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
80 - IUSE="${IUSE} linguas_${L}"
81 -done
82 -unset L
83 -
84 -S="${WORKDIR}/${MY_P}"
85 -
86 -src_prepare() {
87 - epatch "${FILESDIR}/${PN}-4.4-no-interactive.patch"
88 - epatch "${FILESDIR}/${PN}-4.5_remove_coverage.patch"
89 - use kde || epatch "${FILESDIR}/${PN}-4.4-no-pykde.patch"
90 -
91 - # Delete internal copies of dev-python/chardet, dev-python/coverage,
92 - # dev-python/pygments and dev-python/simplejson
93 - rm -fr eric/ThirdParty
94 - rm -fr eric/DebugClients/Python{,3}/coverage
95 -}
96 -
97 -src_install() {
98 - installation() {
99 - "$(PYTHON)" install.py \
100 - -z \
101 - -b "${EPREFIX}/usr/bin" \
102 - -i "${D}" \
103 - -d "${EPREFIX}$(python_get_sitedir)" \
104 - -c
105 - }
106 - python_execute_function installation
107 -
108 - newicon eric/icons/default/eric.png ${MY_PN}.png || die
109 - make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN} "Development;IDE;Qt"
110 -}
111 -
112 -pkg_postinst() {
113 - python_mod_optimize ${MY_PN}{,config.py,plugins}
114 -
115 - elog
116 - elog "If you want to use Eric with mod_python, have a look at"
117 - elog "\"${EROOT%/}$(python_get_sitedir -f)/${MY_PN}/patch_modpython.py\"."
118 - elog
119 - elog "The following packages will give Eric extended functionality:"
120 - elog " dev-python/pylint"
121 - elog " dev-python/pysvn"
122 - elog
123 - elog "This version has a plugin interface with plugin-autofetch from"
124 - elog "the application itself. You may want to check those as well."
125 - elog
126 -}
127 -
128 -pkg_postrm() {
129 - python_mod_cleanup ${MY_PN}{,config.py,plugins}
130 -}
131
132 diff --git a/dev-util/eric/files/eric-4.4-no-interactive.patch b/dev-util/eric/files/eric-4.4-no-interactive.patch
133 deleted file mode 100644
134 index 4c682bf..0000000
135 --- a/dev-util/eric/files/eric-4.4-no-interactive.patch
136 +++ /dev/null
137 @@ -1,14 +0,0 @@
138 -Index: eric4-4.4-snapshot-20091129/install.py
139 -===================================================================
140 ---- eric4-4.4-snapshot-20091129.orig/install.py
141 -+++ eric4-4.4-snapshot-20091129/install.py
142 -@@ -761,9 +761,6 @@ def main(argv):
143 - (v[0], v[1], v[2])
144 - print " with foreign characters. Please see 'README-PyXML.txt' for"
145 - print " details."
146 -- res = raw_input(" Shall pyXML be patched now (y/n)? ")
147 -- if res in ["Y", "y"]:
148 -- patchPyXML()
149 - except ImportError:
150 - pass
151 -
152
153 diff --git a/dev-util/eric/files/eric-4.4-no-pykde.patch b/dev-util/eric/files/eric-4.4-no-pykde.patch
154 deleted file mode 100644
155 index 26bbf89..0000000
156 --- a/dev-util/eric/files/eric-4.4-no-pykde.patch
157 +++ /dev/null
158 @@ -1,146 +0,0 @@
159 -Index: eric4-4.4-snapshot-20091129/eric/KdeQt/__init__.py
160 -===================================================================
161 ---- eric4-4.4-snapshot-20091129.orig/eric/KdeQt/__init__.py
162 -+++ eric4-4.4-snapshot-20091129/eric/KdeQt/__init__.py
163 -@@ -20,19 +20,6 @@ import sys
164 - import Preferences
165 -
166 - if Preferences.getUI("UseKDEDialogs") and not sys.e4nokde:
167 -- try:
168 -- import PyKDE4
169 -- from PyQt4.QtCore import QString
170 --
171 -- def __kdeIsKDE():
172 -- """
173 -- Public function to signal the availability of KDE4.
174 --
175 -- @return availability flag (always True)
176 -- """
177 -- return True
178 --
179 -- except (ImportError, RuntimeError):
180 - sys.e4nokde = True
181 -
182 - def __kdeKdeVersionString():
183 -@@ -56,96 +43,29 @@ def __kdeKdeVersionString():
184 - return QString("unknown")
185 -
186 - def __kdePyKdeVersionString():
187 -- """
188 -- Public function to return the PyKDE4 version as a string.
189 --
190 -- @return PyKDE4 version as a string (QString)
191 -- """
192 -- try:
193 -- try:
194 -- from PyKDE4.kdecore import pykde_versionMajor, pykde_versionMinor, \
195 -- pykde_versionRelease
196 -- return QString("%d.%d.%d" % \
197 -- (pykde_versionMajor(), pykde_versionMinor(),
198 -- pykde_versionRelease()))
199 -- except (ImportError, AttributeError):
200 -- from PyKDE4 import pykdeconfig
201 -- try:
202 -- return QString(pykdeconfig.Configuration().pykde_version_str)
203 -- except AttributeError:
204 -- return QString("unknown")
205 -- except ImportError:
206 -- return QString("unknown")
207 -+ return QString("PyKDE support is disabled")
208 -
209 - from PyQt4.QtCore import QString
210 -
211 - def __qtIsKDE():
212 -- """
213 -- Private function to signal the availability of KDE.
214 --
215 -- @return availability flag (always False)
216 -- """
217 - return False
218 -
219 - def __qtKdeVersionString():
220 -- """
221 -- Private function to return the KDE version as a string.
222 --
223 -- @return KDE version as a string (QString) (always empty)
224 -- """
225 - return QString("")
226 -
227 - def __qtPyKdeVersionString():
228 -- """
229 -- Private function to return the PyKDE version as a string.
230 --
231 -- @return PyKDE version as a string (QString) (always empty)
232 -- """
233 - return QString("")
234 -
235 - ################################################################################
236 -
237 - def isKDEAvailable():
238 -- """
239 -- Public function to signal the availability of KDE.
240 --
241 -- @return availability flag (always False)
242 -- """
243 -- try:
244 -- import PyKDE4
245 -- return True
246 -- except ImportError:
247 -- return False
248 -+ return False
249 -
250 - def isKDE():
251 -- """
252 -- Public function to signal, if KDE usage is enabled.
253 --
254 -- @return KDE support flag (always False)
255 -- """
256 -- if Preferences.getUI("UseKDEDialogs") and not sys.e4nokde:
257 -- return __kdeIsKDE()
258 -- else:
259 -- return __qtIsKDE()
260 -+ return __qtIsKDE()
261 -
262 - def kdeVersionString():
263 -- """
264 -- Public function to return the KDE version as a string.
265 --
266 -- @return KDE version as a string (QString) (always empty)
267 -- """
268 -- if isKDEAvailable():
269 -- return __kdeKdeVersionString()
270 -- else:
271 -- return __qtKdeVersionString()
272 -+ return __qtKdeVersionString()
273 -
274 - def pyKdeVersionString():
275 -- """
276 -- Public function to return the PyKDE version as a string.
277 --
278 -- @return PyKDE version as a string (QString) (always empty)
279 -- """
280 -- if isKDEAvailable():
281 -- return __kdePyKdeVersionString()
282 -- else:
283 -- return __qtPyKdeVersionString()
284 -+ return __qtPyKdeVersionString()
285 -Index: eric4-4.4-snapshot-20091129/eric/eric4.py
286 -===================================================================
287 ---- eric4-4.4-snapshot-20091129.orig/eric/eric4.py
288 -+++ eric4-4.4-snapshot-20091129/eric/eric4.py
289 -@@ -32,13 +32,12 @@ restartArgsList = ["--nokde", "--nosplas
290 - restartArgs = [arg for arg in sys.argv[1:] if arg.split("=", 1)[0] in restartArgsList]
291 -
292 - # disable the usage of KDE widgets, if requested
293 --sys.e4nokde = False
294 -+sys.e4nokde = True
295 - if "--nokde" in sys.argv:
296 - del sys.argv[sys.argv.index("--nokde")]
297 - sys.e4nokde = True
298 - else:
299 -- sys.e4nokde = os.getenv("e4nokde") is not None and os.getenv("e4nokde") == "1"
300 --
301 -+ print "PyKDE support has been disabled. Enable 'kde' useflag to bring it back"
302 - if "--debug" in sys.argv:
303 - del sys.argv[sys.argv.index("--debug")]
304 - logging.basicConfig(level = logging.DEBUG)
305
306 diff --git a/dev-util/eric/files/eric-4.5_remove_coverage.patch b/dev-util/eric/files/eric-4.5_remove_coverage.patch
307 deleted file mode 100644
308 index c022960..0000000
309 --- a/dev-util/eric/files/eric-4.5_remove_coverage.patch
310 +++ /dev/null
311 @@ -1,119 +0,0 @@
312 -Index: eric4-4.5-snapshot-20100523/eric/DataViews/PyCoverageDialog.py
313 -===================================================================
314 ---- eric4-4.5-snapshot-20100523.orig/eric/DataViews/PyCoverageDialog.py
315 -+++ eric4-4.5-snapshot-20100523/eric/DataViews/PyCoverageDialog.py
316 -@@ -19,7 +19,7 @@ from KdeQt.KQProgressDialog import KQPro
317 - from Ui_PyCoverageDialog import Ui_PyCoverageDialog
318 -
319 - import Utilities
320 --from DebugClients.Python.coverage import coverage
321 -+from coverage import coverage
322 -
323 - class PyCoverageDialog(QDialog, Ui_PyCoverageDialog):
324 - """
325 -Index: eric4-4.5-snapshot-20100523/eric/eric4.e4p
326 -===================================================================
327 ---- eric4-4.5-snapshot-20100523.orig/eric/eric4.e4p
328 -+++ eric4-4.5-snapshot-20100523/eric/eric4.e4p
329 -@@ -614,12 +614,6 @@
330 - <Source>Helpviewer/HelpTopicDialog.py</Source>
331 - <Source>Helpviewer/HelpSearchWidget.py</Source>
332 - <Source>Helpviewer/HelpDocsInstaller.py</Source>
333 -- <Source>DebugClients/Python/coverage/data.py</Source>
334 -- <Source>DebugClients/Python/coverage/cmdline.py</Source>
335 -- <Source>DebugClients/Python/coverage/collector.py</Source>
336 -- <Source>DebugClients/Python/coverage/misc.py</Source>
337 -- <Source>DebugClients/Python/coverage/control.py</Source>
338 -- <Source>DebugClients/Python/coverage/__init__.py</Source>
339 - <Source>Debugger/DebuggerInterfacePython3.py</Source>
340 - <Source>Preferences/ConfigurationPages/DebuggerPython3Page.py</Source>
341 - <Source>DebugClients/Python3/AsyncFile.py</Source>
342 -@@ -652,15 +646,6 @@
343 - <Source>E4Network/E4NetworkMonitor.py</Source>
344 - <Source>E4Network/E4NetworkHeaderDetailsDialog.py</Source>
345 - <Source>Helpviewer/HelpLanguagesDialog.py</Source>
346 -- <Source>DebugClients/Python/coverage/html.py</Source>
347 -- <Source>DebugClients/Python/coverage/report.py</Source>
348 -- <Source>DebugClients/Python/coverage/templite.py</Source>
349 -- <Source>DebugClients/Python/coverage/codeunit.py</Source>
350 -- <Source>DebugClients/Python/coverage/summary.py</Source>
351 -- <Source>DebugClients/Python/coverage/files.py</Source>
352 -- <Source>DebugClients/Python/coverage/annotate.py</Source>
353 -- <Source>DebugClients/Python/coverage/parser.py</Source>
354 -- <Source>DebugClients/Python/coverage/execfile.py</Source>
355 - <Source>Helpviewer/CookieJar/__init__.py</Source>
356 - <Source>Helpviewer/CookieJar/CookiesExceptionsDialog.py</Source>
357 - <Source>Helpviewer/CookieJar/CookieModel.py</Source>
358 -@@ -720,23 +705,6 @@
359 - <Source>eric4-iconeditor.py</Source>
360 - <Source>IconEditor/IconZoomDialog.py</Source>
361 - <Source>IconEditor/IconEditorPalette.py</Source>
362 -- <Source>DebugClients/Python/coverage/backward.py</Source>
363 -- <Source>DebugClients/Python3/coverage/__init__.py</Source>
364 -- <Source>DebugClients/Python3/coverage/annotate.py</Source>
365 -- <Source>DebugClients/Python3/coverage/backward.py</Source>
366 -- <Source>DebugClients/Python3/coverage/cmdline.py</Source>
367 -- <Source>DebugClients/Python3/coverage/codeunit.py</Source>
368 -- <Source>DebugClients/Python3/coverage/collector.py</Source>
369 -- <Source>DebugClients/Python3/coverage/control.py</Source>
370 -- <Source>DebugClients/Python3/coverage/data.py</Source>
371 -- <Source>DebugClients/Python3/coverage/execfile.py</Source>
372 -- <Source>DebugClients/Python3/coverage/files.py</Source>
373 -- <Source>DebugClients/Python3/coverage/html.py</Source>
374 -- <Source>DebugClients/Python3/coverage/misc.py</Source>
375 -- <Source>DebugClients/Python3/coverage/parser.py</Source>
376 -- <Source>DebugClients/Python3/coverage/report.py</Source>
377 -- <Source>DebugClients/Python3/coverage/summary.py</Source>
378 -- <Source>DebugClients/Python3/coverage/templite.py</Source>
379 - <Source>E4Gui/E4ModelToolBar.py</Source>
380 - <Source>E4Gui/E4TreeSortFilterProxyModel.py</Source>
381 - <Source>ThirdParty/Pygments/pygments/lexers/parsers.py</Source>
382 -@@ -1045,15 +1013,11 @@
383 - <Other>ThirdParty/Pygments/pygments/PKG-INFO</Other>
384 - <Other>ThirdParty/SimpleJSON/simplejson/LICENSE.txt</Other>
385 - <Other>ThirdParty/SimpleJSON/simplejson/PKG-INFO</Other>
386 -- <Other>DebugClients/Python/coverage/htmlfiles</Other>
387 - <Other>IconEditor/cursors/aim-cursor.xpm</Other>
388 - <Other>IconEditor/cursors/colorpicker-cursor.xpm</Other>
389 - <Other>IconEditor/cursors/eraser-cursor.xpm</Other>
390 - <Other>IconEditor/cursors/fill-cursor.xpm</Other>
391 - <Other>IconEditor/cursors/paintbrush-cursor.xpm</Other>
392 -- <Other>DebugClients/Python/coverage/doc</Other>
393 -- <Other>DebugClients/Python3/coverage/doc</Other>
394 -- <Other>DebugClients/Python3/coverage/htmlfiles</Other>
395 - <Other>Documentation/Help</Other>
396 - </Others>
397 - <MainScript>eric4.py</MainScript>
398 -@@ -1512,4 +1476,4 @@
399 - </dict>
400 - </CheckersParams>
401 - </Checkers>
402 --</Project>
403 -\ No newline at end of file
404 -+</Project>
405 -Index: eric4-4.5-snapshot-20100523/eric/PyUnit/UnittestDialog.py
406 -===================================================================
407 ---- eric4-4.5-snapshot-20100523.orig/eric/PyUnit/UnittestDialog.py
408 -+++ eric4-4.5-snapshot-20100523/eric/PyUnit/UnittestDialog.py
409 -@@ -26,7 +26,7 @@ from E4Gui.E4Completers import E4FileCom
410 - from Ui_UnittestDialog import Ui_UnittestDialog
411 - from Ui_UnittestStacktraceDialog import Ui_UnittestStacktraceDialog
412 -
413 --from DebugClients.Python.coverage import coverage
414 -+from coverage import coverage
415 -
416 - import UI.PixmapCache
417 -
418 -Index: eric4-4.5-snapshot-20100523/eric/QScintilla/Editor.py
419 -===================================================================
420 ---- eric4-4.5-snapshot-20100523.orig/eric/QScintilla/Editor.py
421 -+++ eric4-4.5-snapshot-20100523/eric/QScintilla/Editor.py
422 -@@ -28,7 +28,7 @@ from SpellCheckingDialog import SpellChe
423 -
424 - from Debugger.EditBreakpointDialog import EditBreakpointDialog
425 -
426 --from DebugClients.Python.coverage import coverage
427 -+from coverage import coverage
428 -
429 - from DataViews.CodeMetricsDialog import CodeMetricsDialog
430 - from DataViews.PyCoverageDialog import PyCoverageDialog