gentoo resync : 29.12.2022

4 files changed, 22 insertions, 65 deletions

diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index 37768e6cb383..3711e919f1a1 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,7 +1,6 @@
+AUX plotly-5.8.0-fix-versioneer-import.patch 541 BLAKE2B 51ff6cbab8d9124243445f758aa4b976b7c26e1d3ce633e943bff133b81c0a7587feeb9d5e98a63f319c6afed8dc06e06fafe765ffd51fec245215c849fb4955 SHA512 db4743e538dddfe66e4c9c766698844af4d09c68188afefe92b6419adfe7cc0b1e9c1266d702d590b0b8dfc14bffbc8f08262ead0bff4dae3b5c71fa1259a4b9
 DIST plotly-5.2.2.tar.gz 7293292 BLAKE2B baef3accf8f5a3085908fcea558f8003687e18a1f97471c620c378c10d23d4222ef87dc47d64f45199b594414890db5b8ca5e3d7867c871d926c2ae441128c4a SHA512 4d6d79f7cc2063e73e7c17ff90a7d13324497ea8034d8ce62d79ec62b0530a59b2eaec8913fb05efb804cf5be8387b6f96d1710f41b9993233b5a13cf64dd310
-DIST plotly-5.6.0.tar.gz 8599746 BLAKE2B e76ac48e79a2470c320f21991a75c51c29ec959b9bbc50b1176df2f40572d794b2073f16964445a3d6dee4643063c7ccbee90fee1673b9bfd850e239fb39d0e1 SHA512 3ba91bd1b2a9cb1cd778985a0253b11f36e891e01cb734d6c88c40266f1852f2b2d02b12bc712c0b58b93dd68dd1c9b4378bcbb462bd63b3a67334cb83564c82
-DIST plotly-5.7.0.tar.gz 8609793 BLAKE2B 12318f837c248c54fd3a8723bc772e8348186942565ba5a4c095f348dc338cc098318889900500ec333d7ec352801926ec91d312f2ccd98a89f804159223057f SHA512 01675470ef5218f06b4e9e485f23155a8e8550748fdf86afdb2a2969f838464b70d4452811427ab6bed2846093e8cfba7e891f7d0ea3a621e1fbffe22182d933
+DIST plotly-5.8.2.tar.gz 7574127 BLAKE2B 1a9d05009148a65b2f4206165a3e02ea7e130663e9658af64bddc0df6f1b720ca29e1cf30150634403b4bdda96156899f0e2e2d12b81cfd04a4bc9812057a79d SHA512 f262cbe20fa51861a319911e04446d4aa564b878dc1aa8e750a5d03af9747ec439fda941ab63d20ecb5374417174a2bd1c4f5549af5ba0f57f135d10ae0877a0
 EBUILD plotly-5.2.2.ebuild 795 BLAKE2B e609d220f61b73ca3c11255e0fc28cf9c3a2ed316be1f39044cab25679683300d6281e80ce2f5ead3be391b3c537be7531c9148ec1a1bb069a04ba621ba1784d SHA512 a1bac18949480f19c68891497effdfe60cc3ca474ca24ce27134f2a1da5cd894426fca9b00ad8d6d24138da141fafefd09a40723b1314197068422cd988574cb
-EBUILD plotly-5.6.0.ebuild 1602 BLAKE2B e4c9fad96ba8756789aaa0a3789bedd7f5e68ed7c35d4645b9ec97207a080634d9b65587b9aa008de9271c9df47944d1fbbf68878bbf85c54b0299b6ba23655b SHA512 6aa34892331d5e551bf2962073349fdb9cd9a2844f064dd5e21c8551e384dd632bebd71a86ae508cbbec4c9a3480ee9339c10079d55ce00cb493fced05c56a07
-EBUILD plotly-5.7.0.ebuild 1595 BLAKE2B 3acd8461e2c34c67636e13bed9bf5d39d7be205ffea561aba2281960ed113fea3fe0814904457ff966cabceb40d5a4d8808014cee069bdb8177b1471e939189d SHA512 f724cd1973e94956edfa46b8e100911d2eec0851c0b68758a4cb3f16ed4f47614c35ab65c7c752d6d081d565078893ca5b68e7fb08a08f487817f326a0de4022
+EBUILD plotly-5.8.2.ebuild 1620 BLAKE2B 10a9f7acdeadd0d3bb0ba7054a8622d840bacc81251755e35d261a423601a749e78ba9a63019ae6ceb59d72b3010c056062a41155cc32a34979f00f8fdfcb0fd SHA512 699945bebab92a8d267bf14e8b1f69587ea707484251d45b938a1f909743fdd339f1c6bc5e6d41b30bafb77ae2c8e24f293d817ce746751b15fdd77f0bcc636a
 MISC metadata.xml 627 BLAKE2B 453adb04f4caba9790fe5223635245c8bca7ca5c6dc1930f09537045580b88b5fa1649e47158b13be6cc5cb09b4479a47690e37ef13208b47a95f82d14793a91 SHA512 a5183e9d217d1312e8d383ccb4ade66b92575492b6c8ed8987e3af18e9e456836b62b2d572ce62f9e01aae47b4a2bcbd12f79b4bb6acabfe69c2b63b20315bd3
diff --git a/dev-python/plotly/files/plotly-5.8.0-fix-versioneer-import.patch b/dev-python/plotly/files/plotly-5.8.0-fix-versioneer-import.patch
new file mode 100644
index 000000000000..37582b05429d
--- /dev/null
+++ b/dev-python/plotly/files/plotly-5.8.0-fix-versioneer-import.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/841002
+https://github.com/plotly/plotly.py/pull/3757
+https://github.com/dandi/dandi-cli/pull/998
+https://github.com/mgorny/gpep517/issues/1
+--- a/setup.py
++++ b/setup.py
+@@ -11,7 +11,7 @@ from distutils import log
+ # ensure the current directory is on sys.path; so versioneer can be imported
+ # when pip uses PEP 517/518 build rules.
+ # https://github.com/python-versioneer/python-versioneer/issues/193
+-sys.path.append(os.path.dirname(__file__))
++sys.path.insert(0, os.path.dirname(__file__))
+ 
+ import versioneer
+ 
diff --git a/dev-python/plotly/plotly-5.6.0.ebuild b/dev-python/plotly/plotly-5.6.0.ebuild
deleted file mode 100644
index 23112789fce7..000000000000
--- a/dev-python/plotly/plotly-5.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="https://plotly.com/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package plotly-orca and kaleido
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/backports-tempfile[${PYTHON_USEDEP}]
-			' python3_8)
-		dev-python/inflect[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/jupyter[${PYTHON_USEDEP}]
-		dev-python/jupyterlab[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/statsmodels[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/pyshp[${PYTHON_USEDEP}]
-		sci-libs/scikit-image[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mkdir -p "${ED}"/etc/ || die
-	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
-	rmdir "${ED}"/usr/etc || die
-}
diff --git a/dev-python/plotly/plotly-5.7.0.ebuild b/dev-python/plotly/plotly-5.8.2.ebuild
index 5bd40591e1d8..727c95cffca9 100644
--- a/dev-python/plotly/plotly-5.7.0.ebuild
+++ b/dev-python/plotly/plotly-5.8.2.ebuild
@@ -20,7 +20,6 @@ RESTRICT="test"
 
 RDEPEND="
 	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
@@ -49,6 +48,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8.0-fix-versioneer-import.patch
+)
+
 distutils_enable_tests pytest
 
 python_install_all() {