gentoo resync : 12.03.2021

3 files changed, 32 insertions, 5 deletions

diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index 0f4aaf3ed9a4..c588a55df091 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,3 +1,5 @@
-DIST deepmerge-0.1.1.tar.gz 5432 BLAKE2B 18f54fa4f0504c1825300373665c99ef1f0ea8f779b00f89cfe8ad44861cb4991cf5694c08788ac1ad3b52686734967dbb954553ba84741a71a70e24c98e6b18 SHA512 209ff3ca6be02d788f9740b6241e2ae0366592051933438e887cac5f89f86201bb870336e94d1bacff709dd63c7644161b33ed1da29da1b823b37987813862c0
-EBUILD deepmerge-0.1.1.ebuild 564 BLAKE2B 40ea001d2f6d4e207b3b9c320f90c70b1833a6e43adc392f5358f25a18ebcfbe5ff68c0db81d696a2913899a5e5b3e5bdc090036d903196c8cb558a007e14947 SHA512 4e56bf0942a784e0fff00bea3e05a6d4af1033bbe504a63588450fc36263c5eec4b496ab29658fa3ff1ed32d8f8e854226c08b274302f6d76fdffa16b18b1af0
+DIST deepmerge-0.1.1_p1.tar.gz 14317 BLAKE2B 0e327b129a63f1f3fd5a18ae5c895452a823401f54b614c6c085f82e9332b86800e9ccc42fbd2d6c9904e6ae0bc999b393e9af542c310a76c8975567b9b2346f SHA512 72a40609a31dbb692908365f32a94527280e7d1bceed27f27a9a17d6f30551054235de608cef5e88f285bf33b9c155c0aa4aebf74f1c9f8049f0751073593083
+DIST deepmerge-0.2.1.gh.tar.gz 14427 BLAKE2B 0039debcecdbfaf8c4b6f721f6a000dcaf5da41a5601ed2091e00ce496fa14b1c19580a443da0de75c67656e829cb7fc04b13a6604a671ed491ba4e41bb9e08e SHA512 e4e1b87121473be062b77fea4e3cdee85fe4cb3f98a15eabf3a9fbb2f9e209f3caa0fd0a4c1fc20e42aa89d7c1c8d0ecdffde9f99791f3a9f47b6dcfa78f48b0
+EBUILD deepmerge-0.1.1_p1.ebuild 648 BLAKE2B 7374129d8d70d3b6a2dcd8c5186064f48bbbc3acb467c4887569f96e0da9739e52d1a42e33f6b050283864aa20843c23cd95df1806cea66c5d72dafe1ab11b00 SHA512 e96f906f27cfdd5b57511e37984ec2da0b1261f5178fa47d9cb12beb41b1a83e7fbb51845e0229ca7628fde25bd3fe95a9b08d1a10fc94c6ccd7494d7a77c14d
+EBUILD deepmerge-0.2.1.ebuild 567 BLAKE2B bf6ae8a88dfe43621d2b5d5e75771beb5a71557999fda00d335d186f63294f6efe3956586fdeb573666abc884de4fde9a303bca24cb04e015adbda2152bf6c75 SHA512 fa5fe4bfc5ea7a9abd0805858d4eec80941646916ef41f026706284f7025691b948e2922f4b26b62c3150879603d90df186424c9d3d146f4ff338e5a5db9449a
 MISC metadata.xml 263 BLAKE2B 4e090c272c8539944f061cbfe1b05e3b933029de278ac9d555167db0ba98d05f67b430f48dc740d83a3778d32d5d1f5380856736965e9ee602707f60acdc5dc1 SHA512 d820cb3ccd236931ac0f862314a471ba93e5f3e0cfef0f04e73d0229aaaf164b10513980dc760fce7ee333acf6bf6d15d947bf138bf5e279f38ab9ae225ec3c6
diff --git a/dev-python/deepmerge/deepmerge-0.1.1.ebuild b/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild
index 721eb6b566e2..05d1db1f2708 100644
--- a/dev-python/deepmerge/deepmerge-0.1.1.ebuild
+++ b/dev-python/deepmerge/deepmerge-0.1.1_p1.ebuild
@@ -6,16 +6,17 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
+MY_COMMIT="587279c6771abb13ed831ebc2cba3c9e4d81e7e5"
 DESCRIPTION="Tools to handle merging of nested data structures in python"
 HOMEPAGE="https://deepmerge.readthedocs.io/en/latest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/toumorokoshi/deepmerge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# pypi doesn't ship tests, and last github release is 0.0.5
-RESTRICT="test"
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	sed -i -e '/vcver/d' setup.py || die
diff --git a/dev-python/deepmerge/deepmerge-0.2.1.ebuild b/dev-python/deepmerge/deepmerge-0.2.1.ebuild
new file mode 100644
index 000000000000..3bd2c651aa47
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-0.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Tools to handle merging of nested data structures in python"
+HOMEPAGE="https://deepmerge.readthedocs.io/en/latest"
+SRC_URI="
+	https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}