gentoo Easter resync : 12.04.2020

3 files changed, 12 insertions, 48 deletions

diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index e02ea17d3ff1..a08ab6089fa8 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,5 +1,3 @@
-DIST symengine.py-0.3.0.tar.gz 90877 BLAKE2B 8e1bf5741eb0c6ff6fd954b9f8b1827afcde61e55f0c5d6ada96bdc16d164003b21a51c2b485bc635d1f87e449c422f50e6bc8fca7371996dba7fdc096b0798b SHA512 9f43d572990744a93f4046920b09c80aff3ffa0e5735b2372298a65755140dee6c2c22c9c9fd964622f03379e31a1f1415d0051b213dda943ffc8e839059c7c6
 DIST symengine.py-0.5.1.tar.gz 110864 BLAKE2B 30309b87cc612df37fca94df5c3199401a2cff9fd782de2fa00910bf17a1bb2debfb851aefc6178a38eafe49055950b76373c6e9a81a2fe5814497c2894b5f8e SHA512 85df42245daad0387886f003a593e8d45f34e51db4ed207f6bb70f573704a33f24a1cbe30f1c67c2c1541f1e800208c90b3ce3ec35c9d4eab05bbdb5be570ef5
-EBUILD symengine-0.3.0.ebuild 964 BLAKE2B bfb4c9543bd53fd77ea8a4668201caa078f2f882432995230f890ecb0d7cd34f5e3b4fe57416360c644e4679e50d18203b23ca045223f9dc6e7c1e277e77735d SHA512 106fe025369f2a939b008d73955fd3d311825b1d5dd9f563965d8d68bc49f318bde25d27c6e428c4bd8287b7f77fd584a0fee73a76c352dd6124f85b5c6c8c2d
-EBUILD symengine-0.5.1.ebuild 970 BLAKE2B 25b6c78fc0191f44b3db8f2ac678b5af81abdbd67b832b0e7aed0fb3031226e9297c7c0bfdb415e46f5d7a6a5a519a7b94fb65c1ae514b02ea0abe32da477ee4 SHA512 20eab49f4244cba2a1f7b341ac427ddf3d1795de7df74aebcbcc88a92fc275113eb2fbcc20d0dd9d9a27020f12c29dd3b74d19f6d99edf6837487a7e0f09fbe1
+EBUILD symengine-0.5.1-r1.ebuild 1032 BLAKE2B 0f0b252a6086209b2984348b014ea124de628280206653b9e88cceba01d8e745a778d83ade77c0fb74290e866d8ec009b0985e29d5eb5ff63c7225d044ef7e0a SHA512 11cab6c58220cd636aa2ca27b4ceae17ea1ee6ccb7fe43fdef941480ace25fc1391e38a2425781b81cfe6359a804e2ef24c82c6fa9767f79be365b97aafba7c9
 MISC metadata.xml 499 BLAKE2B f8fdd047ee3852b23514589163dc6ff82dfb69c93b8c00e8ee35af3a8a819a3e83051c4acc634a03044caf12cf47a96f892ef5ccb491da55ec4a3f14b4475455 SHA512 e3b01c1a5e3417fff75d843b24a20597c15900defd0efad954831b61a03980c9163fc596bb22ae4fe4cb5162cd492c383247560ced28c395467e1facc49cd573
diff --git a/dev-python/symengine/symengine-0.3.0.ebuild b/dev-python/symengine/symengine-0.5.1-r1.ebuild
index 02332c4b7034..9f1b6b83333d 100644
--- a/dev-python/symengine/symengine-0.3.0.ebuild
+++ b/dev-python/symengine/symengine-0.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -15,26 +15,32 @@ SRC_URI="https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz -> ${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+
 RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/symengine"
+	>=sci-libs/symengine-0.5"
 DEPEND="${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/sympy[${PYTHON_USEDEP}]
+	)"
 
 S="${WORKDIR}/${MYP}"
 
 python_test() {
-	cd "${BUILD_DIR}"
+	cd "${BUILD_DIR}" || die
 	nosetests -v || die "tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
 	distutils-r1_python_prepare_all
+	python_optimize
 	rm "${ED}"/usr/share/doc/${PF}/README.md || die
 	newdoc README.md ${PN}.py.md
 }
diff --git a/dev-python/symengine/symengine-0.5.1.ebuild b/dev-python/symengine/symengine-0.5.1.ebuild
deleted file mode 100644
index 010852d47458..000000000000
--- a/dev-python/symengine/symengine-0.5.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-MYP=${PN}.py-${PV}
-
-DESCRIPTION="Python wrappers to the symengine C++ library"
-HOMEPAGE="https://github.com/symengine/symengine.py"
-SRC_URI="https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/symengine-0.4"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYP}"
-
-python_test() {
-	cd "${BUILD_DIR}"
-	nosetests -v || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_prepare_all
-	rm "${ED}"/usr/share/doc/${PF}/README.md || die
-	newdoc README.md ${PN}.py.md
-}