Qt version detection fixed, closing #461658; thanks to Reinis Danne <rei4dan@gmail.com> for the patch.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux i686
Manifest-Sign-Key: 0x00C6DAB1!

6 files changed, 28 insertions, 147 deletions

diff --git a/dev-python/spyder/ChangeLog b/dev-python/spyder/ChangeLog
index 24418da237cd..8f64d4948059 100644
--- a/dev-python/spyder/ChangeLog
+++ b/dev-python/spyder/ChangeLog
@@ -1,6 +1,15 @@
 # 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.30 2013/03/01 13:49:19 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/ChangeLog,v 1.31 2013/03/19 06:41:01 grozin Exp $
+
+*spyder-2.1.13-r1 (19 Mar 2013)
+
+  19 Mar 2013; Andrey Grozin <grozin@gentoo.org>
+  -files/spyder-2.1.2-disable_sphinx_dependency.patch, -spyder-2.1.9.ebuild,
+  -spyder-2.1.13.ebuild, +spyder-2.1.13-r1.ebuild,
+  +files/spyder-2.1.13-qt_requirements.patch:
+  Qt version detection fixed, closing #461658; thanks to Reinis Danne
+  <rei4dan@gmail.com> for the patch.
 
   01 Mar 2013; Kacper Kowalik <xarthisius@gentoo.org> spyder-2.1.13.ebuild:
   Fix dependency on PyQt4[svg]
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index bf2d3663ab17..f89f11317ae1 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,31 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX spyder-2.1.11-disable_sphinx_dependency.patch 2446 SHA256 78d2180c963dda2e01eede4a62e1a41d2b382b917e59ccfd9f6815d4a407e72c SHA512 fc0eab3d3a14b18b9a0986ad3e80d13d703a604daf72d9df741e64be38421502a33d5aaeb5de157cd32884f4b52e9b46dfe58c1fe9ba12440987083857592e05 WHIRLPOOL 199c74bc67107ed3d4a62be4e2df2572e77386a94bef84399c1dffc21ed2ed5d46b245a9fb3310ec61e19b978bdc001ff7ebc0285e088821d9de00b1e37bb749
 AUX spyder-2.1.13-disable_sphinx_dependency.patch 2031 SHA256 468d21546307c5f00feb5914858b84aa661ee80c3de879eeabb36b2e0130bc98 SHA512 c09dcf6a86a5fdb7df9b67f953291868982a3e4b3eabb66ca48290f39bbcfcaa60f374fe24cd06b580bbf519b5a1e10a7db9f48424dd0dc54effb821ccf4f533 WHIRLPOOL 31297496bf5b8939f41213abbb219b5cf61438c2ad38b187beaab31240ae633f54e9cd40e46001a793a2a75f43d175d7e363c185666e8fadeb45f01dbe54e241
