gentoo resync : 25.08.2020

3 files changed, 64 insertions, 38 deletions

diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 4a1f7a70cdd1..b03a77922f4d 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,3 +1,4 @@
-DIST nbdime-0.2.0.tar.gz 4139079 BLAKE2B 1e6994009c8ac291272a297fe583f79123906c9e05ca2afd345c6e230e3c476259c4919e2161a049e46fa28f4490122c53d0a2bc94661683652d226a78fb39be SHA512 c156b706e1d6cc7885f987d746e91d7f0c2fa48885339fd79e778643382ab45e2e52565f45cc73b9a305c6f5177339e875f53ae46d73578443880a4c7522976d
-EBUILD nbdime-0.2.0.ebuild 1627 BLAKE2B 516e39cb3daf12267d12115dc79c64bf8c95f707eeb508f72a7c862609336d677c7a2b76041867775b3cce8a8f9f7078c71d3e39d02dafde064894c254c385f5 SHA512 f44408101877b5b097cc93637e64ec81fe2a1e550ed09c76e62c557d58f892d9a03d1df68ca3f7ff0f381b249c288ce3c41845575a400dcf3bdf8e48af924d83
+AUX nbdime-2.0.0-remove-bdist_egg-hack.patch 1176 BLAKE2B 49c2d31632b8341f7fd52d70f063d8229d74a65a23058fe24410fac62939bd64adcf9af419d6f7b626d67150e54016323f33c735d7a51e80b35403dee1055979 SHA512 9d8200ebf6c6d76d3efc89ae384586404fa2d9b345c16f63ddc93d76c8ac2e17e34099bc0b2b907723f6fe096f6c56273b423263f328bc5882046488c077bbbe
+DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd SHA512 e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142
+EBUILD nbdime-2.0.0.ebuild 1514 BLAKE2B 1302952447550212f5ecab52bb21a0e36b656c77af163596731df05d9e51b44311fbda8583683320f4dd2b003dfedb02996a71a9ba52f224766f43cc8aa39cab SHA512 0ddf533cb3c97b40d3165f1507993365b8b2b4f48886a4754e77fb2c2ce7a9253b89a26f963602ecdb8440b01732634ae8ca6b9417666807ec1310ef16bed682
 MISC metadata.xml 601 BLAKE2B eeec61d75fb90ef3e0f0dd13264d7864a204f560c047dedf6a3ddb5a2df0faffcd344127d8a7bafe8a1f2d0b6382081d56901c6f8c5e0b9e94c8d52088f29442 SHA512 27deefa922e39c76bf3b3ea96aa1f1b5ef478a0b5cf6bbc9832977cf35bce6f9c0f38bb69fd54b0a27877087aab719c34b5811a6063890fdfebab28c57d6ff94
diff --git a/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch b/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
new file mode 100644
index 000000000000..ff450f2ce447
--- /dev/null
+++ b/dev-python/nbdime/files/nbdime-2.0.0-remove-bdist_egg-hack.patch
@@ -0,0 +1,36 @@
+--- a/setupbase.py
++++ b/setupbase.py
+@@ -129,17 +129,6 @@
+     build_py.finalize_options()

+ 

+ 

+-class bdist_egg_disabled(bdist_egg):

+-    """Disabled version of bdist_egg

+-

+-    Prevents setup.py install performing setuptools' default easy_install,

+-    which it should never ever do.

+-    """

+-    def run(self):

+-        sys.exit("Aborting implicit building of eggs. Use `pip install .` "

+-                 " to install from source.")

+-

+-

+ def create_cmdclass(prerelease_cmd=None, package_data_spec=None,

+                     data_files_spec=None):

+     """Create a command class with the given optional prerelease class.

+@@ -179,14 +168,9 @@
+     wrapper = functools.partial(_wrap_command, wrapped)

+     handle_files = _get_file_handler(package_data_spec, data_files_spec)

+ 

+-    if 'bdist_egg' in sys.argv:

+-        egg = wrapper(bdist_egg, strict=True)

+-    else:

+-        egg = bdist_egg_disabled

+-

+     cmdclass = dict(

+         build_py=wrapper(build_py, strict=is_repo),

+-        bdist_egg=egg,

++        bdist_egg=wrapper(bdist_egg, strict=True),

+         sdist=wrapper(sdist, strict=True),

+         handle_files=handle_files,

+     )

diff --git a/dev-python/nbdime/nbdime-0.2.0.ebuild b/dev-python/nbdime/nbdime-2.0.0.ebuild
index 63b92348ff58..29db8fbcd28d 100644
--- a/dev-python/nbdime/nbdime-0.2.0.ebuild
+++ b/dev-python/nbdime/nbdime-2.0.0.ebuild
@@ -1,67 +1,56 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Diff and merge of Jupyter Notebooks"
 HOMEPAGE="https://jupyter.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc test webtools"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64"
+IUSE="webtools"
 
 RDEPEND="
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]
-	webtools? ( net-libs/nodejs[npm] )
-	"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
+	webtools? ( net-libs/nodejs[npm] )"
+BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/jsonschema[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-	"
-# The package recommonmark is required to build the docs, not in portage yet.
-# Furthermore, backports.shutil_which is required for python2_7.
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/tabulate[${PYTHON_USEDEP}]
+	)"
 
-python_configure_all() {
-	if ! use webtools; then
-		mydistutilsargs=( --skip-npm )
-	fi
-}
+distutils_enable_sphinx docs/source \
+	dev-python/recommonmark dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
 
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
+PATCHES=( "${FILESDIR}"/${PN}-2.0.0-remove-bdist_egg-hack.patch )
+
+python_configure_all() {
+	use webtools || mydistutilsargs=( --skip-npm )
 }
 
 python_test() {
-	# user.email and user.name are not configured in the sandbox.
+	# user.email and user.name are not configured in the sandbox
 	git config --global user.email "you@example.com" || die
 	git config --global user.name "Your Name" || die
 
 	distutils_install_for_testing
-
-	py.test -l || die
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }