diff options
author | Johannes Huber <johu@gentoo.org> | 2012-05-23 07:36:03 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2012-05-23 07:36:03 +0000 |
commit | 83a36dc4024e28cbb7af1a60d0a5acccb2cebb07 (patch) | |
tree | a011970ed48dece186ec6ef193f4e5a0026a513f /dev-util/eric | |
parent | marked x86 per bug 417215 (diff) | |
download | gentoo-2-83a36dc4024e28cbb7af1a60d0a5acccb2cebb07.tar.gz gentoo-2-83a36dc4024e28cbb7af1a60d0a5acccb2cebb07.tar.bz2 gentoo-2-83a36dc4024e28cbb7af1a60d0a5acccb2cebb07.zip |
Remove old.
(Portage version: 2.2.0_alpha107/cvs/Linux i686)
Diffstat (limited to 'dev-util/eric')
-rw-r--r-- | dev-util/eric/ChangeLog | 7 | ||||
-rw-r--r-- | dev-util/eric/eric-4.4.14.ebuild | 92 | ||||
-rw-r--r-- | dev-util/eric/eric-5.1.2.ebuild | 95 | ||||
-rw-r--r-- | dev-util/eric/files/eric-5.0.2-remove_coverage.patch | 119 | ||||
-rw-r--r-- | dev-util/eric/files/remove_coverage.patch | 119 |
5 files changed, 6 insertions, 426 deletions
diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog index 55c8f821aa8e..844d33b97a26 100644 --- a/dev-util/eric/ChangeLog +++ b/dev-util/eric/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/eric # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.174 2012/05/23 06:03:13 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.175 2012/05/23 07:36:03 johu Exp $ + + 23 May 2012; Johannes Huber <johu@gentoo.org> -eric-4.4.14.ebuild, + -eric-5.1.2.ebuild, -files/eric-5.0.2-remove_coverage.patch, + -files/remove_coverage.patch: + Remove old. 23 May 2012; Jeff Horelick <jdhore@gentoo.org> eric-4.5.0.ebuild, eric-5.2.0.ebuild: diff --git a/dev-util/eric/eric-4.4.14.ebuild b/dev-util/eric/eric-4.4.14.ebuild deleted file mode 100644 index ce90c11c855e..000000000000 --- a/dev-util/eric/eric-4.4.14.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.4.14.ebuild,v 1.4 2012/02/28 15:03:24 pesa Exp $ - -EAPI="3" -PYTHON_DEPEND="2:2.6" -SUPPORT_PYTHON_ABIS="1" -# 2.4 and 2.5 are restricted to avoid conditional dependency on dev-python/simplejson. -RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*" - -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="4" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="kde spell" - -DEPEND="dev-python/PyQt4[assistant,svg,webkit,X] - dev-python/qscintilla-python - kde? ( kde-base/pykde4 )" -RDEPEND="${DEPEND} - >=dev-python/chardet-2.0 - dev-python/coverage - >=dev-python/pygments-1.1" -PDEPEND="spell? ( dev-python/pyenchant )" - -LANGS="cs de es fr it ru tr zh_CN" -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}" - -PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*") - -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" - - # Delete internal copies of dev-python/chardet, dev-python/coverage, dev-python/pygments and dev-python/simplejson. - rm -fr eric/ThirdParty - rm -fr eric/DebugClients/Python{,3}/coverage -} - -src_install() { - installation() { - "$(PYTHON)" install.py \ - -z \ - -b "${EPREFIX}/usr/bin" \ - -i "${T}/images/${PYTHON_ABI}" \ - -d "${EPREFIX}$(python_get_sitedir)" \ - -c - } - python_execute_function installation - python_merge_intermediate_installation_images "${T}/images" - - doicon eric/icons/default/eric.png || die "doicon failed" - make_desktop_entry "${MY_PN} --nosplash" ${MY_PN} eric "Development;IDE;Qt" -} - -pkg_postinst() { - python_mod_optimize ${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/eric-5.1.2.ebuild b/dev-util/eric/eric-5.1.2.ebuild deleted file mode 100644 index d8e9a92dce4f..000000000000 --- a/dev-util/eric/eric-5.1.2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.1.2.ebuild,v 1.4 2012/02/28 15:03:24 pesa Exp $ - -EAPI="3" -PYTHON_DEPEND="3" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.* *-jython 2.7-pypy-*" - -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 ~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.4" -PDEPEND="spell? ( dev-python/pyenchant )" - -LANGS="cs de es fr it ru tr zh_CN" -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}" - -PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*") - -src_prepare() { - epatch "${FILESDIR}/${PN}-5.0.2-remove_coverage.patch" - - # Avoid file collisions between different slots of Eric. - sed -e "s/^Icon=eric$/&${SLOT}/" -i 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 "${T}/images/${PYTHON_ABI}" \ - -d "${EPREFIX}$(python_get_sitedir)" \ - -c - } - python_execute_function installation - python_merge_intermediate_installation_images "${T}/images" - - doicon eric/icons/default/${MY_PN}.png || die "doicon failed" -} - -pkg_postinst() { - python_mod_optimize -x "/eric5/(DebugClients/Python|UtilitiesPython2)/" ${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 deleted file mode 100644 index 63425454d881..000000000000 --- a/dev-util/eric/files/eric-5.0.2-remove_coverage.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- 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 diff --git a/dev-util/eric/files/remove_coverage.patch b/dev-util/eric/files/remove_coverage.patch deleted file mode 100644 index a63a76e91bef..000000000000 --- a/dev-util/eric/files/remove_coverage.patch +++ /dev/null @@ -1,119 +0,0 @@ -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 |