-AUX spyder-2.1.2-disable_sphinx_dependency.patch 2277 SHA256 a1ec203f3ab0ab9647454f1862bf208a9a271b68084cd874e510aa9d9b3aa51a SHA512 a70c32cbe77691740f27122273e96d55fd1fe88f98fe95750f2bfe6f45d827bf02e0f19ce814ed9913a9f4e150a1cb872830985286022c588cf50456ad8734c1 WHIRLPOOL b78f11b21f328e37846c8631023ee8f90b88561772904e87bf6cecede90da5c6eb4bb83a628299346a126ac18ccd0efe99ad341ed1dcf4b21a856b4948deb3aa
+AUX spyder-2.1.13-qt_requirements.patch 511 SHA256 441768b50829d94ea93ebe7354df02f2d2ebf8f511d5f53d832f997e562cebe0 SHA512 c69f66903c642960b84564223f367d1ed256fb9bbb6d63316d16b44cdcc6a620425377aab2816a4790e597c181ce6a8f16b22bf35d460bf1851ced5d8ba2dcff WHIRLPOOL 41d9314cb200270d70609d82d34c55fe1f65cf71417d5b5033b02d9f4f320e057a266beabbaa70ab02905ae1c971716b9ff51a641fda7dfe55a8ce87b189415b
 DIST spyder-2.1.11.zip 2180419 SHA256 b6d98442a8b529e31cd66c47c6634571aeaae40067757e95b2d6ee748fbc5877 SHA512 fe47a6ee505c0de9fe3a4f2cf13b5bc814aa074214bb06bf2452ba8a23c46a27422a2d484a099b063d419a8539fc81ca08288f281183addf68a6cbe10b5bb299 WHIRLPOOL 9545108e94d605947a6abe3e6b25ba1f89bc75e5469434f6b65d425f9a0919a30fc977126d5aa17ee2a94cc0d22d53d9f0d7df437eef4e244a3248eb569c169a
 DIST spyder-2.1.13.zip 2182796 SHA256 5222946d8ef96d9c770d63b3831b5af1555cf886933ab5d339321aa83ecc5a30 SHA512 4a3096079ec45d17559e1ddcb32186bb1c7717c5c1fec0c3c32265fcf9202789fdf52bedc8bc390b6e736dd1b0786eb74ceb0d88faae8be686f3b6305879e4f6 WHIRLPOOL 6598fd997589b3f1ff5c081e38d3c667bdeabb84b1ff4b636111d865aab10722162ad6526c6453ce38e3fb1a18045736e6ea14196f0debaf7b21932c9faf146f
-DIST spyder-2.1.9.zip 1949933 SHA256 a68228d870ca62b52399591ce14dfeb537289dcbabd1ba848e96d5d694bd933d SHA512 f6d9a9b7052610da209af94629db2a231f1780b22d0d46b5a32fe6997ae66320349bdb3b7b52e82ebf9133204eb0bb685752ab096ad516b2c01211594252c2dc WHIRLPOOL 7ac0b51a8288423d8b9c52d6b02104f5152ba994c04f4ae9d766b07582a14499aadf72be404c76be5be96f6b8c2bd522f9a2a29becbdc73ea79bc59e3c1f3947
 EBUILD spyder-2.1.11.ebuild 1742 SHA256 8e85ed427424d689eb9c97479e3e32bda66c05ffa0b0926cbb96bab74a3d82b3 SHA512 e5fd1b071f05243bd7e752894bbde4abdeac55582b8ef4d737e756ee2ccf9181379886252e41368ee517c4968a1abd432d9c2e65cd04395c049474f05cc30e00 WHIRLPOOL 0534b57d373d109e137dbf72e72ca86615339debce9b5ed1cbe6e4bb4260c19aa1209608917918ac7e1e169e91b7930e76bc778c198af8401f1b1dc75af8b1d7
