gentoo resync : 12.05.2022

4 files changed, 160 insertions, 0 deletions

diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index bb18cfcc2e2e..1dc23473b06d 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,7 +1,10 @@
+AUX symengine-0.9.2-cmake-setuptools.patch 2629 BLAKE2B 625278ad90c6ed44c1ba99f8744d6b9a7c7da42d04c734385d53bc6b4e3b61aa1675159c7bb3048bb6a1b988b0836cfbe7818934c8171f3ae55dddc73a0189be SHA512 3f87c37ddf506c3a8aaf652d787f1c40e937ee2b2f17aece2c10d4a0218d67b52b1cc7c8ee3e504b2b1f8b87144e4b35c8a2ec061b054591c04ed0a7ed04b4d1
+AUX symengine-0.9.2-setuptools-61.patch 566 BLAKE2B 362c880be08c98da85b1ae2a13ca7cc422af5f07730eebc6d9eee6bbcab703df3baf88925e10a417e261eceb83ee36ff6b8e8b824bc1497e1a462b746712c317 SHA512 dc2c85d0a39a58bb0011aee4cc0852815568eb0a310f39ee0aa8b2500a6266ddab2cb03d7bbcf317897c64cf31f3909a40d12cba1c0392291ffdbb7b348b1c98
 DIST symengine.py-0.8.1.tar.gz 108857 BLAKE2B ff721982af3448d63074e599d56d38eef3002b4e8073fc22740ae61b288b863ed856d849675cbb1286f1b9bdd2263aa1e531635a0b074a7de6909a604e6b57e9 SHA512 73af12f686dcb495aef06964c76e6f31ef242bbba2e3b2fd545594fbf1902487edd021cc25b0a8324a7ac014e90ee85f64e388e092d36e8796db4c1ed53e75c7
 DIST symengine.py-0.9.1.tar.gz 110693 BLAKE2B 16ac7a36ebf7ef6642f8fde1b8463b63177753db3c5d87ed3cacc547c94561df504e5ae92af0e121010cabf70f6b123c73f5eb8e77809bed1de779dbf18f2e7c SHA512 560c809b0a5628752aefe4be5aaa8f1f8482abcbb50d018d9ffee395d7c956b4f5cedd13953f0641594d468fcbbe0465576d16543d22dbbc84b270b285970786
 DIST symengine.py-0.9.2.tar.gz 110856 BLAKE2B 11330acc04970d367fe66787521776dbd803929d91802ea09d1bc54a96c8fd87e85114042f57fc8c007de2dcaa1b0503a8389ac677797cc2efc866d71d76d1db SHA512 ea9e8cb7dd789b551f5372c32b98365ab251bac838204b5c832783f9866c2774f5d411f2f59e5e60f17939a1c341702acfc3e3f7e77246330ab3cb74f5ba7cca
 EBUILD symengine-0.8.1-r1.ebuild 1056 BLAKE2B bd814c938fb24bb0a1364120f9e26167a13692c09cfadbd3f0ef14451990dd1762deeba4c77267ca3f5a0695a783fce6c327de5155d873dbbd6566882986ff73 SHA512 276055d95e31eb4439c8c516b7c7c0fe70935ecba4c125e17148d03632a29b09d6106d2746f0cfd9010c7a9e4a4fc85e34b0344a033c3d1acafb9264f5ad2d9d
 EBUILD symengine-0.9.1.ebuild 1162 BLAKE2B 91494f4a445353378f5663dd3bf2572dcfadf549ff5ca2edc48a78e464360d57b3202762d66234665e303b2324398147a1ac27f09bb3cd2f64bb730d5d8c3c9c SHA512 4929ae2ea4d4879bd516a4d3ecc828a65e7a4b8cb004133a152b8aa27a22207c6df628fe3b5b3c3aea012954bcd583a0ee1d89ee771a2b2d28d9f1bed97adf63
+EBUILD symengine-0.9.2-r1.ebuild 1203 BLAKE2B 7ea8884108fe19397ca33bba2dbc339af3eeac20b943d09d17fd3f8b7f1a18000f804ce812ac55774c8a801255e5ae47099bc715eb2701d7dff231e63ecef152 SHA512 c2b2b14406c72f6e90e528d2759a9cd78159daf2f03e2069653a68019ae559aa82cb8a1d3f171951f475b12d3530ccb504347b40fcb2128682862ea64df2876b
 EBUILD symengine-0.9.2.ebuild 1100 BLAKE2B 4693049f2ff325cc6aa7c20b01e765fef54ecf6690674806479975045ca691d984033cca5f0e048f20b6fb6a3d8c358c623f309070ab6b0ea2480c396d7ebe1c SHA512 cc031fc4770b67d955122b1cad1a113e2211a820949334809ac5d1b0f4afd7cc16c9f614edb1abd7265e24be970f007dbba427f9e4d5f7dd6d473d7c6c087c7a
 MISC metadata.xml 404 BLAKE2B 5ff5d7b399605db96aeac08c73ce653dd7b24354e49fb316e4e943ceaa51b272d5f6bad8d44f8a6f4ab6d23a2b322b96b21f4600335d169ef8c1ad3bf0b1976d SHA512 73306bcbdecf7935f187df67b4ff819dec323f4ae8cfadaa4e1d99fef4165af7f085cc2a0b8ade29a68cbcc3e692d5b278e33fcc06303d6c54a24fe6470e792d
