7 files changed, 50 insertions, 53 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index dfeddb9985dc..16971c118605 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 183e5908c60a..78054c5a1956 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,6 +1,4 @@
 AUX meson-python-0.7.0-defaults.patch 506 BLAKE2B 404c8d4803f4e6ca5244dc27c84f2c0440999e3fff87febeb12d1d304c7ed9f9358f6b958b5975d171995960bbf7681003180765d2bdb88e694e52c518a8381d SHA512 43b9825b9facdcf72f0b4b80a72aac8544ec1cedb14a79c53dbe37b190af170584acbb0d281d89ddeb199ea5ba720eb0de04c5294a3e7197019c58d7ee14d786
 DIST meson-python-0.10.0.gh.tar.gz 37739 BLAKE2B 028cbb191076b49946576b02d26a84079f412a178d9829bf85d579b8d3624e192e9394ade31524faf972ef4d105b7bf703e750529a7fafcbadf9a52d3c4876c6 SHA512 50d4d0bbf810948b4f218f25815058778b2a3ac8ff811d4d7cc699d1cfbcb75612d28789080b4e5ec3a47be03636389b7bf313366273abb733f77644758747cb
-DIST meson-python-0.9.0.gh.tar.gz 37253 BLAKE2B 29aa875dfc1c275ee4edab48bd2d46c783969fc0ab58f108be1a6443d5519028a2d36f666dc57c45d68ba77334cca2d11a0d4bfb8abb3822b537252c71b77286 SHA512 ae0927876533af65c5b1d8278ff6db3726f0551c160bfedcc602189fcad44c9412faa589738718aac2f10cf9497db8c632d89ccf1fb8519e6e7f4add78d8e52d
-EBUILD meson-python-0.10.0.ebuild 1003 BLAKE2B 1670b8be0013fbb67787a92be6d65671821d9a0597e865ec84a2a92e22d31bb5fdd0fac760e2e3b91070bf9564ada05267618ddbd3e17f32d570c063e9d4838c SHA512 5f0a071573a1ca0e8a49e91cdf04c5f587a37ccc0751abd4891af9c40434144fc3e70296a40578abe561e70c463e7fbdf5a0f067f404f4ab09392e93eca6281a
-EBUILD meson-python-0.9.0.ebuild 988 BLAKE2B 6e2465b93b4de894ced85af09ff9e227c0a466a99551f51ef5c8f8f72475c6c9fe28c4a707c2f3ce8a3a393de2ec3ac80d26d477bab9584a91b533dd13206953 SHA512 9b5affd60de454a84150808d87c13b85ceb778558f5dd4c1a6fe74d37868aaccca355e4d6a4991420bf6444a1afed476791012745a85a4fa2fe5f657c7670b58
-MISC metadata.xml 352 BLAKE2B 581fd656bf2da3af0cb7a9f50ef99effc9c2fc54c5012a363a3aaf4cb5cb1715c8626aed86ea176ebbbc22ece33e8b0f76d5c818b4533f99b3bac5b92f75fff1 SHA512 7e57debaea115565ade7e8ab87af065c4580506225df1a203c92fea877a9b918ebfce6fd172412bf318be07a8a4548be492318e5626b31688ed2714f00594d54
+EBUILD meson-python-0.10.0-r1.ebuild 1237 BLAKE2B 6116aea14747522436f078f1706cfab578da810f5e4befdce8b22a9467a062f6776a46ee527f879f3677a5394301628db92fad1e03603702052b4b872f24e96e SHA512 68e2c809b6e0c45d8c7e9609e53ebd996db10c0176fe397edf11a9ce179abc68a17ce6e996c5941d116d3165f1dbc115b9f9592c4f44b6005f4eae3529e0368c
+MISC metadata.xml 357 BLAKE2B c2b5fd8c6ad39e92970a5e6c1db8950b4850660c9a95a84063504ab75e5dd69e3ab844fcef23cb51f33493b7e522a6d26227ff48dd893c92c422badc70f3c962 SHA512 1402ace4da543de7320a1d97f44177593807d5be9f1891d8a53190581877569508c46fe6b4ce63516c7fee2d2165d59d39f44343dde18438570883da3f4ad28c
diff --git a/dev-python/meson-python/meson-python-0.10.0.ebuild b/dev-python/meson-python/meson-python-0.10.0-r1.ebuild
index f6bd5fa67ca2..a1cccea2c3f4 100644
--- a/dev-python/meson-python/meson-python-0.10.0.ebuild
+++ b/dev-python/meson-python/meson-python-0.10.0-r1.ebuild
@@ -11,10 +11,10 @@ inherit distutils-r1
 DESCRIPTION="Meson PEP 517 Python build backend"
 HOMEPAGE="
 	https://pypi.org/project/meson-python/
-	https://github.com/FFY00/meson-python/
+	https://github.com/mesonbuild/meson-python/
 "
 SRC_URI="
-	https://github.com/FFY00/meson-python/archive/${PV}.tar.gz
+	https://github.com/mesonbuild/meson-python/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
@@ -44,3 +44,10 @@ distutils_enable_sphinx docs \
 	dev-python/furo \
 	dev-python/sphinx-autodoc-typehints
 distutils_enable_tests pytest
