gentoo Easter resync : 12.04.2020

5 files changed, 30 insertions, 89 deletions

diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index a3830510973b..cc1494cc29e0 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,9 +1,5 @@
-DIST jsonpatch-1.13.tar.gz 15119 BLAKE2B 70ddb570451ac1f3d218de0f79f0a639eb922ce72084cf3bc7e89a3efedb85c6238293bf59608a51f07c33358dc0488550f982f122e89e2414ddfce26fe08c1f SHA512 23f0c92c2c8834d5e3129e9ba78ece7da2646dd60d5b0522b0f09d83e20057ef7517042e5ee8547804185d3ce23cff394c8fe78df93fad7999fae12cc5467a45
-DIST jsonpatch-1.15.tar.gz 15544 BLAKE2B 1b9facd2a88a997356aeace8ddec9011f4f3c4df812fb157cd22f1210ac2e2502e8b9e18e02ea477c869758cdfc1dd0b6b4c8d76ce59ffdd68d4db14c550b572 SHA512 c5df880764b14a2fb60bb46e319bf006644ce1472d0413cf08ad151cf386e5be9fec197fd9efe0bfc3aa22dadf4078344c11211c1e8a3d5cc3ddcb998795dc91
-DIST jsonpatch-1.21.tar.gz 15208 BLAKE2B 88af93bfd7c317319d958bc3386f9551279af2fa9631c24c49231eb67398fd80f298e26957f232c9705219d4fa7033bb62f98b5d5391f6eb9f53113a1d351876 SHA512 dc902b750241833a68612430f07007080ed56dce8a7a4bdd1c042f944cd6cfdc03f4b422cc6bed6bc3b21ea390c5a281cd08181e27d6b57fc5fb657787c1d740
 DIST jsonpatch-1.23.tar.gz 18162 BLAKE2B 86322a4de88d37eb674d28425d3aee4ad3b589c724b124f37f16e8303200c742404512b9c675f5b5eb8d8f7916469ebb7915bf289c8190092bcf48a1cb9ca7a0 SHA512 da612fc043e351087fbda26cd5686743107dafca1223e784626c39113dfb4770647db1420e9ab9eee93d12c608a6e0812f0825229ab092962cfb390b6b1795ed
-EBUILD jsonpatch-1.13.ebuild 777 BLAKE2B 86cf49b52feb30babdf942c5b3b01c11d9f9056fbaba6d1effe30fe967beddccf124e67cd271465a7b6eef43fc8aa2bdb318f3a82d4a4d798396772aca507273 SHA512 9d73f5ef2398d852e0c58b6aae2d9e193b429cd1263a16316d73518371e26ceed0b21d372b9f4d87eb2850b35c8a3bf9aec9e36967cb1f5d49d305c991cf87ec
-EBUILD jsonpatch-1.15.ebuild 785 BLAKE2B 33f20edae2640e71f863f66d14344d1b90e23c9d06e3d0e41b41439ec50c76e26fa504f269ac7031e28a8a429979a2ea786d7c94786803bf0ea9ef3115dd0c6f SHA512 7ab4d34cfe7ac230de8b0b42bce542ba44484f076a0ac4beffbfe7d94fe8f449167de5782fd43e21342a79e8360dbbce41eb4090722ee03b0980bd6f41d797b8
-EBUILD jsonpatch-1.21.ebuild 774 BLAKE2B 8cbfee34ff4c75b6f19e8f846fe9f1e30d2b1f5908f4411851a9b94c8e5b2927cd311242048a56f0f28be78f3cf6ce0149183a499d6104de83fc732539b2f0e7 SHA512 385014b9a2daa57b69c99c47b5fcfa8d48188bbd91bcbc4fd76ce9b67efe7f12defa1237c9ed6e2f730219f9ed574b8d4f1d04aecf6fd86351922d13f5c0be6f
+DIST jsonpatch-1.25.tar.gz 24340 BLAKE2B 0022b4b0b3a0487958b86f14c1738a32593b8056510e3836e15385874b64f5d243d757c99a146a48da6563f0d9330eb38cb91ad6cde3e0a1b4cb8cbd3b15f9dd SHA512 5e1d5b6dcb6ee847ddd561400fe2d00e07aa1827a63ab98a38cd5e91fa0e52d8635eba1192edbccf9c7b9ce9c7ce0a414d580665c427c87a820e533d26092ad6
 EBUILD jsonpatch-1.23.ebuild 778 BLAKE2B f756f62785db7c6c87a97a963779937d644c3318050c51e130f3b5e83f067b0c7ac80302bd5686b160e1900f1e9083754097b1ceac04eefc42c3a75e314e0a9a SHA512 8b38ed2e312198f1e6656853e1b5bfed39dfe3a83e9488a417714fb9a75400aabf5a9bbd2c9dace59dbf776689a84433232825da73bd0d4fec7cfba74bce1d71
