Version bump. Switch to distutils-r1

(Portage version: 2.2.01.22124-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 118 insertions, 1 deletions

diff --git a/dev-python/spyder/ChangeLog b/dev-python/spyder/ChangeLog
index 8f64d4948059..99b04f6c7101 100644
--- a/dev-python/spyder/ChangeLog
+++ b/dev-python/spyder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/spyder
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/ChangeLog,v 1.31 2013/03/19 06:41:01 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/ChangeLog,v 1.32 2013/07/18 16:41:22 bicatali Exp $
+
+*spyder-2.2.1 (18 Jul 2013)
+
+  18 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/spyder-2.2.1-disable_sphinx_dependency.patch, +spyder-2.2.1.ebuild,
+  metadata.xml:
+  Version bump. Switch to distutils-r1
 
 *spyder-2.1.13-r1 (19 Mar 2013)
 
diff --git a/dev-python/spyder/files/spyder-2.2.1-disable_sphinx_dependency.patch b/dev-python/spyder/files/spyder-2.2.1-disable_sphinx_dependency.patch
new file mode 100644
index 000000000000..2b76899e0996
--- /dev/null
+++ b/dev-python/spyder/files/spyder-2.2.1-disable_sphinx_dependency.patch
@@ -0,0 +1,57 @@
+diff -Nur spyder-2.2.1.orig/setup.py spyder-2.2.1/setup.py
+--- spyder-2.2.1.orig/setup.py	2013-07-18 09:06:57.658109133 -0700
++++ spyder-2.2.1/setup.py	2013-07-18 09:09:17.124019760 -0700
+@@ -69,36 +69,6 @@
+ CMDCLASS = {'install_data': MyInstallData}
+ 
+ 
+-# Sphinx build (documentation)
+-try:
+-    from sphinx import setup_command
+-
+-    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)]
+-    CMDCLASS['build'] = MyBuild
+-    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("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).",
+-                      file=sys.stderr)
+-            sys.path.pop(0)
+-    CMDCLASS['build_doc'] = MyBuildDoc
+-except ImportError:
+-    print('WARNING: unable to build documentation because Sphinx '\
+-          'is not installed', file=sys.stderr)
+-
+ 
+ NAME = 'spyder'
+ LIBNAME = 'spyderlib'
+@@ -164,7 +134,7 @@
+       package_data={LIBNAME: get_package_data(LIBNAME, EXTLIST),
+                     'spyderplugins':
+                     get_package_data('spyderplugins', EXTLIST)},
+-      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 SCRIPTS],
+       data_files=get_data_files(),
+       options={"bdist_wininst":
+@@ -185,5 +155,5 @@
+                    '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 d3bbaa5e0ae5..07ae2c216e5d 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -23,4 +23,7 @@
   <flag name='scipy'>Add support for <pkg>sci-libs/scipy</pkg></flag>
   <flag name='sphinx'>Add support for <pkg>dev-python/sphinx</pkg></flag>
 </use>
+<upstream>
+  <remote-id type="pypi">spyder</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-python/spyder/spyder-2.2.1.ebuild b/dev-python/spyder/spyder-2.2.1.ebuild
new file mode 100644
index 000000000000..4a1601ae8391
--- /dev/null
+++ b/dev-python/spyder/spyder-2.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.2.1.ebuild,v 1.1 2013/07/18 16:41:21 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python IDE with matlab-like features"
+HOMEPAGE="http://code.google.com/p/spyderlib/"
+SRC_URI="http://spyderlib.googlecode.com/files/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc ipython matplotlib numpy pep8 +pyflakes pylint +rope scipy sphinx"
+
+RDEPEND="
+	|| ( dev-python/PyQt4[${PYTHON_USEDEP},svg,webkit]
+		 dev-python/pyside[${PYTHON_USEDEP},svg,webkit] )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	pep8? ( dev-python/pep8[${PYTHON_USEDEP}] )
+	pyflakes? ( >=dev-python/pyflakes-0.3[${PYTHON_USEDEP}] )
+	pylint? ( dev-python/pylint[${PYTHON_USEDEP}] )
+	rope? ( >=dev-python/rope-0.9.3[${PYTHON_USEDEP}] )
+	scipy? ( sci-libs/scipy[${PYTHON_USEDEP}] )
+	sphinx? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( dev-python/sphinx )"
+
+PATCHES=( "${FILESDIR}"/${P}-disable_sphinx_dependency.patch )
+
+python_compile() {
+	if use doc; then
+		einfo "Generation of documentation"
+		PYTHONPATH="{BUILD_DIR}" \
+			sphinx-build doc doc_output || die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	doicon spyderlib/images/spyder.svg
+	make_desktop_entry spyder Spyder spyder "Development;IDE"
+	use doc && dohtml -r doc_output/*
+}