gentoo christmass resync : 25.12.2020

3 files changed, 2 insertions, 70 deletions

diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index fad242e301e6..1ca41b9d1c7c 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,7 +1,5 @@
 DIST sympy-1.6.2.tar.gz 6811705 BLAKE2B 4cd894d28bedc986acc8ef67aa60f82e0899c2ed028658a8f340d7538b890e0ed380b3614a464eb58d71873b29b0795508b4556bb8115bf0c108336ef1e4cca3 SHA512 e16a1d85aba438e4248bac48a163ea1827e2cee57c28f7670ed19cc69d4c08d6796d62f79d245e269d75765b8f7ff4f4ca2841f98534e136ceeb5d3f7a5d252a
 DIST sympy-1.7.1.tar.gz 6974183 BLAKE2B 4bd8c9d60c46b05a7fc6c622667858fe17d25798756dbe967ce19abc8047263fe540f332e39418e877852c0565270377bd01fea7e65aa35ed4e03079bc130805 SHA512 eb9387bb9c632203af650279f896427556725b7496c00d8dfe97b7476beedbbee5714659f7fb44b4fa986c9567cdcaefcc19401d63e1ca0e9a6c7317855440ea
-DIST sympy-1.7.tar.gz 6969594 BLAKE2B c4ebd395e50f589dba2d01bf50a1a9cd7fb34e95e2b8632a64df5fe1a6625889c4e161b8a22aa815857cc3eb0d502f03ec8d9de694f369aaca7e573a2fab03ee SHA512 f7bdaff7432436dc888e56d4b56d023c8da5cfb54dfa6955cf7999acceedfd5175f910fb9b3c5776145f3dc3036f78e66813cdba4201be854dfa2c5c9f4e9f4d
 EBUILD sympy-1.6.2.ebuild 1780 BLAKE2B 404531e83f627b752b63d45ac3c818ea89e14a87fb29da361b194f4049702bb5d769acbc7328c71f16996effe2acdb02dfb21196a30537b95ce56b3200f89097 SHA512 6b74c0a2deddd0f1e37a03e1476ab6a7e23e293aea223dbe7c24590260fec01853ee24e2e539f618f2dd48274df4ec3265a4f9f147c46cea34837a83e29adadb
-EBUILD sympy-1.7.1.ebuild 1812 BLAKE2B b8cace9a744fed3be5f8eb414f61468bd5a8271043c373db95b10318f503315c3c5f188fca60cad495612330977d34c812abe59b7fe88415a51f37948cbd3f6e SHA512 96788670d5ce9dbbf44bad6c6238aa62e88a044fc2625ab4042cbed25891894d12d1e48fa871649046a0bda6a858bdf82e6162917197143bec7e63ee8f1f3bc6
-EBUILD sympy-1.7.ebuild 1807 BLAKE2B 89063c9f31803b814ef1470aff98e39095bf1e10e35fd6986d0d5b575a2c08424267a94f69c4f61c29d1f3a82f858176fbac92c99396e33f823ae46769304c2d SHA512 18856cb7c3288064d426cabf3e20ad9c646f934de1a530a52bf5c4244181dfa2b2680789bdf579106c9b210843a96446c89e1e171e7110b2fcb4a148bb5f908d
+EBUILD sympy-1.7.1-r1.ebuild 1860 BLAKE2B d8e67550c6bb25a078b5d1c4d60a44d3b1211caef286a451a3154572754fc03118b92bbd56fb14b1f75f1c9ecd8f30c8bda428612741dd8467b4778ff975110c SHA512 40ba4766cfce9a8da460c926ce3ec78ad2c63e1229f46a2670b61946b6e9cd7fb76d8fb065fa56fadec585251b7645403202e12ecc5316918de6052813c327de
 MISC metadata.xml 1607 BLAKE2B cb7e15ad95ed4b47eff7399fe726815cf66ef40bf0af31f31d423aa808bc4f3386756e2a8e98fdf584113d6923edb47a91f39effb08013b5865608e2ca29f3b4 SHA512 198aa6343d446bb348a827b48097055ad709bb6bba22cf9bc3eca9d28fd71d450acad47bfa14fce403dd5d4bbff584bd78407f3859ea4aef918e4768af685c7e
diff --git a/dev-python/sympy/sympy-1.7.1.ebuild b/dev-python/sympy/sympy-1.7.1-r1.ebuild
index af43ce9279ec..f41b65b63914 100644
--- a/dev-python/sympy/sympy-1.7.1.ebuild
+++ b/dev-python/sympy/sympy-1.7.1-r1.ebuild
@@ -36,7 +36,7 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
 	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
 	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
 	texmacs? ( app-office/texmacs )
-	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
+	theano? ( || ( dev-python/theano-pymc[${PYTHON_USEDEP}] dev-python/theano[${PYTHON_USEDEP}] ) )
 "
 
 src_test() {
diff --git a/dev-python/sympy/sympy-1.7.ebuild b/dev-python/sympy/sympy-1.7.ebuild
deleted file mode 100644
index fd39817141d0..000000000000
--- a/dev-python/sympy/sympy-1.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://sympy.org"
-SRC_URI="https://github.com/sympy/sympy/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-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}] )
-	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}] )
-"
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" setup.py test || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.md )
-
-	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
-}