+EBUILD jsonpatch-1.25.ebuild 841 BLAKE2B dbe33a2ff09eb08988fd9f59d09a52be52dbeb0c40f732e7363c916639eedc35ed40df6d8dd954493f7ceeed62e20bb29f962eba943d1583aabf2d3f7300b851 SHA512 6da899418df0cd942cd9b03407a314ee9ab5182713e18234495fd08cabffd3c00e237e360747c1d7eefa19aff01ef2357d1eab03db7e8667fa20f9a13d2f9c16
 MISC metadata.xml 679 BLAKE2B ecac7a9a6da1482f0585c29ab1e7f1ea3729dc4c2b4640440b0a1a5eddbbbdc7d2c029c4318ab3645a4025b5e21d11015ec76b21f5b069d49a37bd74dcad6e1f SHA512 37946af836c2d8b521618688ffee4b33c1864751081c1f1cd86442e6eb6cf822cfd9dbc228f834fbd31ca63b1dd24927cdb680076e2bd7ead941558ac1d2e436
diff --git a/dev-python/jsonpatch/jsonpatch-1.13.ebuild b/dev-python/jsonpatch/jsonpatch-1.13.ebuild
deleted file mode 100644
index f4ec5d6600d7..000000000000
--- a/dev-python/jsonpatch/jsonpatch-1.13.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-RESTRICT="test"
-
-inherit distutils-r1
-
-DESCRIPTION="Apply JSON-Patches according to
-	http://tools.ietf.org/html/draft-pbryan-json-patch-04"
-HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	"${PYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
-	"${PYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpatch/jsonpatch-1.15.ebuild b/dev-python/jsonpatch/jsonpatch-1.15.ebuild
deleted file mode 100644
index 1f1c237810f9..000000000000
--- a/dev-python/jsonpatch/jsonpatch-1.15.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-RESTRICT="test"
-
-inherit distutils-r1
-
-DESCRIPTION="Apply JSON-Patches according to
-	http://tools.ietf.org/html/draft-pbryan-json-patch-04"
-HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	"${PYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
-	"${PYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpatch/jsonpatch-1.21.ebuild b/dev-python/jsonpatch/jsonpatch-1.21.ebuild
deleted file mode 100644
index a3c42315c2d4..000000000000
--- a/dev-python/jsonpatch/jsonpatch-1.21.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-RESTRICT="test"
-
-inherit distutils-r1
-
-DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
-HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_test() {
-	"${PYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
-	"${PYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpatch/jsonpatch-1.25.ebuild b/dev-python/jsonpatch/jsonpatch-1.25.ebuild
new file mode 100644
index 000000000000..77592f3ef041
--- /dev/null
+++ b/dev-python/jsonpatch/jsonpatch-1.25.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
+HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
+SRC_URI="https://github.com/stefankoegl/python-json-patch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/python-json-patch-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${RDEPEND} )
+"
+RESTRICT="!test? ( test )"
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
+	"${EPYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
+}