5 files changed, 55 insertions, 79 deletions
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 759103f83a54..85647484cc59 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,4 +1,2 @@
 DIST nbformat-5.0.8.gh.tar.gz 127329 BLAKE2B 6252d35f72fd0af5a89d83e9e48f61baf2656eb6530d4a7b05a5241e7272098992d70d68705da4fb9921ab1939378658b2e6e5f765a453f932e94e9232006a66 SHA512 956add98517f1128d8efacae1f3cf9fe27b4d7acae4a56e14dd6c2942aab39b063170759bc6de67bcedd2e0fd6c7ab1a36aef268f2088644ba31caa936b9359d
-DIST nbformat-5.1.0.gh.tar.gz 152052 BLAKE2B 571d48af8c92b1cff9110935e00f53543d7bbae5ed9a08b516e9ff23366d9db7e4b1fb50dc786f2cd70d7f871baa05b6be86a6f22940724d90d05fdf58449bba SHA512 17c234e7777c170d629c0d3a4d8d7ddf01a754977a5e21357550ff702c5b4e26cd31164b32ced0fb20f3c0953390efd9a7509ed92f6c159fcef8634bd3f6af53
-DIST nbformat-5.1.1.gh.tar.gz 152242 BLAKE2B df5e293ab235156f78e2bf85f1a22e597d8e0a60a6e448c69d4e04b62eed834b078238ad03a67e58ee0f705d1495b2f6c4b42124b8d439adbcb52be7ee91ae36 SHA512 5058c009b5148e6764de942cc43cb4774abad758250f065f9103c94f820de841b72d0f69ad24c38ade0c9fca3df61b7ea51b6097c6c191a2f606d57ef358083f
 DIST nbformat-5.1.2.gh.tar.gz 152275 BLAKE2B 2a0758f33952547e5ef91f0ac0a8b98b97b882a8797c38feff6710a3a0824637f41396b152403e155e1af9805b7a85c189ba2a609076c591562e5f4bb783da29 SHA512 4fd574373c2f325b6d078a062878d139d741d30f9101f3344e0c7fc19bdf714f8ef71994134e76c90e1301102aac55cc490df8344f3ceb407002437f35d03944
diff --git a/dev-python/nbformat/files/nbformat-5.1.2-package-data.patch b/dev-python/nbformat/files/nbformat-5.1.2-package-data.patch
new file mode 100644
index 000000000000..4fd1de2a942b
--- /dev/null
+++ b/dev-python/nbformat/files/nbformat-5.1.2-package-data.patch
@@ -0,0 +1,50 @@
+From 6dc17e79be58c3cce66256eec2a565692cf95809 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 22 Jan 2021 10:16:24 +0100
+Subject: [PATCH] Fix installing package_data when --build-base is set
+
+Fix package_data declarations in setup.py to associate every set
+of files with its bottommost package.  This is necessary for the 'build'
+command to install files correctly when --build-base is passed
+explicitly.  The all-files-for-top-package approach seems to work only
+incidentally.
+
+To reproduce the problem, try:
+
+    setup.py build --build-base=build2
+
+and note that none of the data files were installed.
+---
+ setup.py | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 22305d3..0a6aa45 100644
+--- a/setup.py
++++ b/setup.py
+@@ -34,11 +34,17 @@ for d, _, _ in os.walk(pjoin(here, name)):
+         packages.append(d[len(here)+1:].replace(os.path.sep, '.'))
+ 
+ package_data = {
+-    'nbformat' : [
+-        'corpus/*.txt'
+-        'tests/*.ipynb',
+-        'v3/nbformat.v3*.schema.json',
+-        'v4/nbformat.v4*.schema.json',
++    'nbformat.corpus' : [
++        '*.txt',
++    ],
++    'nbformat.tests' : [
++        '*.ipynb',
++    ],
++    'nbformat.v3' : [
++        'nbformat.v3*.schema.json',
++    ],
++    'nbformat.v4' : [
++        'nbformat.v4*.schema.json',
+     ],
+ }
+ 
+-- 
+2.30.0
+
diff --git a/dev-python/nbformat/nbformat-5.1.1.ebuild b/dev-python/nbformat/nbformat-5.1.1.ebuild
deleted file mode 100644
index 50772f88b140..000000000000
--- a/dev-python/nbformat/nbformat-5.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-# missing on pypi
-SRC_URI="
-	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	test? (
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc
-distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.1.0.ebuild b/dev-python/nbformat/nbformat-5.1.2-r1.ebuild
index 50772f88b140..6a5b80d5140c 100644
--- a/dev-python/nbformat/nbformat-5.1.0.ebuild
+++ b/dev-python/nbformat/nbformat-5.1.2-r1.ebuild
@@ -26,13 +26,17 @@ RDEPEND="
 	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
 	dev-python/jupyter_core[${PYTHON_USEDEP}]
 	"
-DEPEND="
+BDEPEND="
 	test? (
 		dev-python/fastjsonschema[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 	)
 	"
 
+PATCHES=(
+	"${FILESDIR}"/nbformat-5.1.2-package-data.patch
+)
+
 distutils_enable_sphinx docs \
 	dev-python/numpydoc
 distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.1.2.ebuild b/dev-python/nbformat/nbformat-5.1.2.ebuild
deleted file mode 100644
index 50772f88b140..000000000000
--- a/dev-python/nbformat/nbformat-5.1.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-# missing on pypi
-SRC_URI="
-	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	test? (
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc
-distutils_enable_tests pytest