-EBUILD spyder-2.1.13.ebuild 1748 SHA256 ea12c2c612749d12a5b725a60662344d7808fc5d7f455b860eb0df0584bd8707 SHA512 ce3581c52c41b753d489d1677160d3b0040a3732f3a901a5db6f4f1f70f0e4b4adcf89726fe02da14bf8be4b7a0ab3004fe7d2cacf15eb95fd997e1d2dc151c8 WHIRLPOOL d05f671fcb057fe74f09e7053d8826f75f0f68a80b43a0fa95cd6069fdca30ec7c0aa6ef253de67815f61032a109989c990325369e26db3341f2f7a7560f0c3e
-EBUILD spyder-2.1.9.ebuild 1756 SHA256 839980b89873e5bdf300e2caed192c7a61edf6ec9c85b816503b2ba3e6b32495 SHA512 7f9e4d6039b62a0c380d9ecc8cb5e13248be4aa397ad48696984f422a9fe91448a5bf378e64ef07bab26235da619a3b61e37dbb946bdfe70168e5260006423cc WHIRLPOOL 2382131044287b8fa600750713bc29019208fd101e39947ac6c341507a83535f51658a4572e5e21c5306cd79312ea881f61f8437012070baa7f1094e2ace142a
-MISC ChangeLog 5289 SHA256 fbeaa7b8f9c3506dcd6f2b427316a61077adee6192d22123809ac26530cf518d SHA512 709eafdddc1e26ab1cdf846ef9b725ee03e5def104db3a587114df91e7de61bb741a0f7b6286acb4ba3bc64609595d07b8915eefe347ca8f896fed54adac0fda WHIRLPOOL 8beb3cb12e199efa581860e68d772e7245250aa134b9e10bdcdfd3f302de047a492ae154b62ef2179c8946edaab284835a0f2b47a98bdb574d274fe74fdede31
+EBUILD spyder-2.1.13-r1.ebuild 1786 SHA256 0236e6568c455c46185b91c8e7cef04f4d52a161663ab729f1db5f4972230a6e SHA512 509ce4ad3c5fc1e826647bf31ab184732134792b111e38ec75e0b5c11320d5e4d67fa6c78a81f8fbd075211060d45f065bffd726f103f33a8d678aaaf9aa7b62 WHIRLPOOL 6cb25b00fcddfb9cf08a0421e2c663fc7589a6c27f926149fdc91036c7aff1ec68d80aab9ed81d4776bdab96f1a60232f46abd27b508c1b01dc3e039f7732c59
+MISC ChangeLog 5649 SHA256 425546b8080a85639fac0b974fb3730dfb639918767a926757ce64852f4a2a5c SHA512 a572f75eb67396df99781ed3228a83b683922762c89ca37a0811f559fc14d5c363a796760197d2b4b36bdf64fb6552acce38aaf350a0440265c8f7396d37f32c WHIRLPOOL 5ebfba36e79f08c94aa032b91da2f128daebde59516b8f1bff0564695ab4b2d9e468a893b5b48485e4905dd5090d5705bcc6e32fcaf6c575de5eb8c63376f5e3
 MISC metadata.xml 1194 SHA256 5ec8e7bb1750e71d59de8a3e13ed3ed238666184d6091a6b9c98a9a1a91a22c3 SHA512 97628966fa1a90c6b9697cb69b5af73e311b23e252f85507cb7c3d214fe241d2fe4bcc69f53dd02fd7305bc958c0d1a56cbd826db4dee3e8cb231c19470d597d WHIRLPOOL 0f3abe4ed8556d10be4fe3388339e42720b7014ac3f0e9b02518df4cb9b9eb6529ea431305bc28cc982cee2736a8d47057bde2f6eb4fa1ffbeda74a45557753f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRMLH0AAoJEF0huFKJUZL5I2IP/3V1Mwg0Mtj+ynqBQdEgCgzI
