Version bump.

Package-Manager: portage-2.2_rc83_p15/cvs/Linux x86_64

4 files changed, 227 insertions, 2 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index ba2f4995d17d..840db7c961ce 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/eric
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.132 2010/09/17 19:51:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.133 2010/09/17 19:58:49 arfrever Exp $
+
+*eric-5.0.2 (17 Sep 2010)
+
+  17 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +eric-5.0.2.ebuild, +files/eric-5.0.2-remove_coverage.patch:
+  Version bump.
 
 *eric-4.4.8 (17 Sep 2010)
 
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index af696e08df82..6595676fcf9d 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,5 +1,6 @@
 AUX eric-4.4-no-interactive.patch 600 RMD160 c2c0d5a4c08c7505e1d7871a782bf98cbc66a408 SHA1 60d593f9e3319a240170cff9243a92e63ae97b58 SHA256 ae818575da55ea4074fc8d1ac846f5ce338135b543b927c748bd94c8860325b5
 AUX eric-4.4-no-pykde.patch 4499 RMD160 909a9e0fe1dc39b8ea21b383c6612742cceab6bc SHA1 505dc2b630b9356b794da33cb8e20bc126f7ac40 SHA256 371c080e2f561ece22f4e6a0ff427efdf43b0d3d81cefc2b7efb99010f890dde
+AUX eric-5.0.2-remove_coverage.patch 5750 RMD160 e20f3a8528bd9d45da5ba637c86b627dce13f715 SHA1 447ea286ca864f46375711f7530d2c3d1970b93f SHA256 560d41c88e597ea6aa1bd023e400a9700b397d4d850aca408c65f8683920c507
 AUX remove_coverage.patch 5678 RMD160 34f6aec97d9f78bc83eca73f44d22ccb943aa14b SHA1 5c7c3611ba36b104e3f3a03953a19f22541ec30a SHA256 c0627f72a2237d20ce5dbcf01b8fabf0464062ca63d8dbf9a5cd7e5bb4df20a0
 DIST eric4-4.4.3.tar.gz 6683561 RMD160 9613369b25bd98471dfdbb405ffebc93d3aa9e1e SHA1 7506e9d0146a072d69bf754ca31d2e55bdd41267 SHA256 9c5cedd8bfdf9517de6774a0b379d093cb42348629f0f6afdff2f1ec158cfd45
 DIST eric4-4.4.4a.tar.gz 6683930 RMD160 a5248dc6482a1c05c4a94a2188db935d01bc5b43 SHA1 470ba308268016dcc4a4584810278345e3878e56 SHA256 2dc3b827eae34cbb7780aef8d62e6019b26e9a32d7800eb74e997d9459a715a9
@@ -55,11 +56,18 @@ DIST eric4-i18n-zh_CN.GB2312-4.4.5.tar.gz 392420 RMD160 7b69ff207b674ebf119be382
 DIST eric4-i18n-zh_CN.GB2312-4.4.6.tar.gz 392440 RMD160 b19870f73b230ff42724ef47114f502d9dad42c9 SHA1 eba7d5a2cbaf06f22001665ba05665c974ee4efa SHA256 9bf58488b79ee057bdf48a925babfba8c0224a9052dde329200c6da3f5d2e60f
 DIST eric4-i18n-zh_CN.GB2312-4.4.7.tar.gz 392437 RMD160 c9f3d8c6f3798578c5a5c2732b97ec44bcbfd5c8 SHA1 0f97d5adeacab823b4415a626d7b8a54a94dc731 SHA256 e0cea4a47cb25bfe8a61dfd145271fcadf6e856be5a713dfba468050282e89d0
 DIST eric4-i18n-zh_CN.GB2312-4.4.8.tar.gz 392437 RMD160 bc842e00be0967b38365e1590698a6597b5ac961 SHA1 21a5ad5717c2182775446632dd8aac229c2ad177 SHA256 c6e029ba36da94730abf38bd795059304ef52aa0252537ceedd6ccb889fb4b0b
