gentoo resync : 21.09.2018

7 files changed, 20 insertions, 214 deletions

diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index 14422553ea4f..c954cdd0622e 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,15 +1,11 @@
-AUX sympy-0.7.6-doc-makefile.patch 573 BLAKE2B 792eb78c4708c8edf0b59af61febe631f3cef5b56470ff7c8c55673567e8238d16ab6de92fb1caf45595f00e982076c84d4699654c8764641b340a16698ca776 SHA512 b5d3943da750bf37b2f193fd5458b3305000a4927112e5ff2444680c203c2854e75e25c5a109462eca03c6964b667d6b740f28fbe945c354064de284b2fb3573
-AUX sympy-0.7.6.1-sphinx-1.3.1.patch 2305 BLAKE2B e8d24cfe64a97aa9b7db34602cfb4f614c8d727ad36a0cb82e12209e01c8d7070ab81f362b3dccee88bcd4f897f3b14706050bbe86832de12599f57ea2884b3b SHA512 dd93360697be0c53b66af77b5e6670f0c83c1802a4cfc833c1038e52fd1bf2389b1cf974b783ed98f2e2551e52992c55bdf11f71db5ec29e496517c1c971c409
-AUX sympy-0.7.6.1-zeta.patch 1070 BLAKE2B 3d049aad3312ed9b5165f47b9cbdf58299e4f18254238933498729c2cc11a30f28b2920092c4e3f771b1964cfbc5bd7e6f841a8b9edfb4f839473d6666b5dde5 SHA512 0dba3db948369757eb073ecf1665b833673ba04e023b5bb272acf66a3e5f34e4e53e3c77997f99c64e437f299c340dd9450f6bf13b5b1c2f9980487d071f4d7d
 AUX sympy-1.0-doc-makefile.patch 565 BLAKE2B 10a74dc5b4a60d92b8819433d8fece864ed00b367a64f36bd50852fb9231f4b6f8dfdc4278fa006d3955529465875f66880e4f8435a54702552523149e343086 SHA512 45012ba3c3af162510eff7c6800c2a88739aff203a46ae95b854685850658bf68feacb7d100a164ac58cd7968058bb555909c1f0d6d06e54532a14c0b5e64069
 AUX sympy-1.0-zeta.patch 1908 BLAKE2B 1e2ff1b8cc04505a956ccaaf310680ceb4d749bb15e8dfd76349120b421a7a129e1ea440f559e4cec84dafb9566f9e1a14ff4d9894efc0b578e5ec5864757a72 SHA512 b3cc3ae37c8faf7077c8b3018859c21a14b38f92d85de4386686a20f0318b9e73ab33fde276f00b859e0de19022cbd095844d4310398ec5cb4a4441cddc0b21b
 AUX sympy-1.1.1-zeta.patch 1097 BLAKE2B 818613144230deb04eaf6e069adde3b9412ccd2eb7c32f8cc6baf24fc4ff68231f5f531f9bedeb9d2dc21d7f7b1ff0ddfcfe183213dac63f79f175f555543c11 SHA512 e8e1ed0c9ace2c05b0b466759642ec8c196bb65d8bee3b8b3f742dfdaeb50eb9793deb1e88e4e0d30ac7e71a22b50c9670a2b31ea042701c02c2a98062b9b48e
