gentoo resync : 15.12.2019

5 files changed, 9 insertions, 128 deletions

diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index f984604ba19c..38d92c8549d9 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,11 +1,8 @@
 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
 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.3.tar.gz 5885611 BLAKE2B 14b0639960432cd6aac087a57f81a80497a0bc40ed61eae92166cf5549deaefc611ce63c2e7a89922374e9bb902fb0a7402f5a4e425278f34c028cdc3582eb35 SHA512 3b47dcf80e9a0ca7d65860907264bbcd6f6022275c717784cd165a7a824dca3471bc5a3be9d1af6ab31e04b29f7d5305713fc47ccb67f798f45281e0ab7e03bf
-EBUILD sympy-1.0-r1.ebuild 2685 BLAKE2B b1ab42c02e0d633564ce7a085a2b45602e951bc492646eeed0391b5c0fa2d2a63eaf15ee9b7d02d160bda3d6374696fa43fd7e6b2636cbe978fe9e036ee899c5 SHA512 8c11eebfa9da02ef33db2a597ffa76b608e962fe5704a2f2a6739eef90970a53a80d9d05fe41a4eb3400ce5cd5b5716eee417f124aca75141b82f5ec224d597d
-EBUILD sympy-1.1.1.ebuild 2496 BLAKE2B db5e8a840b1611ca384c5df04d4c8dca37e3f297e8c3943043f1b1fa6469e9be1c59097e4e27bb63da545aaad0cb34e442813700ad702010893809b8a686cc63 SHA512 c77b406545537933c1ebf19e53db34f807a28dd30eb34bb44bb35437d1d4298f146c49bd61afafc67d4a8fcdc4f912ae9ce7444b0d678d1bacbfe2eb750c6fb7
-EBUILD sympy-1.3.ebuild 2617 BLAKE2B 0661744331f212e7d664d118052de5981127ff9b19094a2cce71bf97563b4902538bb6a28f730edaac90af46b1ca0a3e6ab1d711796f6543429b21c50fb0bd06 SHA512 6d432bb688a3d62c748ed17a34184df4d06804ed4525a2b14379462f6181af287ec4a99d24773a4a59c3245452f58e3cec7502e3acddc255f5c3432a33427e47
+EBUILD sympy-1.0-r1.ebuild 2787 BLAKE2B 4dd41be8308b4f97425ec0a9980ef334f95a7d9b8b18fff1fee5fc01a185f404c1d2adc021d1345dcf1047f38eccea84d9d13d3f8e4e5db5499465d4e96bd137 SHA512 780527a85b9aa253d9b066b2f12b74fbf26542b0e5aaed6da0ba85555ab36ae08c6754de7379028ce2d2ce76c99ec3b89b4bf03a1a87571a281872f033ae6c48
+EBUILD sympy-1.3.ebuild 2692 BLAKE2B d415c49eccea363e79e85b334350a1ae012f6c659fac5d685c025506916bd51afb62718e912adb17c44a94be9263f2931d7632b82b70bbb152da76a70f14a2be SHA512 57ad69d617fc11505c2ab9b70adbcf12589cf1affca5f292610ffdbf0173a8775fa0756d344fdb09a1398bde2c160dc6bb7dbdc0e923ee27f8ec9465cd3a4d43
 MISC metadata.xml 1476 BLAKE2B d6a0d7816ae7c0c2d61d6f584b9c872d0169053d43bb604f66ff242721df6f74788ade3de06b23db53239dc0da1182beda16c86eb7e7b383fb0964b13eca1883 SHA512 99d6eb86839fd09abd4db55783e028c6f97c9d0dfa8d68ceda881e6ca981f86877e55a0a83d34b432833f0824a896eea8af35eb9ea499bffe0c62e1e0a27c3c2
diff --git a/dev-python/sympy/files/sympy-1.1.1-zeta.patch b/dev-python/sympy/files/sympy-1.1.1-zeta.patch
deleted file mode 100644
index d9bab8096fac..000000000000
--- a/dev-python/sympy/files/sympy-1.1.1-zeta.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -U2 -r sympy-1.1.1.orig/sympy/functions/special/zeta_functions.py sympy-1.1.1/sympy/functions/special/zeta_functions.py
---- sympy-1.1.1.orig/sympy/functions/special/zeta_functions.py	2017-07-22 05:17:42.000000000 +0700
-+++ sympy-1.1.1/sympy/functions/special/zeta_functions.py	2017-07-28 06:35:28.477927184 +0700
-@@ -272,4 +272,5 @@
-     @classmethod
-     def eval(cls, s, z):
-+        from sympy import unpolarify
-         if z == 1:
-             return zeta(s)
-@@ -277,5 +278,11 @@
-             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):
-@@ -483,5 +490,5 @@
-     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}`.
diff --git a/dev-python/sympy/sympy-1.0-r1.ebuild b/dev-python/sympy/sympy-1.0-r1.ebuild
index f75311b5dad1..90812d1744ea 100644
--- a/dev-python/sympy/sympy-1.0-r1.ebuild
+++ b/dev-python/sympy/sympy-1.0-r1.ebuild
@@ -15,14 +15,16 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )
+	ipython? ( || ( $(python_gen_useflags -3) ) )"
 
 RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
 	$(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}] )
+	ipython? ( $(python_gen_cond_dep 'dev-python/ipython[${PYTHON_USEDEP}]' -3) )
 	latex? (
 		virtual/latex-base
 		dev-texlive/texlive-fontsextra
diff --git a/dev-python/sympy/sympy-1.1.1.ebuild b/dev-python/sympy/sympy-1.1.1.ebuild
deleted file mode 100644
index 1c817c1345eb..000000000000
--- a/dev-python/sympy/sympy-1.1.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-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 ~x64-macos ~x86-macos"
-IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	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? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X )
-	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-zeta.patch
-	"${FILESDIR}"/${PN}-1.0-doc-makefile.patch
-)
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-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 man cheatsheet
-	fi
-}
-
-python_test() {
-	virtx "${PYTHON}" setup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	if use doc; then
-		DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \
-				doc/_build/cheatsheet/combinatoric_cheatsheet.pdf )
-		local HTML_DOCS=( doc/_build/html/. )
-		doinfo doc/_build/texinfo/${PN}.info
-	fi
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	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.3.ebuild b/dev-python/sympy/sympy-1.3.ebuild
index 963538ab3acf..03a1e064eab0 100644
--- a/dev-python/sympy/sympy-1.3.ebuild
+++ b/dev-python/sympy/sympy-1.3.ebuild
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )
+	ipython? ( || ( $(python_gen_useflags -3) ) )"
 
 RESTRICT="test"
 # All tests actually pass, except a bunch of tests related to the deprecated pygletplot
@@ -26,7 +27,7 @@ RESTRICT="test"
 RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	ipython? ( $(python_gen_cond_dep 'dev-python/ipython[${PYTHON_USEDEP}]' -3) )
 	latex? (
 		virtual/latex-base
 		dev-texlive/texlive-fontsextra