-oLoviWWRa5uUjSKeThyno71fmyMX/MHlXCibe5E4eB1cPF3ymWVA/9dpS05HBmEo
-D48G2bCfMnclF5slPL97Rs5V9nLVRy1EkCfZF3fOuKwWyvcT755MQtqJfSaJHOZF
-xAvPqnXsFyG+7T7dJK5DpPRkzOQNF1lnNglofbfw7KAkWGPr8WPlkzQVjLrUyPda
-uC6oa82dCi+nbo+SwnG56Y4zIJgK5VixCfVlcOrxYt3wVt5j67cC1AdEYEZcA8S1
-G+ZeKpXloa12ZYA1Mb5rEgjdO67tOx4UdedcGBrGXAQmlfyGgl+lYqK4YWHqoto2
-P3emqVg28xBlo6erQHkrUfsvJAGkcCrnKWqRLS2pU4ZWweETg754vsWNv7EwWByy
-FQHj8kzQh1zEpgxIxFHzlwrItVT4+qSKVWQIKU40poTF8w/dteNCr0PSpEV9RoYf
-nux7IYPvMuU2auurFKOT02DOTx8/f9wUBT23cBNJqfWsUTei01OHt0zeKOwtnKDs
-rfH7CFQ64iiDBt6lQYfd0JCZvwEX0sPP1YHLkWQ09qmvh7R9AOaZP7TQyWtDWWrx
-+TltRpzY8bVaHl0jg5uoC4FOu/ugufBp4XpyUbXbe7RzpLeJHd5GD5wFyZGbqNst
-cjwCDAlJM/pInuSe7L2h
-=/nFl
------END PGP SIGNATURE-----
diff --git a/dev-python/spyder/files/spyder-2.1.13-qt_requirements.patch b/dev-python/spyder/files/spyder-2.1.13-qt_requirements.patch
new file mode 100644
index 000000000000..cd1d6b67f90c
--- /dev/null
+++ b/dev-python/spyder/files/spyder-2.1.13-qt_requirements.patch
@@ -0,0 +1,11 @@
+--- spyderlib/requirements.py	2013-03-13 18:55:51.363304516 +0200
++++ spyderlib/requirements.py	2013-03-13 18:58:07.200608283 +0200
+@@ -14,6 +14,8 @@
+     """Return True if actual_str version fit required_str requirement"""

+     actual = actual_str.split('.')

+     required = required_str.split('.')

++    actual = [int(i) for i in actual]

++    required = [int(i.strip('+')) for i in required]

+     return actual[0] < required[0] or \

+            (actual[0] == required[0] and actual[1] < required[1])

+ 

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
deleted file mode 100644
index f4fbba600ee1..000000000000
--- a/dev-python/spyder/files/spyder-2.1.2-disable_sphinx_dependency.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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/spyder-2.1.13.ebuild b/dev-python/spyder/spyder-2.1.13-r1.ebuild
index 4c4f748019e6..352938bae7b1 100644
--- a/dev-python/spyder/spyder-2.1.13.ebuild
+++ b/dev-python/spyder/spyder-2.1.13-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.1.13.ebuild,v 1.2 2013/03/01 13:49:19 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.1.13-r1.ebuild,v 1.1 2013/03/19 06:41:01 grozin Exp $
 
-EAPI="3"
+EAPI=5
 PYTHON_DEPEND="2:2.5"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
@@ -36,7 +36,8 @@ PYTHON_MODNAME="spyderlib spyderplugins"
 
 src_prepare() {
 	distutils_src_prepare
-	epatch "${FILESDIR}"/${PN}-2.1.13-disable_sphinx_dependency.patch
+	epatch "${FILESDIR}"/${P}-disable_sphinx_dependency.patch
+	epatch "${FILESDIR}"/${P}-qt_requirements.patch
 }
 
 src_compile() {
diff --git a/dev-python/spyder/spyder-2.1.9.ebuild b/dev-python/spyder/spyder-2.1.9.ebuild
deleted file mode 100644
index 26ca0bb1dc95..000000000000
--- a/dev-python/spyder/spyder-2.1.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.1.9.ebuild,v 1.1 2012/04/17 14:53:25 xarthisius Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
-
-inherit distutils eutils
-
-DESCRIPTION="Python IDE with matlab-like features"
-HOMEPAGE="http://code.google.com/p/spyderlib/ http://pypi.python.org/pypi/spyder"
-SRC_URI="http://spyderlib.googlecode.com/files/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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 )
-	sphinx? ( dev-python/sphinx )"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-PYTHON_MODNAME="spyderlib spyderplugins"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}/${PN}-2.1.2-disable_sphinx_dependency.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		PYTHONPATH="build-$(PYTHON -f --ABI)" \
-			sphinx-build doc doc_output || die "Generation of documentation failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	doicon spyderlib/images/spyder.svg || die
-	make_desktop_entry spyder Spyder spyder "Development;IDE"
-	if use doc; then
-		pushd doc_output > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _images _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
-}