+DIST eric5-5.0.2.tar.gz 6876131 RMD160 a934990cca5cacddace3be313bf6695a07ff49cf SHA1 70e28775d158ac5b024dd62412d2e96a5adb028d SHA256 aaec04eb837373ce1bbf1ddb7ac5c47b0b8a2d7af1226d0f3805e978847dc575
+DIST eric5-i18n-cs-5.0.2.tar.gz 494441 RMD160 ad6708a591d932b45dfd03603fc4536e0eb113e5 SHA1 e152068f4f9f46172e4d23ddb5e601c9c6a2d8b3 SHA256 852f403c8ee2867dd06ef30dbf2f62970d4fb0d3f6f1d8e837dba7b17f834e58
+DIST eric5-i18n-de-5.0.2.tar.gz 494718 RMD160 061bf8916fab942d590e6e9be2f266acf63cfcc6 SHA1 4b3558b719086e568152af53001957c0f154389e SHA256 747b734fa42686c20dc01e1467a10baf97221c307744cc89d11a2c02f305a77e
+DIST eric5-i18n-es-5.0.2.tar.gz 498972 RMD160 b1752b2acc8b3e26713201657de8ff797fc43aa5 SHA1 263d73f887e4169f8d1d95de3fdb8a7b72bbe924 SHA256 e13c4c6ecda60fb5ba0176941a7458230487db5593edbc13b3958d3dc4826ad8
+DIST eric5-i18n-it-5.0.2.tar.gz 486874 RMD160 ac757789c4ab03a1f34a881cde00c9604de4e9ff SHA1 e61c2e8d7adb5e5d72a4970cfef76d21ffec9190 SHA256 9cf5cb99145f9f5e18e6277fd7b722f7ccca3ce71217409c1c58ede3a3c98883
+DIST eric5-i18n-ru-5.0.2.tar.gz 514620 RMD160 766780ffec34c76304a5e0a48f517b6e473ab2fa SHA1 6650f43531bcad2a6bab15ded86f4b663e60a4ba SHA256 05f0ec5e13c5c996cda87885e8e5847be270dab06243eef7d3b55c278f7d5766
 EBUILD eric-4.4.3.ebuild 2471 RMD160 0734d3ebca07723125f46c9835fda0482642b553 SHA1 9722ec8a8054a123a9e77dee99c6df67a243058f SHA256 736b3f741ddba3f3cb63b4f80fa109e40fe5fa8e53ecae5e07f100535838ab8a
 EBUILD eric-4.4.4a.ebuild 2465 RMD160 8eaeecf5e87b48fd2b1b809b6c470f67fc6f7370 SHA1 3c2742b5b5cf7f52de42de7b922e14bf5a12cd94 SHA256 708ab3db16d1bf5622dee6967085b701aed358b53a8b0c3d61a7804d110c593f
 EBUILD eric-4.4.5.ebuild 2473 RMD160 aaae10fae7182630549696dbc0324d8dafd23fb7 SHA1 2a849a73c24536551b05570370a28cfd31734188 SHA256 1a19def876e479c4b4b36e1184f634fb991447cd6bf112fdb4563e20cc9b1d04
 EBUILD eric-4.4.6.ebuild 2473 RMD160 fda7cfd98b8c77247a9236ea447dbb83c3b2b59d SHA1 a6b0e8f0c458f3c9c59acd2e9eca7265df304960 SHA256 e461dfb4e582c521aed415c19aabd10e400b10a311c5220274318b0f0fba7b19
 EBUILD eric-4.4.7.ebuild 2474 RMD160 10229175a2b38036d2d7bb2fc5a2698a6b167248 SHA1 dcac35e42caf8311019e8a4f9b845000711aaaa4 SHA256 7e34d6743ed23f3302bafc03888252f6e44c7ba7a0c217dbd343036c9c299f48
 EBUILD eric-4.4.8.ebuild 2541 RMD160 b524f036eca7373377fffc8c777de05e4e1a3f6a SHA1 ddf187a7d391294f3f3cf0aefc5e962bc2371111 SHA256 4001dc33ef9d1a15e4e56e1619a6da804a46fb45a3e6c978655896fafa2f2f6e
