diff options
Diffstat (limited to 'dev-util/eric')
| -rw-r--r-- | dev-util/eric/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-util/eric/eric-4.4.0.ebuild | 83 | ||||
| -rw-r--r-- | dev-util/eric/files/eric-4.4-no-interactive.patch | 14 | ||||
| -rw-r--r-- | dev-util/eric/files/eric-4.4-no-pykde.patch | 146 |
4 files changed, 253 insertions, 1 deletions
diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog index af72ee095ad3..43dd2d601694 100644 --- a/dev-util/eric/ChangeLog +++ b/dev-util/eric/ChangeLog @@ -1,6 +1,15 @@ # 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.106 2010/01/10 17:40:26 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.107 2010/01/12 15:58:46 yngwin Exp $ + +*eric-4.4.0 (12 Jan 2010) + + 12 Jan 2010; Ben de Groot <yngwin@gentoo.org> +eric-4.4.0.ebuild, + +files/eric-4.4-no-interactive.patch, +files/eric-4.4-no-pykde.patch: + Version bump. Ebuild updates wrt new python.eclass functionality. Porting + improvements from qting-edge overlay. From the 4.4 version eric is + supposed to work with python-3. Italian and Chinese translations added. + Drop hppa/ppc64/sparc keywords because of unkeyworded dependencies. 10 Jan 2010; Brent Baude <ranger@gentoo.org> eric-4.3.9.ebuild: stable ppc64, bug 296580 diff --git a/dev-util/eric/eric-4.4.0.ebuild b/dev-util/eric/eric-4.4.0.ebuild new file mode 100644 index 000000000000..98338308a34e --- /dev/null +++ b/dev-util/eric/eric-4.4.0.ebuild @@ -0,0 +1,83 @@ +# 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.1 2010/01/12 15:58:46 yngwin Exp $ + +EAPI="2" +NEED_PYTHON="2.6" +SUPPORT_PYTHON_ABIS="1" + +inherit eutils python + +MY_PN=${PN}4 +MY_P=${MY_PN}-${PV} +DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla" +HOMEPAGE="http://eric-ide.python-projects.org/" +SRC_URI="mirror://sourceforge/eric-ide/${MY_P}.tar.gz" + +SLOT="4" +LICENSE="GPL-3" +KEYWORDS="~amd64 ~ppc ~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-1.0.1 + >=dev-python/pygments-1.1" +PDEPEND="spell? ( dev-python/pyenchant )" +RESTRICT_PYTHON_ABIS="2.4 2.5 3.2" + +LANGS="cs de es fr it ru tr zh_CN" +for L in ${LANGS}; do + SRC_URI="${SRC_URI} + linguas_${L}? ( mirror://sourceforge/eric-ide/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${PV}.tar.gz )" + IUSE="${IUSE} linguas_${L}" +done + +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch "${FILESDIR}"/eric-4.4-no-interactive.patch + use kde || epatch "${FILESDIR}"/eric-4.4-no-pykde.patch + + # remove bundled copies, bug #283148 + rm -rf "${S}"/eric/ThirdParty +} + +src_install() { + python_version + + installation() { + "$(PYTHON)" install.py \ + -z \ + -b "/usr/bin" \ + -i "${D}" \ + -d "$(python_get_sitedir)" \ + -c + } + python_execute_function installation + + doicon eric/icons/default/eric.png + make_desktop_entry "eric4 --nosplash" eric4 eric "Development;IDE;Qt" +} + +pkg_postinst() { + python_mod_optimize eric4{,config.py,plugins} + + elog + elog "If you want to use eric4 with mod_python, have a look at" + elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric4/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 eric4{,config.py,plugins} +} diff --git a/dev-util/eric/files/eric-4.4-no-interactive.patch b/dev-util/eric/files/eric-4.4-no-interactive.patch new file mode 100644 index 000000000000..4c682bfb777e --- /dev/null +++ b/dev-util/eric/files/eric-4.4-no-interactive.patch @@ -0,0 +1,14 @@ +Index: eric4-4.4-snapshot-20091129/install.py +=================================================================== +--- eric4-4.4-snapshot-20091129.orig/install.py ++++ eric4-4.4-snapshot-20091129/install.py +@@ -761,9 +761,6 @@ def main(argv): + (v[0], v[1], v[2]) + print " with foreign characters. Please see 'README-PyXML.txt' for" + print " details." +- res = raw_input(" Shall pyXML be patched now (y/n)? ") +- if res in ["Y", "y"]: +- patchPyXML() + except ImportError: + pass + diff --git a/dev-util/eric/files/eric-4.4-no-pykde.patch b/dev-util/eric/files/eric-4.4-no-pykde.patch new file mode 100644 index 000000000000..26bbf8925d5c --- /dev/null +++ b/dev-util/eric/files/eric-4.4-no-pykde.patch @@ -0,0 +1,146 @@ +Index: eric4-4.4-snapshot-20091129/eric/KdeQt/__init__.py +=================================================================== +--- eric4-4.4-snapshot-20091129.orig/eric/KdeQt/__init__.py ++++ eric4-4.4-snapshot-20091129/eric/KdeQt/__init__.py +@@ -20,19 +20,6 @@ import sys + import Preferences + + if Preferences.getUI("UseKDEDialogs") and not sys.e4nokde: +- try: +- import PyKDE4 +- from PyQt4.QtCore import QString +- +- def __kdeIsKDE(): +- """ +- Public function to signal the availability of KDE4. +- +- @return availability flag (always True) +- """ +- return True +- +- except (ImportError, RuntimeError): + sys.e4nokde = True + + def __kdeKdeVersionString(): +@@ -56,96 +43,29 @@ def __kdeKdeVersionString(): + return QString("unknown") + + def __kdePyKdeVersionString(): +- """ +- Public function to return the PyKDE4 version as a string. +- +- @return PyKDE4 version as a string (QString) +- """ +- try: +- try: +- from PyKDE4.kdecore import pykde_versionMajor, pykde_versionMinor, \ +- pykde_versionRelease +- return QString("%d.%d.%d" % \ +- (pykde_versionMajor(), pykde_versionMinor(), +- pykde_versionRelease())) +- except (ImportError, AttributeError): +- from PyKDE4 import pykdeconfig +- try: +- return QString(pykdeconfig.Configuration().pykde_version_str) +- except AttributeError: +- return QString("unknown") +- except ImportError: +- return QString("unknown") ++ return QString("PyKDE support is disabled") + + from PyQt4.QtCore import QString + + def __qtIsKDE(): +- """ +- Private function to signal the availability of KDE. +- +- @return availability flag (always False) +- """ + return False + + def __qtKdeVersionString(): +- """ +- Private function to return the KDE version as a string. +- +- @return KDE version as a string (QString) (always empty) +- """ + return QString("") + + def __qtPyKdeVersionString(): +- """ +- Private function to return the PyKDE version as a string. +- +- @return PyKDE version as a string (QString) (always empty) +- """ + return QString("") + + ################################################################################ + + def isKDEAvailable(): +- """ +- Public function to signal the availability of KDE. +- +- @return availability flag (always False) +- """ +- try: +- import PyKDE4 +- return True +- except ImportError: +- return False ++ return False + + def isKDE(): +- """ +- Public function to signal, if KDE usage is enabled. +- +- @return KDE support flag (always False) +- """ +- if Preferences.getUI("UseKDEDialogs") and not sys.e4nokde: +- return __kdeIsKDE() +- else: +- return __qtIsKDE() ++ return __qtIsKDE() + + def kdeVersionString(): +- """ +- Public function to return the KDE version as a string. +- +- @return KDE version as a string (QString) (always empty) +- """ +- if isKDEAvailable(): +- return __kdeKdeVersionString() +- else: +- return __qtKdeVersionString() ++ return __qtKdeVersionString() + + def pyKdeVersionString(): +- """ +- Public function to return the PyKDE version as a string. +- +- @return PyKDE version as a string (QString) (always empty) +- """ +- if isKDEAvailable(): +- return __kdePyKdeVersionString() +- else: +- return __qtPyKdeVersionString() ++ return __qtPyKdeVersionString() +Index: eric4-4.4-snapshot-20091129/eric/eric4.py +=================================================================== +--- eric4-4.4-snapshot-20091129.orig/eric/eric4.py ++++ eric4-4.4-snapshot-20091129/eric/eric4.py +@@ -32,13 +32,12 @@ restartArgsList = ["--nokde", "--nosplas + restartArgs = [arg for arg in sys.argv[1:] if arg.split("=", 1)[0] in restartArgsList] + + # disable the usage of KDE widgets, if requested +-sys.e4nokde = False ++sys.e4nokde = True + if "--nokde" in sys.argv: + del sys.argv[sys.argv.index("--nokde")] + sys.e4nokde = True + else: +- sys.e4nokde = os.getenv("e4nokde") is not None and os.getenv("e4nokde") == "1" +- ++ print "PyKDE support has been disabled. Enable 'kde' useflag to bring it back" + if "--debug" in sys.argv: + del sys.argv[sys.argv.index("--debug")] + logging.basicConfig(level = logging.DEBUG) |