-DIST sympy-0.7.6.1.tar.gz 6431571 BLAKE2B 07d209ec06128ce903d14b5d111f44e52c44c5dda1acafc4eecc5fe7c2b408dc6def0a893100b8e2e0ce3e8281232b0405fa48c4f6c988827c0324a9ea7e6126 SHA512 18877abd3c530418e4f4942cbb0a03140dc81e5a1004720c472fb97cf8eaa41acca59765f6278715ea88bcd0cd07ad5952863a0d1b6e6d00994d257e8c0a6574
+AUX sympy-1.3-eta.patch 650 BLAKE2B ad61ef317f4f2c13cc6473be2a6a5a6d922a287c8152b5f7201b85f3b2b8df0dde92f4826afb646b06c42cd208eea9fd83610b9a509f2caf388457aedca808b6 SHA512 1ebb9bea63695875c6a35bdc328bad3142617c63b2e8c59ece58e90e5d0cae280413e4b26b411bd4a917b3f6d9eb90ed6ed997ee9e2331aa8ccaeb1b2ecbf8f3
 DIST sympy-1.0.tar.gz 4281528 BLAKE2B b222be6ec486a01ac73e9778a7423aab45e368386003de965308cfa4e08fef07b64046f62ef707b6fa124ee6367fb051b9722e138bfe2eae4661f9e2a66c2365 SHA512 977db6e9bc6a5918cceb255981a57e85e7060c0922aefd2968b004d25d704e25a5cb5bbe09eb387e8695581e23e2825d9c40310068fe25ece7e9c23037a21f39
 DIST sympy-1.1.1.tar.gz 4580952 BLAKE2B 81e5c7d0f80916ced5532f8e5ed3bd04f919b8acb17037237faf9d59cdf73a3a8f741086213fd2aa5a610caf88ae0781c83a0345b71945d69149075b23f09a85 SHA512 ff8857fd5810795554ca4f636b2d8e633057d7ea7df76461003d823ecbaddc98cde0561eb79a1058741c5ece233c13bfcb5e30d5bfb8ac6dbab3d05d8226f92b
-DIST sympy-1.1.tar.gz 4579454 BLAKE2B 8288c958dffb1f719b4e7ecf49928feb935284f634257561124ee6b34866c3b4dfaa7bdbbeb0f4fc3c9e92ecc28b09406cea3d2aff1a8d9df69bac730c17ca29 SHA512 4129752778b50fbc08180fe413d2109ad418b54b79caea461b9a6cf6856ab4f50ce95df6131b07791ed633c840648aa7c4dd130ab3f1cbb1e03e7346e995747b
-EBUILD sympy-0.7.6.1-r1.ebuild 2680 BLAKE2B b08359e899c604d57806dcd24be8c8ea2eeb83fc1512130abc8c3c25ca3f914435e7625f45e4881870890469654a517db39b47b511b4751d5de1c55077e3cfe5 SHA512 37894f7a889e0cc8941af9e2b808676c592f41d5afbe03e7997177e71a2937438095b9a64f6fbd72fdbdfcada5711d6dba098ba9c8ac1eac771af0a0ea41cbd4
+DIST sympy-1.3.tar.gz 5885611 BLAKE2B 14b0639960432cd6aac087a57f81a80497a0bc40ed61eae92166cf5549deaefc611ce63c2e7a89922374e9bb902fb0a7402f5a4e425278f34c028cdc3582eb35 SHA512 3b47dcf80e9a0ca7d65860907264bbcd6f6022275c717784cd165a7a824dca3471bc5a3be9d1af6ab31e04b29f7d5305713fc47ccb67f798f45281e0ab7e03bf
 EBUILD sympy-1.0-r1.ebuild 2688 BLAKE2B 34bbb64b7a3bf3c9ee5c58c76773a31d332e7306407f61b1c5025f26dfada6814e3cb997d0621d187a5d86d8734c7f9bb9563c295fa9afd1cf9bcf47ef768fa4 SHA512 ddfe42e105ee7664303bfb6c690035d843cf007ed1530df8a7f326c473b2ff78f160e8ee8107303d51f083aa4b42559aeab18ab67a3731bbc0c7b6d11b3261d2
 EBUILD sympy-1.1.1.ebuild 2503 BLAKE2B 567310fbdc142065e3e6fa5e32e43dede33c5fe27463340f1190cb608d69dee415978681fe3a13776756189cee21ffe419b069b4165acae55621dcf65b8ce1ae SHA512 51b0e3a0e628ed0e98cf41f4e9ef9daf723c488038bd3f6c54576491bcb5f3b90a29d25d8d9c41fb73a8e5b7cf6c5853640a8f95773ea31c74dbeea9d600b0c2
