summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-01-16 18:04:22 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-01-16 18:04:22 +0000
commit1aff823fc6d31d3a628337c900d0f2bf64740dd7 (patch)
tree5d254aedccaa1389441bd59088f97724a56fe893 /dev-util/eric
parentkeyworded ~arch for x86, bug 297734 (diff)
downloadhistorical-1aff823fc6d31d3a628337c900d0f2bf64740dd7.tar.gz
historical-1aff823fc6d31d3a628337c900d0f2bf64740dd7.tar.bz2
historical-1aff823fc6d31d3a628337c900d0f2bf64740dd7.zip
Remove bundled copy of coverage. Fixes bug #300757
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'dev-util/eric')
-rw-r--r--dev-util/eric/ChangeLog36
-rw-r--r--dev-util/eric/Manifest5
-rw-r--r--dev-util/eric/eric-4.4.0-r1.ebuild (renamed from dev-util/eric/eric-4.4.0.ebuild)12
-rw-r--r--dev-util/eric/files/remove_coverage.patch119
4 files changed, 151 insertions, 21 deletions
diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index 7ee823f88b81..df0c64f03377 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.108 2010/01/13 17:37:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.109 2010/01/16 18:04:21 hwoarang Exp $
+
+*eric-4.4.0-r1 (16 Jan 2010)
+
+ 16 Jan 2010; <hwoarang@gentoo.org> -eric-4.4.0.ebuild,
+ +eric-4.4.0-r1.ebuild, +files/remove_coverage.patch:
+ Remove bundled copy of coverage. Fixes bug #300757
13 Jan 2010; Jeroen Roovers <jer@gentoo.org> eric-4.4.0.ebuild:
Marked ~hppa (bug #300741).
@@ -123,7 +129,7 @@
09 May 2009; Patrick Lauer <patrick@gentoo.org> +eric-4.3.3.ebuild:
Bump to 4.3.3, homepage changed again
- 03 May 2009; Raúl Porcel <armin76@gentoo.org> eric-4.3.1.ebuild:
+ 03 May 2009; RaΓΊl Porcel <armin76@gentoo.org> eric-4.3.1.ebuild:
sparc stable wrt #267331
28 Apr 2009; Jeroen Roovers <jer@gentoo.org> eric-4.3.1.ebuild:
@@ -226,7 +232,7 @@
+eric-4.1.1.ebuild:
Version bump
- 21 Feb 2008; Raúl Porcel <armin76@gentoo.org> eric-4.0.4.ebuild:
+ 21 Feb 2008; RaΓΊl Porcel <armin76@gentoo.org> eric-4.0.4.ebuild:
sparc stable
09 Feb 2008; Markus Ullmann <jokey@gentoo.org> eric-4.0.4.ebuild:
@@ -246,7 +252,7 @@
01 Jan 2008; Markus Ullmann <jokey@gentoo.org> +eric-4.0.4.ebuild:
Version bump as keeps notifying the user that a new version is out
- 01 Jan 2008; Raúl Porcel <armin76@gentoo.org> eric-4.0.3.ebuild:
+ 01 Jan 2008; RaΓΊl Porcel <armin76@gentoo.org> eric-4.0.3.ebuild:
Readd ~sparc, keywords were dropped for no reason
20 Nov 2007; Ali Polatel <hawking@gentoo.org> eric-3.7.2-r1.ebuild,
@@ -266,10 +272,10 @@
07 Sep 2007; Ali Polatel <hawking@gentoo.org> +eric-4.0.1.ebuild:
version bump, thanks to everyone on bug 158117 and jokey
- 25 Jun 2007; Piotr Jaroszyński <peper@gentoo.org> eric-3.7.2-r1.ebuild:
+ 25 Jun 2007; Piotr JaroszyΕ„ski <peper@gentoo.org> eric-3.7.2-r1.ebuild:
(QA) Fix ${ROOT} abuse. bug #167271.
- 24 Jun 2007; Tiziano Müller <dev-zero@gentoo.org> eric-3.7.2-r1.ebuild,
+ 24 Jun 2007; Tiziano MΓΌller <dev-zero@gentoo.org> eric-3.7.2-r1.ebuild,
-eric-3.9.4.ebuild, eric-3.9.5.ebuild:
Fixed $ROOT abuse (bug #167271)
@@ -278,32 +284,32 @@
*eric-3.9.5 (23 Jun 2007)
- 23 Jun 2007; Tiziano Müller <dev-zero@gentoo.org>
+ 23 Jun 2007; Tiziano MΓΌller <dev-zero@gentoo.org>
+files/3.9.5-disable_compilation.patch, +eric-3.9.5.ebuild:
Version bump, cleanup & ebuild rework.
- 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+ 22 Feb 2007; Piotr JaroszyΕ„ski <peper@gentoo.org> ChangeLog:
Transition to Manifest2.
*eric-3.9.4 (30 Dec 2006)
- 30 Dec 2006; Tiziano Müller <dev-zero@gentoo.org> -eric-3.9.3.ebuild,
+ 30 Dec 2006; Tiziano MΓΌller <dev-zero@gentoo.org> -eric-3.9.3.ebuild,
+eric-3.9.4.ebuild:
Version bump.
- 30 Dec 2006; Tiziano Müller <dev-zero@gentoo.org> eric-3.7.2-r1.ebuild,
+ 30 Dec 2006; Tiziano MΓΌller <dev-zero@gentoo.org> eric-3.7.2-r1.ebuild,
eric-3.9.3.ebuild:
Added qscintilla dependency (bug #117945)
*eric-3.9.3 (26 Dec 2006)
- 26 Dec 2006; Tiziano Müller <dev-zero@gentoo.org> -eric-3.8.1.ebuild,
+ 26 Dec 2006; Tiziano MΓΌller <dev-zero@gentoo.org> -eric-3.8.1.ebuild,
-eric-3.8.2.ebuild, -eric-3.9.1.ebuild, +eric-3.9.3.ebuild:
Version bump with some cleanups. Dropped old versions.
*eric-3.9.1 (14 Oct 2006)
- 14 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> +eric-3.9.1.ebuild:
+ 14 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> +eric-3.9.1.ebuild:
Bump version, bug 137883.
*eric-3.8.2 (23 Apr 2006)
@@ -339,7 +345,7 @@
*eric-3.7.2 (30 Sep 2005)
- 30 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> +eric-3.7.2.ebuild:
+ 30 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> +eric-3.7.2.ebuild:
Version bump, fixes PyQt problem, bug 107716.
*eric-3.7.0 (06 Jun 2005)
@@ -383,7 +389,7 @@
*eric-3.5.1 (05 Dec 2004)
- 05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> +eric-3.5.1.ebuild:
+ 05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> +eric-3.5.1.ebuild:
Version bump.
23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> eric-3.5.0.ebuild:
@@ -421,7 +427,7 @@
*eric-3.4.2 (25 May 2004)
- 25 May 2004; Bryan Østergaard <kloeri@gentoo.org> +eric-3.4.2.ebuild:
+ 25 May 2004; Bryan Østergaard <kloeri@gentoo.org> +eric-3.4.2.ebuild:
Version bump.
17 Feb 2004; Aron Griffis <agriffis@gentoo.org> eric-3.3.1.ebuild:
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index b3685835da4c..c937b291550f 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -2,6 +2,7 @@ AUX 4.2.3-no-interactive.patch 958 RMD160 0f96217e49cd30e042315b73fe39afc827006c
AUX eric-4.3-no-pykde.patch 3667 RMD160 49938766d7027433c2f6988edcef163fe159a260 SHA1 fa2927272ee02f85a28b561087d1bcc7dfe65b7b SHA256 fc77938c3f116fc339979938dc08c151ffcee5f7435021c09a6c33d2f9151f5d
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 remove_coverage.patch 5678 RMD160 34f6aec97d9f78bc83eca73f44d22ccb943aa14b SHA1 5c7c3611ba36b104e3f3a03953a19f22541ec30a SHA256 c0627f72a2237d20ce5dbcf01b8fabf0464062ca63d8dbf9a5cd7e5bb4df20a0
DIST eric4-4.3.1.tar.gz 5132500 RMD160 719a955bb1d2f64efb3e9958a63bb3f4313d1423 SHA1 58d6c8cf1cb9acbfeab634a165cdee731fe4a257 SHA256 463b82e1f226d0f5b76e5b6e4158e9518f88a6f7f751963a87d9587b423ff9a1
DIST eric4-4.3.10.tar.gz 4930563 RMD160 7815090c7829a4e47395fc6659865f6c14dc8c64 SHA1 afde40a05d51d41bd7e9aa5bbdcbf04cf99b6b3a SHA256 aee1da03f4f1b1f1170d9190708c9e58336bc8036e3e12fa7941e89a41b7bd76
DIST eric4-4.3.9.tar.gz 4930403 RMD160 ed5766371a4e9277a455f071f61ce7e21466e6e4 SHA1 bdb54fcb50b3d6eac38bd4dc8bbd1c3e138819dd SHA256 042de109e4332abcb7c159ee7451ec6f26a0667f457622b72c318926d7b0ed78
@@ -37,6 +38,6 @@ DIST eric4-i18n-zh_CN.GB2312-4.4.0.tar.gz 391765 RMD160 95302b143c5ce2898e02fa29
EBUILD eric-4.3.1.ebuild 2354 RMD160 330354e7428c335ef8e1bda6f6a20bec8c2cc425 SHA1 62cf3f1c0ff3e16654e4d8f565f4778b072bfbb3 SHA256 fcc07433818f144dce4eded9d3e674606614793c5076af89f6847e3acd8462d2
EBUILD eric-4.3.10-r1.ebuild 2556 RMD160 8218cac21349f7df1f8954365d151cb811ba351e SHA1 419910ab3ba16daa739cf483e5ad5dab054d2409 SHA256 02c5297a1879f1eca6bb93e2294dc0b127dfa7f68dcc2350709fb2ae1907bea4
EBUILD eric-4.3.9.ebuild 2449 RMD160 f9ba728e01add29a32839c7ddb77720d4041c149 SHA1 3fa4f8876d6d407cd136660ca6858bf28aacb282 SHA256 dbfef9751f9a25bb6cc733051921209fd6015acd5636abd73ea4df850b3f9d6b
-EBUILD eric-4.4.0.ebuild 2229 RMD160 18511139c75a16ff9e04eee90232d0cb843700ee SHA1 2a640502d7240b239df23bd1f26fbe71869ddfbc SHA256 1f4879c351483a033cba0e43b952826fe1aecdfd1322c5c88a860bc5dab46959
-MISC ChangeLog 14342 RMD160 032ae42b9534a16b6d4d2946dedfd4252dea61b1 SHA1 da55ad78edc3d0f777e764a7e1ea00cd0e16cd00 SHA256 92afd269f7a465c35f1cdeb9690588fb3c7cae925dab7dd560806122b5659dcf
+EBUILD eric-4.4.0-r1.ebuild 2410 RMD160 190cf31d62e0ae4932a05c7289f61c2b06aed43a SHA1 50f93bda20a846458f3a3f4fdb7ce0d7a522bff3 SHA256 68d8be90884a83e722c7d959b46789b396d55ff58b5a9121fe0423ea634851cf
+MISC ChangeLog 14571 RMD160 8269709c650ae6a4104b69924d39094453416079 SHA1 377741ad39aab0c2262485836ba3d4a319f6bd7b SHA256 0fa6df6e045cfd06bd6b931970c42bad540be315ebc45ea7fc0128d45c77eebb
MISC metadata.xml 179 RMD160 887c899594fdaa3d82028c3d84188354d3784cd9 SHA1 551c6b2378ff31eadc1e4860211ec8709ce960bd SHA256 1fbdee58e0ba0f8730f6a27979cb7eeed8ebd3afa316d61b34a5f4893291a646
diff --git a/dev-util/eric/eric-4.4.0.ebuild b/dev-util/eric/eric-4.4.0-r1.ebuild
index a10820a49efb..ef5c08c2ecb0 100644
--- a/dev-util/eric/eric-4.4.0.ebuild
+++ b/dev-util/eric/eric-4.4.0-r1.ebuild
@@ -1,6 +1,6 @@
# 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-4.4.0.ebuild,v 1.3 2010/01/13 17:37:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.4.0-r1.ebuild,v 1.1 2010/01/16 18:04:21 hwoarang Exp $
EAPI="2"
NEED_PYTHON="2.6"
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz"
SLOT="4"
LICENSE="GPL-3"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="kde spell"
DEPEND="dev-python/PyQt4[assistant,svg,webkit,X]
@@ -24,7 +24,8 @@ DEPEND="dev-python/PyQt4[assistant,svg,webkit,X]
kde? ( kde-base/pykde4 )"
RDEPEND="${DEPEND}
>=dev-python/chardet-2.0
- >=dev-python/pygments-1.1"
+ >=dev-python/pygments-1.1
+ dev-python/coverage"
PDEPEND="spell? ( dev-python/pyenchant )"
# 2.4 and 2.5 are restricted to avoid conditional dependency on dev-python/simplejson.
RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
@@ -40,10 +41,13 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}"/eric-4.4-no-interactive.patch
+ epatch "${FILESDIR}"/remove_coverage.patch
use kde || epatch "${FILESDIR}"/eric-4.4-no-pykde.patch
- # remove bundled copies, bug #283148
+ # remove bundled copies, bug #283148 and bug 300757
rm -rf "${S}"/eric/ThirdParty
+ rm -rf "${S}"/eric/DebugClients/Python/coverage
+ rm -rf "${S}"/eric/DebugClients/Python3/coverage
}
src_install() {
diff --git a/dev-util/eric/files/remove_coverage.patch b/dev-util/eric/files/remove_coverage.patch
new file mode 100644
index 000000000000..a63a76e91bef
--- /dev/null
+++ b/dev-util/eric/files/remove_coverage.patch
@@ -0,0 +1,119 @@
+Index: eric4-4.4.0/eric/eric4.e4p
+===================================================================
+--- eric4-4.4.0.orig/eric/eric4.e4p
++++ eric4-4.4.0/eric/eric4.e4p
+@@ -614,12 +614,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>
+@@ -652,15 +646,6 @@
+ <Source>E4Network/E4NetworkMonitor.py</Source>
+ <Source>E4Network/E4NetworkHeaderDetailsDialog.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>
+@@ -720,23 +705,6 @@
+ <Source>eric4-iconeditor.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>E4Gui/E4ModelToolBar.py</Source>
+ <Source>E4Gui/E4TreeSortFilterProxyModel.py</Source>
+ <Source>ThirdParty/Pygments/pygments/lexers/parsers.py</Source>
+@@ -1045,15 +1013,11 @@
+ <Other>Documentation/Help</Other>
+ <Other>ThirdParty/SimpleJSON/simplejson/LICENSE.txt</Other>
+ <Other>ThirdParty/SimpleJSON/simplejson/PKG-INFO</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>
+ </Others>
+ <MainScript>eric4.py</MainScript>
+ <Vcs>
+@@ -1511,4 +1475,4 @@
+ </dict>
+ </CheckersParams>
+ </Checkers>
+-</Project>
+\ No newline at end of file
++</Project>
+Index: eric4-4.4.0/eric/DataViews/PyCoverageDialog.py
+===================================================================
+--- eric4-4.4.0.orig/eric/DataViews/PyCoverageDialog.py
++++ eric4-4.4.0/eric/DataViews/PyCoverageDialog.py
+@@ -19,7 +19,7 @@ from KdeQt.KQProgressDialog import KQPro
+ from Ui_PyCoverageDialog import Ui_PyCoverageDialog
+
+ import Utilities
+-from DebugClients.Python.coverage import coverage
++from coverage import coverage
+
+ class PyCoverageDialog(QDialog, Ui_PyCoverageDialog):
+ """
+Index: eric4-4.4.0/eric/PyUnit/UnittestDialog.py
+===================================================================
+--- eric4-4.4.0.orig/eric/PyUnit/UnittestDialog.py
++++ eric4-4.4.0/eric/PyUnit/UnittestDialog.py
+@@ -26,7 +26,7 @@ from E4Gui.E4Completers import E4FileCom
+ from Ui_UnittestDialog import Ui_UnittestDialog
+ from Ui_UnittestStacktraceDialog import Ui_UnittestStacktraceDialog
+
+-from DebugClients.Python.coverage import coverage
++from coverage import coverage
+
+ import UI.PixmapCache
+
+Index: eric4-4.4.0/eric/QScintilla/Editor.py
+===================================================================
+--- eric4-4.4.0.orig/eric/QScintilla/Editor.py
++++ eric4-4.4.0/eric/QScintilla/Editor.py
+@@ -28,7 +28,7 @@ from SpellCheckingDialog import SpellChe
+
+ from Debugger.EditBreakpointDialog import EditBreakpointDialog
+
+-from DebugClients.Python.coverage import coverage
++from coverage import coverage
+
+ from DataViews.CodeMetricsDialog import CodeMetricsDialog
+ from DataViews.PyCoverageDialog import PyCoverageDialog