-MISC ChangeLog 17104 RMD160 91e7263b0e063a0510b6f87ac6fdb12eef3869aa SHA1 3f23dc8006bf65bf2f76cdec211e60c814938d8f SHA256 bb331f9eb7207f76fed0bef2329acbc962ab720e6f2692d8b97d67fcccf4b41f
+EBUILD eric-5.0.2.ebuild 2677 RMD160 eebb2e61c0c70cdec1aa6bc0ea021511a09a20f3 SHA1 7abd7348553c026ae506a8367c61b1d4815ba4b3 SHA256 7a4932ae80fd0011d1435b977f4198a0599c3c7d4c34a3a262536e8dfd397596
+MISC ChangeLog 17284 RMD160 18793e7bc5f964285b6fdbb6b6be50f12398acdd SHA1 8bc040f97490bd4b72f85d33385f967c5cf34c18 SHA256 718f461c33a113662f8a78c397398bf8d56a1b4cdb5034f32d49d820b359e68a
 MISC metadata.xml 179 RMD160 887c899594fdaa3d82028c3d84188354d3784cd9 SHA1 551c6b2378ff31eadc1e4860211ec8709ce960bd SHA256 1fbdee58e0ba0f8730f6a27979cb7eeed8ebd3afa316d61b34a5f4893291a646