+
+src_prepare() {
+	# strip dependency on ninja -- we provide ninja via Gentoo package
+	# rather than the Python wheel, so we don't have .dist-info there
+	sed -i -e '/ninja/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/meson-python/meson-python-0.9.0.ebuild b/dev-python/meson-python/meson-python-0.9.0.ebuild
deleted file mode 100644
index 5ca1c9027a37..000000000000
--- a/dev-python/meson-python/meson-python-0.9.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Meson PEP 517 Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/meson-python/
-	https://github.com/FFY00/meson-python/
-"
-SRC_URI="
-	https://github.com/FFY00/meson-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-
-RDEPEND="
-	>=dev-python/pyproject-metadata-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-	>=dev-util/meson-0.63.0[${PYTHON_USEDEP}]
-	dev-util/patchelf
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/GitPython[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.0-defaults.patch
-)
-
-distutils_enable_sphinx docs \
-	dev-python/furo \
-	dev-python/sphinx-autodoc-typehints
-distutils_enable_tests pytest
diff --git a/dev-python/meson-python/metadata.xml b/dev-python/meson-python/metadata.xml
index e2b414a5e2c6..6d2819790d18 100644
--- a/dev-python/meson-python/metadata.xml
+++ b/dev-python/meson-python/metadata.xml
@@ -5,7 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">FFY00/meson-python</remote-id>
+		<remote-id type="github">mesonbuild/meson-python</remote-id>
 		<remote-id type="pypi">meson-python</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-box/Manifest b/dev-python/python-box/Manifest
index 36139bc0a3dd..5547c4cd6414 100644
--- a/dev-python/python-box/Manifest
+++ b/dev-python/python-box/Manifest
@@ -1,3 +1,5 @@
+DIST Box-6.1.0.gh.tar.gz 83124 BLAKE2B bf201a120b41c2cc6577c49253eac2737770df4fcc070960953f92b55901b59633461a4a77d0cb3dbc27b7c2c99e6d2b891c3df4b722ca37c3ea0e4a4882aa3f SHA512 54edebdf3b5954cd75519dd50b45f468470df1cbd8ef0de941b49777153064af9a678712365889401cc6562b339ebbfc4a8592dbaa7a749b167ed69ffbc41e4d
 DIST python-box-6.0.2.gh.tar.gz 82454 BLAKE2B 2e29ae1fe62e588a4534b66dc4de53478b2a7a236c9ea43b8e3a3fa0985f75042b64d260ac0415a645fb3067bbb427fdb7d840b63260620d4754261a49237896 SHA512 9305f1e4b5694ac1bf3230a8f089ec7dce324272b6d11abc08aeaabf3e2c74f763170b23201139ea3368bc2682a893660376f2a9be0cdd4fc16827f04e7b6240
 EBUILD python-box-6.0.2-r1.ebuild 633 BLAKE2B 042cb9d5366c57ceaae1ebb2ba7109b2707ba3f9785586494af492b3d6397751f6ff18b668ed2944f228eb49d17a05dd1156316fa389fa9c533103f02028b463 SHA512 0754c642c85cd6527177f31ea616462e7b5c100d27737f2eb99efc9e583b8a63eff21900d88d7db06e8cd24551c690526850032aa53828202d5e6db0e43e0d9f
+EBUILD python-box-6.1.0.ebuild 767 BLAKE2B eaf666b4c9ecc16e6d6546102dc2b9855e34d3acface9e4565364105429ee9e269baf2b35e11e9d5edf164f0287ffc280ea47ba860713b1d361d4bb7c08cbd92 SHA512 da84e6ab2aba9430a285c0fc8539c6541c3f0ca9990d4c80ec45ac6519a903ef0a59c8fe71ebfe06c141232de550aa493f842797ea6096164547692b9a9532af
 MISC metadata.xml 526 BLAKE2B 9b7e9da39268190a4e2d34a6cbc4a9011e63ff916ddcc87fa0d799c3a48a71e67da0677ff41e3e2fa90e0167d91e4091f8a7d00bdcf804ea88321e9ea5a21d00 SHA512 4aaa21b74825ac744cc440cfcaabf68300f1f6035c64020ac6e4b967daf816a3dd36a770b6eddb925e32e8061227aecf6be61356873b2b4720025119e351e57d
diff --git a/dev-python/python-box/python-box-6.1.0.ebuild b/dev-python/python-box/python-box-6.1.0.ebuild
new file mode 100644
index 000000000000..b1f05d8d66c8
--- /dev/null
+++ b/dev-python/python-box/python-box-6.1.0.ebuild
@@ -0,0 +1,36 @@
+# 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..11} )
+
+inherit distutils-r1
+
+MY_P=Box-${PV}
+DESCRIPTION="Python dictionaries with advanced dot notation access"
+HOMEPAGE="
+	https://github.com/cdgriffith/Box/
+	https://pypi.org/project/python-box/
+"
+SRC_URI="
+	https://github.com/cdgriffith/Box/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest