bump; remove old
authorIan Delaney <idella4@gentoo.org>
Wed, 17 Dec 2014 04:35:03 +0000 (04:35 +0000)
committerIan Delaney <idella4@gentoo.org>
Wed, 17 Dec 2014 04:35:03 +0000 (04:35 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

dev-python/spyder/ChangeLog
dev-python/spyder/Manifest
dev-python/spyder/files/spyder-2.2.5-disable_sphinx_dependency.patch [deleted file]
dev-python/spyder/spyder-2.2.1.ebuild [deleted file]
dev-python/spyder/spyder-2.3.2.ebuild [moved from dev-python/spyder/spyder-2.2.5.ebuild with 51% similarity]

index b443c6e7cc8143fd6e6aad01fff2afad3a935172..af2b2b49b48bd2b1cccbf7b60e45b516421f2dd5 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/spyder
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/ChangeLog,v 1.34 2014/10/15 09:57:44 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/ChangeLog,v 1.35 2014/12/17 04:34:37 idella4 Exp $
+
+*spyder-2.3.2 (17 Dec 2014)
+
+  17 Dec 2014; Ian Delaney <idella4@gentoo.org> +spyder-2.3.2.ebuild,
+  -files/spyder-2.2.5-disable_sphinx_dependency.patch, -spyder-2.2.1.ebuild,
+  -spyder-2.2.5.ebuild:
+  bump; remove old
 
 *spyder-2.3.1 (15 Oct 2014)
 
index db8f73b737fd8010ea37348a1ac5e2a28a882768..62536f3969d719b18cb03d7b881d3b91ad0d29f0 100644 (file)
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX spyder-2.2.5-disable_sphinx_dependency.patch 3076 SHA256 811d3b1f469dc6a97a09a91e6b1fc31dc034d3770fe50fef26611318c04a0296 SHA512 787bde10787c7c428f7737a25b5ed19e2d912607b3dfc6c7b9fd4b5aaf561747fcb333321d2f54fd8204c20aa2422e42dc43b4b228bee7b10cabafb9fc0882d1 WHIRLPOOL 4c58e57041defa86dc47f939d1095d26cbe09b5980e803d732996e4caa7fc8dc34d86c4a8a1939939b699c173a6ceeeef98d01731064fe172e800b23df622aeb
 AUX spyder-2.3.1-build.patch 6207 SHA256 4fac1e1ab11833f8bc3a28e8b53d876e66666cb68b2fdf185c7d334801ed9a75 SHA512 c2ff643f96099d4fb521bfc27d811d65c84513d824e97b304cfcdb4a6c708c6189fd53390a4bf88c90916c4dc8a119e64d65ad60230f1d2610557761db0e4e2f WHIRLPOOL 56830cf3d2ee28fc6d1f68adbe266a2f3931a74b72faf421f3fbf16eed0ef2986b82bb37ede124f829f79acd55ebc442f5876784e87a124744704d83927d99fa
-DIST spyder-2.2.1.zip 3495448 SHA256 8b5a23778f00b26e4c082360e3d83b60afe7b66e092ec618f10649d050658e55 SHA512 91d45e53154e859220e778473ed30e48859e45091bd6187b56c60890c52216a85b6e61a586dd5de97719a4387128af368437a48351523fd7deb1759d9a7d6587 WHIRLPOOL e1cd1dd0245571f827a7548f6acea7e3bedfdb3848cd1f3446db8b903cac62a4ca5fe99df649e2e9ae4bd70bffe3f4051c8edd56e2225ff4f576ede4e7cf1be5
-DIST spyder-2.2.5.zip 3543387 SHA256 e2ae6155d6f84a9bdee7b3a6eca4b72f3f5e6d775ad23e8d0e82e125342eacaf SHA512 a8c818a09e4638f898568ede811f7e844bcb0552fcc5aff4341fe5c89620982b7ccb28f7b75f488685db56ded1d2447a53bb2ef3da27a2af465097655468ff0d WHIRLPOOL 792f5ab800b0ff62a62e6e99079c7c4bdd4e1dda6ec4b4a0809cfe326356ffeeaac4a479a6da5a31f891a48efaa010f1a8924074c1c980d8b1415f8a99bf1128
 DIST spyder-2.3.1.zip 3721231 SHA256 986aa9307cfa551d93021452cbe0fc98e9785236b3af12692c179d0d931d4ebc SHA512 c422ac2945d63bec53c7e6e568b13b36fee25a77f2c41936b23cbcb4d4ec94a44128f5c0a21e12f39cd573cf51fc6335f9169c8bdaab14994025ab4959345954 WHIRLPOOL f79e3b5f24d1b14f8dcbfa268535eb82062d173c4e017894234607815895a4ebf08fc23eb9ee1f7db0c824c92a2f0f07c0b9a799d2655ddcc49c1e65b4600c11
-EBUILD spyder-2.2.1.ebuild 1638 SHA256 7038154a25a8641ffb456197d3d133ac193e1566dbfaecbb26b2a8e074f89c31 SHA512 0a1d7a083fb7a01248a4a7f29131a0aede5433b174aadfb49ad8fd660871c2f73ca8cc36f81ae44b70dcbdca66a1d6705d2667c805f62f2b9f85c1e113ebc5d4 WHIRLPOOL 93e0f0470db28237c5cef61cc974d04a10c8998ea8746c855d7f74ebf9515f04e139560cf5a6ed0e22f58f3d33424e86c68604f43bf1940b4532beeaaeb723d2
-EBUILD spyder-2.2.5.ebuild 1678 SHA256 6d8fff23a1f35b88f2595474783d9cc5f0781ab9832bb1a7aedc6cb30c7ff0cc SHA512 cd3d666036d3a325ee03509f80c2f9b762ee43ba25491b53bfb0e360d938c989cb1c51dc680b0d869f8d1605411a4640ecb0d6698aeafaf34eb5bc5d866b15b7 WHIRLPOOL 58f22cf6b2ebd00dead303d1d94c3585ffc4dc59fe371a8b5bd7b96d387dd81186a30b0894bbc6bc43b3ac987f037340997ec4e5b42fc1d6bd17b1dcfee899dc
+DIST spyder-2.3.2.zip 3724423 SHA256 f4f71ffe8590ffa8813622efb6705e52897552624726df317e0589ae121240bb SHA512 822f658344bca63d4582fc8e0a537af726ca5a8170a7f7240ff76b2911f17be5f579db6303ea1828f12ec63d0b83cfa45d54038c74eb962a3dedd96b3833bcd8 WHIRLPOOL 8bbf72aa5c60da42efa573dd937991a2c5ec8ddfd2aaa45800f9ac0fb2bdf69d5ef375d5a8feda305213777dc887873cff7a7a08d1612e735b83f4603e3320d8
 EBUILD spyder-2.3.1.ebuild 1840 SHA256 12709856b65d4be59587d9e7123c8313a5d255addf4128989b8eb3c8a9e12e12 SHA512 eb97206062e9410e565fe14bf4ff01e25dd125dcd06a7bd9b5baccf0839e9047f36c67874e6d24d1a3b2e40bacf72e4bad41b56e0c928eb7d09cb3d7718db124 WHIRLPOOL 82b25f672b839a8d7266bfce1332bf6947425ab0be0f01ef22ea562378c04ef7104f625e1979e3cc258ad3c3d5706a72cdac7a20ddd5ce363ed1d928838b2269
-MISC ChangeLog 6593 SHA256 5617401f42328d5ed933b323a0d551d25c55401358c849604cd5237de43d99e1 SHA512 c6490394b7c4cd4c42f026e09e00dbd30e936ad4767db6b5bc5fd99da4de8ce038c664b22d1d0a7a0c9cccb4ccd946faaee635323170768e591b305ca6256243 WHIRLPOOL 135e2109bb995ea4f31d40451aac4878c6c66593938e55bde37f8408b43344d574c2cf30473acc07913d803c12f653ea8cea86201856c2193e44157ec32fbb0d
+EBUILD spyder-2.3.2.ebuild 1847 SHA256 f487e893e9dc4e117c9bcf5edaadcae7b3fe957bd31e3d31f678a07925bbf2d5 SHA512 f71eddb943e8121ee6e86cc6499727a9e1dfdbf79e79619ebcfff4a44c1bfae347933bd952a7cb3bc3bec430a9c0a2e2eef2d3be481aaec4b124abbe0e2fc41c WHIRLPOOL 7e396b4bdb2063201a91613e000edbc81812c5e0f9bd1d75805cbb6d05f00b415957697219901dd3d241aa1fd9b0b46812c21f5e8cb138fc5e46d8684d7cb2a4
+MISC ChangeLog 6813 SHA256 c7cb079d3c2f76be7de46c663e2921a006cb44223f170cbca4fa06021f3ff1b6 SHA512 b210a1181d7d2e29bfb3d73e05227547ebfeacd3c6cd9764165ff0ccd871f01ec514891ef665546fdfcb79c51362a1ba0916863a6353b076abb1cec0e08d66e8 WHIRLPOOL 5cf39344acea0f02aaa7539349ddf3a3232c47393bd0e77a637edc1d0516aeab9db5f06b087866fb8c107364ae28ef0f6bd84103fad92c1f40d19e0ef797b371
 MISC metadata.xml 1261 SHA256 7d9daa17ce356586e02935a945f3830f553931c72c8fcd79c170a1a1510dd0aa SHA512 11b433e0b1b0b517fbf411a43e9326f07a4197989c971cf06db7990a75619faddf9392b634394c54c1583f54f41b968c8264256581d0d765941b4e8598f75271 WHIRLPOOL 603346ec9f5fa3d3ad0f38825c93aae19ae8c6851b49759571950d1734b92c05bd449d6062609ca69865a04213f52ff3f37a535cde988cc5fe259a2261cfa66a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlQ+RScACgkQso7CE7gHKw3QYgCfZHxhxjrFXGk+s2YpT1GBmJGl
-TQAAmgJbxDj/NeiNA53KdyZocq2qyidv
-=RVjj
+iEYEAREIAAYFAlSRB+4ACgkQso7CE7gHKw2ejACfT9oQrr1eD9t8GwWYGdqTIqrO
+KzkAnRF5gi3YmhaPoDguth82KYIuU53Z
+=Mom8
 -----END PGP SIGNATURE-----
diff --git a/dev-python/spyder/files/spyder-2.2.5-disable_sphinx_dependency.patch b/dev-python/spyder/files/spyder-2.2.5-disable_sphinx_dependency.patch
deleted file mode 100644 (file)
index d548c3f..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
---- setup.py.orig      2014-03-03 12:55:59.209248082 -0800
-+++ setup.py   2014-03-03 12:57:08.651709021 -0800
-@@ -81,51 +81,6 @@
-         else:
-             return
- 
--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')
--
--            hhc_exe = get_html_help_exe()
--            self.builder = "html" if hhc_exe is None else "htmlhelp"
--
--            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)
--            
--            # Building chm doc, if HTML Help Workshop is installed
--            if hhc_exe is not None:
--                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
--                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
--                if osp.isfile(fname):
--                    dest = osp.join(dirname, 'spyderlib')
--                    try:
--                        shutil.move(fname, dest)
--                    except shutil.Error:
--                        print("Unable to replace %s" % dest)
--                    shutil.rmtree(self.builder_target_dir)
--
--    CMDCLASS['build_doc'] = MyBuildDoc
--except ImportError:
--    print('WARNING: unable to build documentation because Sphinx '\
--          'is not installed', file=sys.stderr)
- 
- 
- NAME = 'spyder'
-@@ -191,7 +146,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":
-@@ -212,5 +167,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.2.1.ebuild b/dev-python/spyder/spyder-2.2.1.ebuild
deleted file mode 100644 (file)
index 4a1601a..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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/*
-}
similarity index 51%
rename from dev-python/spyder/spyder-2.2.5.ebuild
rename to dev-python/spyder/spyder-2.3.2.ebuild
index 916de1c9aee20e699bf4cc1b8a0a2b19b515e233..09f09d1ef4b52c0e6c6028871212e8ca539bfbd3 100644 (file)
@@ -1,45 +1,47 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.2.5.ebuild,v 1.1 2014/03/03 20:59:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.3.2.ebuild,v 1.1 2014/12/17 04:34:37 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1
 
 DESCRIPTION="Python IDE with matlab-like features"
-HOMEPAGE="http://code.google.com/p/spyderlib/"
-SRC_URI="http://spyderlib.googlecode.com/files/${P}.zip"
+HOMEPAGE="http://code.google.com/p/spyderlib/ https://bitbucket.org/spyder-ide/spyderlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc ipython matplotlib numpy pep8 +pyflakes pylint +rope scipy sphinx"
 
+# rope requires no version bordering since all are >= miniumum version
 RDEPEND="
        || ( dev-python/PyQt4[${PYTHON_USEDEP},svg,webkit]
                 dev-python/pyside[${PYTHON_USEDEP},svg,webkit] )
-       ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+       ipython? ( dev-python/ipython[qt4,${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}] )
+       pyflakes? ( >=dev-python/pyflakes-0.5[${PYTHON_USEDEP}] )
        pylint? ( dev-python/pylint[${PYTHON_USEDEP}] )
-       rope? ( >=dev-python/rope-0.9.3[${PYTHON_USEDEP}] )
+       rope? ( $(python_gen_cond_dep 'dev-python/rope[${PYTHON_USEDEP}]' python2_7) )
        scipy? ( sci-libs/scipy[${PYTHON_USEDEP}] )
-       sphinx? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+       sphinx? ( >=dev-python/sphinx-0.6.0[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
        app-arch/unzip
-       doc? ( dev-python/sphinx )"
+       doc? ( >=dev-python/sphinx-0.6.0[${PYTHON_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.2.5-disable_sphinx_dependency.patch )
+# Courtesy of Arfrever
+PATCHES=( "${FILESDIR}"/${PN}-2.3.1-build.patch )
 
-python_compile() {
+python_compile_all() {
        if use doc; then
                einfo "Generation of documentation"
                PYTHONPATH="{BUILD_DIR}" \
-                       sphinx-build doc doc_output || die "Generation of documentation failed"
+                       sphinx-build doc doc/html || die "Generation of documentation failed"
        fi
 }
 
@@ -47,5 +49,5 @@ python_install_all() {
        distutils-r1_python_install_all
        doicon spyderlib/images/spyder.svg
        make_desktop_entry spyder Spyder spyder "Development;IDE"
-       use doc && dohtml -r doc_output/*
+       use doc && dohtml -r doc/html/
 }