gentoo auto-resync : 06:11:2022 - 09:19:37

3 files changed, 2 insertions, 40 deletions

diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index a6b959642976..e246ee51c928 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1,5 +1,4 @@
 DIST jsondiff-2.0.0-nose2pytest.diff 11525 BLAKE2B e1e9f6996448c5f8454a74dbe5782684d68cbb00eae1793fd010bccd80b682e6f3869082df9546603ce87bee82a99148a948db675b1da8f2815e5290eb632763 SHA512 791e4f8473459e374892067cf90099df23d981857b81cc164e2d0c35c51cbbede160de1b46474b6cb817b8811e2481172807eff31847a7847fc847948cf402f7
 DIST jsondiff-2.0.0.gh.tar.gz 15405 BLAKE2B d69e5a9316e8ce32c6fd3e62162b609a471ff57bacb77f47a192b85352e77135a37c964d0ade5df4b4e37fe7d996eab13649dd4c6a3bc3fc0479294f840c82f9 SHA512 ca266040294c064b499763174613628125a9d426f37eddb8f63806d5774ce8828d514ca30ea4b42f6e2529aa34344c601ece05b6c1b42dcedd71c7b62ed0afba
-EBUILD jsondiff-2.0.0-r1.ebuild 892 BLAKE2B 5f29e3b9ae618379c327678cfab3b74933ffa364884168d9d47c99a038240225a69d8e4a899a8a19e5a7347b3565bfe136c8714836548f78f71dc35ce71ff539 SHA512 a32091ae06d24364a083f9d697509a1e02ffd2704422f019dbba5a4e7adabba0bd87bc77a5b08e8716ebcee734a8e924564eb09fffff7946a125b3a07433241b
-EBUILD jsondiff-2.0.0.ebuild 797 BLAKE2B 8c42986621fd214308b98d2a1b7fe19880a6c2eedc03843cd15c256c3ae69a31d0476a20f1d62f597e825404f139cc2e8455c1700ad6d4aa6e913d2368579f71 SHA512 6d4c2837390fd10e334d0b1fb80720c5412a13d0447447b56d29e359604a277c4e85f0b7ca223640dbc8c3e6207b0fa4a2707d3a99412ab4ffdbe38bedbb9ad6
+EBUILD jsondiff-2.0.0-r1.ebuild 890 BLAKE2B 5f7e915feaa5d5f6f85c662581f7c61f44a203466a34238e5432189ed03cf950525e8b52f12a9a8c0e81ab749b6e107c1175c3c4e66a90cfcdf70ca3bacaaa06 SHA512 634a069328dbbd2f4d909f5fb751d4e81103ffe281ebb16a01559df35cda9249de123f57e126dd0ae7fbc3032cc3b06b24637970d518090dd26eaa4568ed0999
 MISC metadata.xml 561 BLAKE2B f11baa5f35a81e4fd69adde15b5a39d728e8137a112ef7c794e8d008d5de829ab5a333fcfdc2e1dd2156d91bb779db204a21c73eaad424e983c7865b33a81785 SHA512 238d5cedd70a0fd887f6007cbee0e11faf4b574b346fa91c66ee6d93e06571364fb80a0fbc13fe347f34e217e7589f5b61984c5ab0ead465d5e725d1792af4c5
diff --git a/dev-python/jsondiff/jsondiff-2.0.0-r1.ebuild b/dev-python/jsondiff/jsondiff-2.0.0-r1.ebuild
index 42734118dd78..4a667b7f7966 100644
--- a/dev-python/jsondiff/jsondiff-2.0.0-r1.ebuild
+++ b/dev-python/jsondiff/jsondiff-2.0.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	# https://github.com/xlwings/jsondiff/pull/51
diff --git a/dev-python/jsondiff/jsondiff-2.0.0.ebuild b/dev-python/jsondiff/jsondiff-2.0.0.ebuild
deleted file mode 100644
index 831c1a974609..000000000000
--- a/dev-python/jsondiff/jsondiff-2.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Diff JSON and JSON-like structures in Python"
-HOMEPAGE="
-	https://github.com/xlwings/jsondiff/
-	https://pypi.org/project/jsondiff/
-"
-SRC_URI="
-	https://github.com/xlwings/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/nose-random[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# Avoid file collision with jsonpatch's jsondiff cli.
-	sed -e "/'jsondiff=jsondiff.cli/ d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}