diff --git a/dev-python/symengine/files/symengine-0.9.2-cmake-setuptools.patch b/dev-python/symengine/files/symengine-0.9.2-cmake-setuptools.patch
new file mode 100644
index 000000000000..3b930c998d99
--- /dev/null
+++ b/dev-python/symengine/files/symengine-0.9.2-cmake-setuptools.patch
@@ -0,0 +1,84 @@
+https://github.com/symengine/symengine.py/pull/402
+https://bugs.gentoo.org/836599
+
+From bc84086d60de038eb381c9e37c8b552a6c246ab5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 2 May 2022 09:24:45 +0200
+Subject: [PATCH] Fix build to avoid duplicate files in wheel
+
+Fix the build system to package pure Python files
+via distutils/setuptools, and limit CMake to installing the compiled
+extension.
+
+The prior logic has installed some of the .py files both via setuptools
+and via CMake, to different build directories.  As a result,
+the resulting wheel contained duplicate files, e.g.:
+
+         2170  05-02-2022 07:08   symengine/__init__.py
+         2170  05-02-2022 07:08   symengine-0.9.2.data/purelib/symengine/__init__.py
+
+Duplicate files cause the wheel to be rejected by the installer package.
+
+After the change, a correct wheel is generated.  Installation works
+both via PEP517/wheel and via legacy `setup.py install`.
+--- a/setup.py
++++ b/setup.py
+@@ -226,7 +226,7 @@ def finalize_options(self):
+       url="https://github.com/symengine/symengine.py",
+       python_requires='>=3.7,<4',
+       zip_safe=False,
+-      packages=['symengine'],
++      packages=['symengine', 'symengine.lib', 'symengine.tests'],
+       cmdclass = cmdclass,
+       classifiers=[
+         'License :: OSI Approved :: MIT License',
+--- a/symengine/CMakeLists.txt
++++ b/symengine/CMakeLists.txt
+@@ -1,7 +1 @@
+ add_subdirectory(lib)
+-add_subdirectory(tests)
+-
+-set(PY_PATH ${PYTHON_INSTALL_PATH}/symengine)
+-install(FILES __init__.py utilities.py sympy_compat.py functions.py printing.py
+-    DESTINATION ${PY_PATH}
+-    )
+--- a/symengine/lib/CMakeLists.txt
++++ b/symengine/lib/CMakeLists.txt
+@@ -28,7 +28,7 @@ install(TARGETS symengine_wrapper
+             ARCHIVE DESTINATION ${PY_PATH}
+             LIBRARY DESTINATION ${PY_PATH}
+         )
+-install(FILES __init__.py
++install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/config.pxi
+     symengine.pxd
+     symengine_wrapper.pxd
+--- a/symengine/tests/CMakeLists.txt
++++ /dev/null
+@@ -1,25 +0,0 @@
+-set(PY_PATH ${PYTHON_INSTALL_PATH}/symengine/tests)
+-install(FILES __init__.py
+-    test_arit.py
+-    test_dict_basic.py
+-    test_eval.py
+-    test_expr.py
+-    test_functions.py
+-    test_number.py
+-    test_matrices.py
+-    test_ntheory.py
+-    test_printing.py
+-    test_sage.py
+-    test_series_expansion.py
+-    test_sets.py
+-    test_solve.py
+-    test_subs.py
+-    test_symbol.py
+-    test_sympify.py
+-    test_sympy_conv.py
+-    test_var.py
+-    test_lambdify.py
+-    test_sympy_compat.py
+-    test_logic.py
+-    DESTINATION ${PY_PATH}
+-    )
+
diff --git a/dev-python/symengine/files/symengine-0.9.2-setuptools-61.patch b/dev-python/symengine/files/symengine-0.9.2-setuptools-61.patch
new file mode 100644
index 000000000000..a8fad4868110
--- /dev/null
+++ b/dev-python/symengine/files/symengine-0.9.2-setuptools-61.patch
@@ -0,0 +1,17 @@
+https://github.com/symengine/symengine.py/commit/987e665e71cf92d1b021d7d573a1b9733408eecf
+https://bugs.gentoo.org/836599
+
+From: Isuru Fernando <isuruf@gmail.com>
+Date: Sat, 2 Apr 2022 15:43:00 -0500
+Subject: [PATCH] Fix for latest setuptools
+
+--- a/setup.py
++++ b/setup.py
+@@ -226,6 +226,7 @@ def finalize_options(self):
+       url="https://github.com/symengine/symengine.py",
+       python_requires='>=3.7,<4',
+       zip_safe=False,
++      packages=['symengine'],
+       cmdclass = cmdclass,
+       classifiers=[
+         'License :: OSI Approved :: MIT License',
diff --git a/dev-python/symengine/symengine-0.9.2-r1.ebuild b/dev-python/symengine/symengine-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..09fdecd13d48
--- /dev/null
+++ b/dev-python/symengine/symengine-0.9.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=${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
+		-> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+
+BDEPEND="
+	dev-util/cmake
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sympy[${PYTHON_USEDEP}]
+	)
+"
+# See bug #786582 for symengine constraint
+# See also https://github.com/symengine/symengine.py/blob/master/symengine_version.txt
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/symengine-$(ver_cut 1-2):=
+"
+DEPEND="${RDEPEND}"
+
+# the C library installs the same docs
+DOCS=()
+
+PATCHES=(
+	"${FILESDIR}"/${P}-setuptools-61.patch
+	"${FILESDIR}"/${PN}-0.9.2-cmake-setuptools.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	epytest
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}