From 2fab236296c69f6d7d86c6ba9ce2077da34cd4f0 Mon Sep 17 00:00:00 2001 From: Andrey Grozin Date: Tue, 22 Nov 2011 13:49:22 +0000 Subject: Bug #390961 fixed, thanks to Arfrever Frehtes Taifersar Arahesis Package-Manager: portage-2.2.0_alpha76/cvs/Linux i686 --- dev-python/spyder/ChangeLog | 7 ++- dev-python/spyder/Manifest | 7 +-- .../spyder-2.1.2-disable_sphinx_dependency.patch | 57 ++++++++++++++++++++++ dev-python/spyder/metadata.xml | 3 +- dev-python/spyder/spyder-2.1.2.ebuild | 14 ++++-- 5 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 dev-python/spyder/files/spyder-2.1.2-disable_sphinx_dependency.patch (limited to 'dev-python/spyder') diff --git a/dev-python/spyder/ChangeLog b/dev-python/spyder/ChangeLog index 6778336fad6b..f704cfb38d15 100644 --- a/dev-python/spyder/ChangeLog +++ b/dev-python/spyder/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/spyder # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/ChangeLog,v 1.21 2011/11/18 10:02:59 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/ChangeLog,v 1.22 2011/11/22 13:49:22 grozin Exp $ + + 22 Nov 2011; Andrey Grozin spyder-2.1.2.ebuild, + +files/spyder-2.1.2-disable_sphinx_dependency.patch, metadata.xml: + Bug #390961 fixed, thanks to Arfrever Frehtes Taifersar Arahesis + *spyder-2.1.2 (18 Nov 2011) diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest index c0c0b2749221..bda169a5ff6b 100644 --- a/dev-python/spyder/Manifest +++ b/dev-python/spyder/Manifest @@ -1,7 +1,8 @@ AUX spyder-2.0.10-disable_sphinx_dependency.patch 2359 RMD160 1816eebdbd81a415c81fba69e952dd0bcf70bb28 SHA1 a03da83d8f15139387cd6bcbb7d1f74a9b625703 SHA256 a57720cb4963e86789cc04844e049404ae98d45670ca7c611aa4d430ce3e1905 +AUX spyder-2.1.2-disable_sphinx_dependency.patch 2277 RMD160 660170dad21b0510c6e9e7e84b3d7865d2137761 SHA1 97ce5e73acd8ad8be1fb50e57eed6c96e19a9835 SHA256 a1ec203f3ab0ab9647454f1862bf208a9a271b68084cd874e510aa9d9b3aa51a DIST spyder-2.0.12.zip 1794855 RMD160 571565d243af70c9ba8c89d62481c2cb3b1bceff SHA1 a592caf81f4c1f72d637a5269f5c60f8f43e57ee SHA256 07d68efb162f06a98ea31469624d7932ed2fce884efd1870e1bc641e76ecc2d9 DIST spyder-2.1.2.zip 1921837 RMD160 d04ff71bb5fc8c80cc71c89c2cdc56646e00ed25 SHA1 0d675de517af704e5c94cbe839d4694a37811d95 SHA256 437dff12976ecbb69520d227a1fe718b058e40075b57fa85debd1bb90bee93dd EBUILD spyder-2.0.12.ebuild 1675 RMD160 6d4169c470d4b3b9f319080a69c2807608f0bdd8 SHA1 2eba78057b3f32aceab7a1585e1936cc541d6af6 SHA256 8f2b481b6c9487b6fe91916e894952fa994841c613cf5d9b4d49309058902501 -EBUILD spyder-2.1.2.ebuild 1595 RMD160 7060e634aa5df692473dd3557c2e430c18eca80c SHA1 d37d251cbb3d09e964855c2eed0c1d4d8cbe0867 SHA256 69f4a95ebf4abdda516f7e35ecafa29e07ad2bff7076861f3ba811141a0aa2cc -MISC ChangeLog 3724 RMD160 0d91a1013781aee49f17788bf6957368b3d7edc4 SHA1 3267ee90590d74762a460b143fd12d7ae57f1a63 SHA256 b2b4beccd2ef712922c16049faddf9394b199f3ed58ec72d3c9dc10282fc90ea -MISC metadata.xml 1118 RMD160 dd82c89543b4aa9ca07c2717f17a1b1cdedcb639 SHA1 65e5b3fc01a39074cb4b5a8cb90824975fa3f7af SHA256 f645f028011a8f8ae6a716ffbece4423d9884a00c3a294f588192d0cf69e8e40 +EBUILD spyder-2.1.2.ebuild 1743 RMD160 a898972fdcb69226740ff1c0222fa20ef83c31e5 SHA1 a7c82a09e6f1b947b81f7ad7cdb6e3c34b5e8d59 SHA256 01591db3fdff117bd0ec1fd5ed2f03784101a54b77a46cbdce34043daa539220 +MISC ChangeLog 3958 RMD160 8b347025cc92f4d43d525a37d0a1f22c7fffb9e2 SHA1 a4761d6ec96282e9e7156e5d70e15e35f168e8f8 SHA256 e116907106a2228a558196c1d39d731b308725287e540be4929be775f27f78e5 +MISC metadata.xml 1194 RMD160 f3822a7d2bc38f32c8d84d05d0a453b41e55004b SHA1 eddb66d27bb227fc589f62e8079c99b24562dd79 SHA256 5ec8e7bb1750e71d59de8a3e13ed3ed238666184d6091a6b9c98a9a1a91a22c3 diff --git a/dev-python/spyder/files/spyder-2.1.2-disable_sphinx_dependency.patch b/dev-python/spyder/files/spyder-2.1.2-disable_sphinx_dependency.patch new file mode 100644 index 000000000000..f4fbba600ee1 --- /dev/null +++ b/dev-python/spyder/files/spyder-2.1.2-disable_sphinx_dependency.patch @@ -0,0 +1,57 @@ +--- setup.py ++++ setup.py +@@ -13,7 +13,6 @@ + + from distutils.core import setup + from distutils.command.build import build +-from sphinx import setup_command + import os + import os.path as osp + import sys +@@ -40,30 +39,6 @@ + return splist + + +-# Sphinx build (documentation) +-class MyBuild(build): +- def has_doc(self): +- setup_dir = os.path.dirname(os.path.abspath(__file__)) +- return os.path.isdir(os.path.join(setup_dir, 'doc')) +- sub_commands = build.sub_commands + [('build_doc', has_doc)] +- +- +-class MyBuildDoc(setup_command.BuildDoc): +- def run(self): +- build = self.get_finalized_command('build') +- sys.path.insert(0, os.path.abspath(build.build_lib)) +- dirname = self.distribution.get_command_obj('build').build_purelib +- self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc') +- try: +- setup_command.BuildDoc.run(self) +- except UnicodeDecodeError: +- print >>sys.stderr, "ERROR: unable to build documentation because Sphinx do not handle source path with non-ASCII characters. Please try to move the source package to another location (path with *only* ASCII characters)." +- sys.path.pop(0) +- +- +-cmdclass = {'build': MyBuild, 'build_doc': MyBuildDoc} +- +- + NAME = 'spyder' + LIBNAME = 'spyderlib' + from spyderlib import __version__, __project_url__ +@@ -88,7 +63,7 @@ + get_package_data(LIBNAME, ('.mo', '.svg', '.png', '.css')), + 'spyderplugins': + get_package_data('spyderplugins', ('.mo', '.svg', '.png'))}, +- requires=["rope (>=0.9.2)", "sphinx (>=0.6.0)", "PyQt4 (>=4.4)"], ++ requires=["rope (>=0.9.2)", "PyQt4 (>=4.4)"], + scripts=[osp.join('scripts', fname) for fname in + (['spyder', 'spyder.bat'] if os.name == 'nt' else ['spyder'])], + classifiers=['License :: OSI Approved :: MIT License', +@@ -102,5 +77,4 @@ + 'Programming Language :: Python :: 2.7', + 'Development Status :: 5 - Production/Stable', + 'Topic :: Scientific/Engineering', +- 'Topic :: Software Development :: Widget Sets'], +- cmdclass=cmdclass) ++ 'Topic :: Software Development :: Widget Sets']) diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml index 334179b7f7b1..d3bbaa5e0ae5 100644 --- a/dev-python/spyder/metadata.xml +++ b/dev-python/spyder/metadata.xml @@ -19,7 +19,8 @@ Add support for dev-python/pep8 Add support for dev-python/pyflakes Add support for dev-python/pylint - Add support for sci-libs/rope + Add support for dev-python/rope Add support for sci-libs/scipy + Add support for dev-python/sphinx diff --git a/dev-python/spyder/spyder-2.1.2.ebuild b/dev-python/spyder/spyder-2.1.2.ebuild index 96dd7a3f601b..b4159de3ea2e 100644 --- a/dev-python/spyder/spyder-2.1.2.ebuild +++ b/dev-python/spyder/spyder-2.1.2.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.1.2.ebuild,v 1.1 2011/11/18 10:02:59 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.1.2.ebuild,v 1.2 2011/11/22 13:49:22 grozin Exp $ EAPI="3" PYTHON_DEPEND="2:2.5" SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.4 3.* *-jython" +RESTRICT_PYTHON_ABIS="2.4 3.* *-jython *-pypy-*" inherit distutils eutils @@ -16,22 +16,28 @@ SRC_URI="http://spyderlib.googlecode.com/files/${P}.zip" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc ipython matplotlib numpy +pyflakes pylint +rope scipy pep8" +IUSE="doc ipython matplotlib numpy pep8 +pyflakes pylint +rope scipy sphinx" RDEPEND=">=dev-python/PyQt4-4.4[webkit] ipython? ( dev-python/ipython ) matplotlib? ( dev-python/matplotlib ) numpy? ( dev-python/numpy ) + pep8? ( dev-python/pep8 ) pyflakes? ( >=dev-python/pyflakes-0.3 ) pylint? ( dev-python/pylint ) rope? ( >=dev-python/rope-0.9.3 ) scipy? ( sci-libs/scipy ) - pep8? ( dev-python/pep8 )" + sphinx? ( dev-python/sphinx )" DEPEND="${RDEPEND} doc? ( dev-python/sphinx )" PYTHON_MODNAME="spyderlib spyderplugins" +src_prepare() { + distutils_src_prepare + epatch "${FILESDIR}/${P}-disable_sphinx_dependency.patch" +} + src_compile() { distutils_src_compile -- cgit v1.2.3-65-gdbad