-EBUILD sympy-1.1.ebuild 2472 BLAKE2B 99c9fb7fbee43fe44622dadef06a4e6e05fd5d2ba9a66a3f01517964f9b1ecb775e671c4095d191024dc942632bc805b91178fcfd232c5a073bf75dd61ab3ca7 SHA512 fa44d00949e14e98de04614a0d190ea260f60af6843084bfc0f90f352f3e40dbc9053f557966f6309e4c3c78b51b7639fab9dc7abd8c73984483fb649c399ef0
+EBUILD sympy-1.3.ebuild 2620 BLAKE2B 3ed1392f63aafac6c95a5ced979d3c0f1ddc9b83dba78e8a2b3f72f4b68464c9af874aa9565c713e1f9e249fff53ce075a3e049a4ba7e53f1257b9ac5bbeb558 SHA512 16250133482a7147c8ad79b41c2eaf6865351944cd04536a106b419e843248830746afa13d60aa70842506a3c269f5bd41ba98c82bede87801794e422a994992
 MISC metadata.xml 1476 BLAKE2B d6a0d7816ae7c0c2d61d6f584b9c872d0169053d43bb604f66ff242721df6f74788ade3de06b23db53239dc0da1182beda16c86eb7e7b383fb0964b13eca1883 SHA512 99d6eb86839fd09abd4db55783e028c6f97c9d0dfa8d68ceda881e6ca981f86877e55a0a83d34b432833f0824a896eea8af35eb9ea499bffe0c62e1e0a27c3c2
