gentoo resync : 20.10.2021

3 files changed, 48 insertions, 42 deletions

diff --git a/sci-chemistry/chemex/Manifest b/sci-chemistry/chemex/Manifest
index e4c35fa87574..fd297d8394a5 100644
--- a/sci-chemistry/chemex/Manifest
+++ b/sci-chemistry/chemex/Manifest
@@ -1,5 +1,5 @@
-DIST chemex-2018.10.3.tar.gz 546696 BLAKE2B d283cfb94118686f1974780249641e0ea6f86cdb854c4a256897e361a300a94506813a5035ee2f300fca13263e8452b77e7a0817436cbd620ba16d801a541af7 SHA512 784bd03b354724d6aa52d663c6f661f865d4ef7ca345573bc8aae9ef63e5dbb3e65abba364de3ff441b78adfa588344c718809c5880b3fc70d8ed24be06a0826
 DIST chemex-2021.4.0_p2.tar.gz 2384471 BLAKE2B 1eb609c4e4ad9ac0f7cac8ab523e72e8ab9c12d40671fd598cd26b8de2a3d6e68dfdcaee9202521fc583068f591377842b3e7b9f0e1f95e6cba8da9b0c6d63a4 SHA512 568072eaf0d1c666de2aedacc50cd98da15631e0ef15ba60414be671ac97a50967e5b4d6d00340b1263f730b3a803ccc8995fbb86cfc47517b9521c9920641c8
-EBUILD chemex-2018.10.3.ebuild 1007 BLAKE2B 9b231e246e6401185db827f7cc808be6c1955a569f00b156b7b3ef43645cb51596865551df05c176bfa916128dd40953d933a54e7c10548c37fb08acbb8fb62c SHA512 82f4719818573b63cbdc8d7ffac0968204357f705655e327df0866ea6296c03fb38b8b05133b301fb88fdbaec693814c55c6fea935f7dc4a507eeee5fe0493f3
+DIST chemex-2021.4.0_p4.tar.gz 2387888 BLAKE2B 26b4467756ba1b31775c554906a2ce09556e1fb99dd2ff294620a12b92246f441a2daa07e6bad7cedf903bd18e6ecc0613b6473f54d27d89ed9117ddc6a27269 SHA512 7d93f213317e4cb5a987c0b3cfcce146fb02a15ac9efbde74f9d3fc56a5e86c89ca6b606f45013bf08ed10f3de17cc72fa010ce0e42c5cb746119ede0ce4d38f
 EBUILD chemex-2021.4.0_p2.ebuild 1184 BLAKE2B a7ab020a416e46f232ce5b9bd140d7af6c925b8e0da5b2dfe629e7f50533692700c183cf1068be6fa0cee7cd3141eee6f684a936fea9b034f0a68b8f0f080358 SHA512 06067c09038bcc2629ac272a5005acd1f11fce5014ceb2fb9eb8fa9f7c6d900d9ccdc07a90e54fde11e5399baed2b12def1facdfaf7e929e603e6c334b463a04
+EBUILD chemex-2021.4.0_p4.ebuild 1279 BLAKE2B dc10ef290d4dac75119a4b215da0b1fea01cbfc7558c6fc78f46801ec5cb0514d6d2ae7cbd58028ce4da2903109d25b0fd02637d4b3a6570b819696fc4c15348 SHA512 faaa7006bd9ee86684de6afaceb25695c63dc1514abb21201172c0338068abf0787ae67c935b12e10dcacac2c30652f513458c9f6e0284d94b1b57b53dc7e310
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sci-chemistry/chemex/chemex-2018.10.3.ebuild b/sci-chemistry/chemex/chemex-2018.10.3.ebuild
deleted file mode 100644
index 19f50cce7be7..000000000000
--- a/sci-chemistry/chemex/chemex-2018.10.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_SINGLE_IMPL="yes"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
-HOMEPAGE="https://github.com/gbouvignies/chemex"
-SRC_URI="https://github.com/gbouvignies/chemex/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/asteval-0.9.11[${PYTHON_USEDEP}]
-		>=dev-python/lmfit-0.9.11[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-1.1[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-		>=dev-python/scipy-0.11[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-S="${WORKDIR}/ChemEx-${PV}"
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	distutils-r1_src_prepare
-}
diff --git a/sci-chemistry/chemex/chemex-2021.4.0_p4.ebuild b/sci-chemistry/chemex/chemex-2021.4.0_p4.ebuild
new file mode 100644
index 000000000000..3a331d48eba7
--- /dev/null
+++ b/sci-chemistry/chemex/chemex-2021.4.0_p4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_SINGLE_IMPL="yes"
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+
+inherit distutils-r1
+
+DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
+HOMEPAGE="https://github.com/gbouvignies/chemex"
+SRC_URI="https://github.com/gbouvignies/chemex/archive/${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="test"
+
+#RESTRICT="!test? ( test )"
+# FIXME: Restrict until we figure out how to run tests properly, bug #815079
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/asteval-0.9.25[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-4.1.0[${PYTHON_USEDEP}]
+		>=dev-python/lmfit-1.0.3[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-3.4.3[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.21.2[${PYTHON_USEDEP}]
+		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/tomlkit-0.7.2[${PYTHON_USEDEP}]
+		>=dev-python/tqdm-4.61.1[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/ChemEx-${PV/_p/-dev}"
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	distutils-r1_src_prepare
+}