diff --git a/dev-util/eric/eric-5.0.2.ebuild b/dev-util/eric/eric-5.0.2.ebuild
new file mode 100644
index 000000000000..a62ce2757ccc
--- /dev/null
+++ b/dev-util/eric/eric-5.0.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.0.2.ebuild,v 1.1 2010/09/17 19:58:49 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.*"
+
+inherit eutils python
+
+MY_PN="${PN}${PV%%.*}"
+MY_PV="${PV/_pre/-snapshot-}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
+HOMEPAGE="http://eric-ide.python-projects.org/"
+BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
+SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="spell"
+
+DEPEND=">=dev-python/PyQt4-4.7[assistant,svg,webkit,X]
+	>=dev-python/qscintilla-python-2.4"
+RDEPEND="${DEPEND}
+	>=dev-python/chardet-2.0.1
+	>=dev-python/coverage-3.2
+	>=dev-python/pygments-1.1.1"
+PDEPEND="spell? ( dev-python/pyenchant )"
+
+LANGS="cs de es it ru"
+for L in ${LANGS}; do
+	SRC_URI="${SRC_URI}
+		linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
+	IUSE="${IUSE} linguas_${L}"
+done
+unset L
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-remove_coverage.patch"
+
+	# Avoid file collisions between different slots of Eric.
+	sed -e "s/^Icon=eric$/&${SLOT}/" eric/${MY_PN}.desktop || die "sed failed"
+	sed -e "s/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/" -i $(grep -lr eric.png .) || die "sed failed"
+	mv eric/icons/default/eric{,5}.png || die "mv failed"
+	mv eric/pixmaps/eric{,5}.png || die "mv failed"
+	rm -f eric/APIs/Python/zope-*.api
+	rm -f eric/APIs/Ruby/Ruby-*.api
+
+	# Delete internal copies of dev-python/chardet, dev-python/coverage and dev-python/pygments.
+	rm -fr eric/ThirdParty
+	rm -fr eric/DebugClients/Python{,3}/coverage
+}
+
+src_install() {
+	installation() {
+		"$(PYTHON)" install.py \
+			-z \
+			-b "${EPREFIX}/usr/bin" \
+			-i "${D}" \
+			-d "${EPREFIX}$(python_get_sitedir)" \
+			-c
+	}
+	python_execute_function installation
+
+	doicon eric/icons/default/${MY_PN}.png || die "doicon failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize -x "/eric5/DebugClients/Python/" ${MY_PN}{,config.py,plugins}
+
+	elog
+	elog "If you want to use Eric with mod_python, have a look at"
+	elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
+	elog
+	elog "The following packages will give Eric extended functionality:"
+	elog "  dev-python/pylint"
+	elog "  dev-python/pysvn"
+	elog
+	elog "This version has a plugin interface with plugin-autofetch from"
+	elog "the application itself. You may want to check those as well."
+	elog
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${MY_PN}{,config.py,plugins}
+}
diff --git a/dev-util/eric/files/eric-5.0.2-remove_coverage.patch b/dev-util/eric/files/eric-5.0.2-remove_coverage.patch
new file mode 100644
index 000000000000..63425454d881
--- /dev/null
+++ b/dev-util/eric/files/eric-5.0.2-remove_coverage.patch
@@ -0,0 +1,119 @@
+--- eric/DataViews/PyCoverageDialog.py
++++ eric/DataViews/PyCoverageDialog.py
+@@ -15,7 +15,7 @@
+ from .Ui_PyCoverageDialog import Ui_PyCoverageDialog
+ 
+ import Utilities
+-from DebugClients.Python3.coverage import coverage
++from coverage import coverage
+ 
+ class PyCoverageDialog(QDialog, Ui_PyCoverageDialog):
+     """
+--- eric/eric5.e4p
++++ eric/eric5.e4p
+@@ -542,12 +542,6 @@
+     <Source>Helpviewer/HelpTopicDialog.py</Source>
+     <Source>Helpviewer/HelpSearchWidget.py</Source>
+     <Source>Helpviewer/HelpDocsInstaller.py</Source>
+-    <Source>DebugClients/Python/coverage/data.py</Source>
+-    <Source>DebugClients/Python/coverage/cmdline.py</Source>
+-    <Source>DebugClients/Python/coverage/collector.py</Source>
+-    <Source>DebugClients/Python/coverage/misc.py</Source>
+-    <Source>DebugClients/Python/coverage/control.py</Source>
+-    <Source>DebugClients/Python/coverage/__init__.py</Source>
+     <Source>Debugger/DebuggerInterfacePython3.py</Source>
+     <Source>Preferences/ConfigurationPages/DebuggerPython3Page.py</Source>
+     <Source>DebugClients/Python3/AsyncFile.py</Source>
+@@ -568,15 +562,6 @@
+     <Source>Helpviewer/HelpWebSearchWidget.py</Source>
+     <Source>Helpviewer/HelpClearPrivateDataDialog.py</Source>
+     <Source>Helpviewer/HelpLanguagesDialog.py</Source>
+-    <Source>DebugClients/Python/coverage/html.py</Source>
+-    <Source>DebugClients/Python/coverage/report.py</Source>
+-    <Source>DebugClients/Python/coverage/templite.py</Source>
+-    <Source>DebugClients/Python/coverage/codeunit.py</Source>
+-    <Source>DebugClients/Python/coverage/summary.py</Source>
+-    <Source>DebugClients/Python/coverage/files.py</Source>
+-    <Source>DebugClients/Python/coverage/annotate.py</Source>
+-    <Source>DebugClients/Python/coverage/parser.py</Source>
+-    <Source>DebugClients/Python/coverage/execfile.py</Source>
+     <Source>Helpviewer/CookieJar/__init__.py</Source>
+     <Source>Helpviewer/CookieJar/CookiesExceptionsDialog.py</Source>
+     <Source>Helpviewer/CookieJar/CookieModel.py</Source>
+@@ -631,23 +616,6 @@
+     <Source>IconEditor/IconEditorWindow.py</Source>
+     <Source>IconEditor/IconZoomDialog.py</Source>
+     <Source>IconEditor/IconEditorPalette.py</Source>
+-    <Source>DebugClients/Python/coverage/backward.py</Source>
+-    <Source>DebugClients/Python3/coverage/__init__.py</Source>
+-    <Source>DebugClients/Python3/coverage/annotate.py</Source>
+-    <Source>DebugClients/Python3/coverage/backward.py</Source>
+-    <Source>DebugClients/Python3/coverage/cmdline.py</Source>
+-    <Source>DebugClients/Python3/coverage/codeunit.py</Source>
+-    <Source>DebugClients/Python3/coverage/collector.py</Source>
+-    <Source>DebugClients/Python3/coverage/control.py</Source>
+-    <Source>DebugClients/Python3/coverage/data.py</Source>
+-    <Source>DebugClients/Python3/coverage/execfile.py</Source>
+-    <Source>DebugClients/Python3/coverage/files.py</Source>
+-    <Source>DebugClients/Python3/coverage/html.py</Source>
+-    <Source>DebugClients/Python3/coverage/misc.py</Source>
+-    <Source>DebugClients/Python3/coverage/parser.py</Source>
+-    <Source>DebugClients/Python3/coverage/report.py</Source>
+-    <Source>DebugClients/Python3/coverage/summary.py</Source>
+-    <Source>DebugClients/Python3/coverage/templite.py</Source>
+     <Source>ThirdParty/Pygments/pygments/lexers/parsers.py</Source>
+     <Source>Helpviewer/Passwords/__init__.py</Source>
+     <Source>Helpviewer/Passwords/PasswordManager.py</Source>
+@@ -700,14 +668,6 @@
+     <Source>eric5-api.py</Source>
+     <Source>DebugClients/Python/eric5dbgstub.py</Source>
+     <Source>DebugClients/Python3/eric5dbgstub.py</Source>
+-    <Source>DebugClients/Python3/coverage/bytecode.py</Source>
+-    <Source>DebugClients/Python3/coverage/xmlreport.py</Source>
+-    <Source>DebugClients/Python3/coverage/phystokens.py</Source>
+-    <Source>DebugClients/Python3/coverage/results.py</Source>
+-    <Source>DebugClients/Python/coverage/bytecode.py</Source>
+-    <Source>DebugClients/Python/coverage/xmlreport.py</Source>
+-    <Source>DebugClients/Python/coverage/phystokens.py</Source>
+-    <Source>DebugClients/Python/coverage/results.py</Source>
+     <Source>E5XML/ProjectWriter.py</Source>
+     <Source>E5XML/SessionWriter.py</Source>
+     <Source>E5XML/ProjectHandler.py</Source>
+@@ -1082,15 +1042,11 @@
+     <Other>ThirdParty/Pygments/pygments/AUTHORS</Other>
+     <Other>ThirdParty/Pygments/pygments/PKG-INFO</Other>
+     <Other>Documentation/Help</Other>
+-    <Other>DebugClients/Python/coverage/htmlfiles</Other>
+     <Other>IconEditor/cursors/aim-cursor.xpm</Other>
+     <Other>IconEditor/cursors/colorpicker-cursor.xpm</Other>
+     <Other>IconEditor/cursors/eraser-cursor.xpm</Other>
+     <Other>IconEditor/cursors/fill-cursor.xpm</Other>
+     <Other>IconEditor/cursors/paintbrush-cursor.xpm</Other>
+-    <Other>DebugClients/Python/coverage/doc</Other>
+-    <Other>DebugClients/Python3/coverage/doc</Other>
+-    <Other>DebugClients/Python3/coverage/htmlfiles</Other>
+     <Other>eric5config.linux</Other>
+     <Other>eric5.e4p</Other>
+     <Other>README-eric5-doc.txt</Other>
+--- eric/PyUnit/UnittestDialog.py
++++ eric/PyUnit/UnittestDialog.py
+@@ -23,7 +23,7 @@
+ from .Ui_UnittestDialog import Ui_UnittestDialog
+ from .Ui_UnittestStacktraceDialog import Ui_UnittestStacktraceDialog
+ 
+-from DebugClients.Python3.coverage import coverage
++from coverage import coverage
+ 
+ import UI.PixmapCache
+ 
+--- eric/QScintilla/Editor.py
++++ eric/QScintilla/Editor.py
+@@ -27,7 +27,7 @@
+ 
+ from Debugger.EditBreakpointDialog import EditBreakpointDialog
+ 
+-from DebugClients.Python3.coverage import coverage
++from coverage import coverage
+ 
+ from DataViews.CodeMetricsDialog import CodeMetricsDialog
+ from DataViews.PyCoverageDialog import PyCoverageDialog