diff --git a/dev-python/sympy/files/sympy-0.7.6-doc-makefile.patch b/dev-python/sympy/files/sympy-0.7.6-doc-makefile.patch
deleted file mode 100644
index b4beca8c2a1c..000000000000
--- a/dev-python/sympy/files/sympy-0.7.6-doc-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 sympy-0.7.6.orig/doc/Makefile sympy-0.7.6/doc/Makefile
---- sympy-0.7.6.orig/doc/Makefile	2014-11-21 02:00:41.000000000 +0600
-+++ sympy-0.7.6/doc/Makefile	2014-12-07 20:49:01.091613474 +0600
-@@ -118,5 +118,5 @@
- 	pdflatex -output-directory=_build/cheatsheet cheatsheet/cheatsheet.tex
- 
--_build/cheatsheet/cheatsheet.pdf: cheatsheet/combinatoric_cheatsheet.tex
-+_build/cheatsheet/combinatoric_cheatsheet.pdf: cheatsheet/combinatoric_cheatsheet.tex
- 	mkdir -p _build/cheatsheet
- 	pdflatex -output-directory=_build/cheatsheet cheatsheet/combinatoric_cheatsheet.tex
diff --git a/dev-python/sympy/files/sympy-0.7.6.1-sphinx-1.3.1.patch b/dev-python/sympy/files/sympy-0.7.6.1-sphinx-1.3.1.patch
deleted file mode 100644
index c3b208270166..000000000000
--- a/dev-python/sympy/files/sympy-0.7.6.1-sphinx-1.3.1.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit d3d3bd01bc5f625055bfa7247efc1e8cdeef0b33
-Author: Aaditya M Nair <aadityanair6494@gmail.com>
-Date:   Tue Apr 14 16:30:01 2015 +0530
-
-    Doc creation now compatible with sphinx 1.3.1. Closes sympy/sympy#9273.
-    
-    New version of sphinx renamed the `default` theme to `classic` theme.
-    Corrected by defining all variables inside the .css file.
-
-diff --git a/doc/src/_static/default.css_t b/doc/src/_static/default.css_t
-index 6165d8b..c2d8489 100644
---- a/doc/src/_static/default.css_t
-+++ b/doc/src/_static/default.css_t
-@@ -13,6 +13,23 @@
- 
- /* -- page layout ----------------------------------------------------------- */
- 
-+{%  set theme_collapsiblesidebar = True %}
-+{%  set theme_relbarbgcolor = '#2f441e'  %}
-+{%  set theme_sidebarbgcolor = '#3b5526'  %}
-+{%  set theme_sidebarbtncolor = '#4F663C'  %}
-+{%  set theme_sidebarlinkcolor = '#81B953'  %}
-+{%  set theme_linkcolor = '#29A329'  %}
-+{%  set theme_visitedlinkcolor = '#307748'  %}
-+{%  set theme_headtextcolor = '#2f441e'  %}
-+{%  set theme_footerbgcolor = '#293b1b'  %}
-+{%  set theme_headlinkcolor = '#AAAAAA'  %}
-+{%  set theme_sidebartextcolor = '#DDDDDD'  %}
-+{%  set theme_footertextcolor = '#DDDDDD'  %}
-+{%  set theme_relbartextcolor = '#DDDDDD'  %}
-+{%  set theme_relbarlinkcolor = '#81B953'  %}
-+{%  set theme_bgcolor = '#FFFFFF'  %}
-+
-+
- body {
-     font-family: {{ theme_bodyfont }};
-     font-size: 100%;
-diff --git a/doc/src/conf.py b/doc/src/conf.py
-index 2c1d302..97837e3 100644
---- a/doc/src/conf.py
-+++ b/doc/src/conf.py
-@@ -96,22 +96,7 @@
- html_logo = '_static/sympylogo.png'
- html_favicon = '../_build/logo/sympy-notailtext-favicon.ico'
- # See http://sphinx-doc.org/theming.html#builtin-themes.
--html_theme_options = {
--    'collapsiblesidebar': True,
--    'relbarbgcolor': '#2f441e',
--    'sidebarbgcolor': '#3b5526',
--    'sidebarbtncolor': '#4F663C',
--    'sidebarlinkcolor': '#81B953',
--    'linkcolor': '#29A329',
--    'visitedlinkcolor': '#307748',
--    'headtextcolor': '#2f441e',
--    'footerbgcolor': '#293b1b',
--    'headlinkcolor': '#AAAAAA',
--    'sidebartextcolor': '#DDDDDD',
--    'footertextcolor': '#DDDDDD',
--    'relbartextcolor': '#DDDDDD',
--    'relbarlinkcolor': '#81B953',
--}
-+
- 
- # If true, SmartyPants will be used to convert quotes and dashes to
- # typographically correct entities.
diff --git a/dev-python/sympy/files/sympy-0.7.6.1-zeta.patch b/dev-python/sympy/files/sympy-0.7.6.1-zeta.patch
deleted file mode 100644
index ffb85f9feb17..000000000000
--- a/dev-python/sympy/files/sympy-0.7.6.1-zeta.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -r -U1 sympy-0.7.6.1.orig/sympy/functions/special/zeta_functions.py sympy-0.7.6.1/sympy/functions/special/zeta_functions.py
---- sympy-0.7.6.1.orig/sympy/functions/special/zeta_functions.py	2015-09-04 02:34:00.000000000 +0600
-+++ sympy-0.7.6.1/sympy/functions/special/zeta_functions.py	2015-12-01 11:27:24.000000000 +0600
-@@ -243,3 +243,3 @@
-     >>> polylog(s, -1)
--    dirichlet_eta(s)
-+    -dirichlet_eta(s)
- 
-@@ -270,2 +270,3 @@
-     def eval(cls, s, z):
-+        from sympy import unpolarify
-         if z == 1:
-@@ -273,6 +274,12 @@
-         elif z == -1:
--            return dirichlet_eta(s)
-+            return -dirichlet_eta(s)
-         elif z == 0:
--            return 0
-+            return S.Zero
- 
-+        # branch handling
-+        if (1 - abs(z)).is_nonnegative:
-+            newz = unpolarify(z)
-+            if newz != z:
-+                return cls(s, newz)
-+ 
-     def fdiff(self, argindex=1):
-@@ -479,3 +486,3 @@
- 
--    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^n}{n^s}.
-+    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^{n-1}}{n^s}.
- 
diff --git a/dev-python/sympy/files/sympy-1.3-eta.patch b/dev-python/sympy/files/sympy-1.3-eta.patch
new file mode 100644
index 000000000000..16318458fc9f
--- /dev/null
+++ b/dev-python/sympy/files/sympy-1.3-eta.patch
@@ -0,0 +1,12 @@
+diff -r -U3 sympy-1.3.orig/sympy/functions/special/zeta_functions.py sympy-1.3/sympy/functions/special/zeta_functions.py
+--- sympy-1.3.orig/sympy/functions/special/zeta_functions.py	2018-09-07 02:27:20.000000000 +0700
++++ sympy-1.3/sympy/functions/special/zeta_functions.py	2018-09-17 22:05:34.374733619 +0700
+@@ -509,7 +509,7 @@
+ 
+     For `\operatorname{Re}(s) > 0`, this function is defined as
+ 
+-    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^n}{n^s}.
++    .. math:: \eta(s) = \sum_{n=1}^\infty \frac{(-1)^{n-1}}{n^s}.
+ 
+     It admits a unique analytic continuation to all of :math:`\mathbb{C}`.
+     It is an entire, unbranched function.
diff --git a/dev-python/sympy/sympy-0.7.6.1-r1.ebuild b/dev-python/sympy/sympy-0.7.6.1-r1.ebuild
deleted file mode 100644
index 4a3641dbee9f..000000000000
--- a/dev-python/sympy/sympy-0.7.6.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://sympy.org"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
-IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7)
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? (
-		dev-libs/libxml2:2[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7)
-		gtk? ( x11-libs/gtkmathview[gtk] )
-	)
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	pyglet? ( $(python_gen_cond_dep 'dev-python/pyglet[${PYTHON_USEDEP}]' python2_7) )
-	texmacs? ( app-office/texmacs )
-	theano? ( $(python_gen_cond_dep 'dev-python/theano[${PYTHON_USEDEP}]' python2_7) )
-"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_prepare_all() {
-	epatch "${FILESDIR}"/${PN}-0.7.6-doc-makefile.patch
-	epatch "${FILESDIR}"/${P}-sphinx-1.3.1.patch
-	epatch "${FILESDIR}"/${P}-zeta.patch
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	PYTHONPATH="." distutils-r1_python_compile
-}
-
-python_compile_all() {
-	if use doc; then
-		export XDG_CONFIG_HOME="${T}/config-dir"
-		mkdir "${XDG_CONFIG_HOME}" || die
-		chmod 0700 "${XDG_CONFIG_HOME}" || die
-		emake -j1 -C doc html info cheatsheet
-	fi
-}
-
-python_test() {
-	virtx "${PYTHON}" setup.py test
-}
-
-python_install() {
-	PYTHONPATH="." distutils-r1_python_install
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	use doc &&\
-		DOCS+=(
-			doc/_build/cheatsheet/cheatsheet.pdf
-			doc/_build/cheatsheet/combinatoric_cheatsheet.pdf
-		) && \
-		local HTML_DOCS=( doc/_build/html/. ) && \
-		doinfo doc/_build/texinfo/${PN}.info
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/sympy/sympy-1.1.ebuild b/dev-python/sympy/sympy-1.3.ebuild
index b0780f654b51..ae474151446f 100644
--- a/dev-python/sympy/sympy-1.1.ebuild
+++ b/dev-python/sympy/sympy-1.3.ebuild
@@ -19,6 +19,10 @@ IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symeng
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
 
+RESTRICT="test"
+# All tests actually pass, except a bunch of tests related to the deprecated pygletplot
+# It is a non-trivial work to wipe out all such tests :-(
+
 RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
@@ -45,9 +49,7 @@ DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X )
 	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-doc-makefile.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-eta.patch )
 
 pkg_setup() {
 	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )