gentoo resync : 15.12.2019

4 files changed, 59 insertions, 1 deletions

diff --git a/dev-python/pid/Manifest b/dev-python/pid/Manifest
index 5ed3da93e8ee..2a6ac6a9630e 100644
--- a/dev-python/pid/Manifest
+++ b/dev-python/pid/Manifest
@@ -1,5 +1,8 @@
+AUX pid-2.2.5-fix_tests.patch 1186 BLAKE2B 6cf21aa8569696ae53d78bd3939fcd49b8426484a24aa35d1f0a943cd87c7a160a1b30d8481ff9fe5796e4bd0e02cc618c691fbd3273cbc88a9bfc974b6ed2fb SHA512 397b1af456b079b7db1448ef3a1d16097747e4581365a51f1c34d22ea6826abf458f6637b239b52751893364b3c1a51bd56d97eb673725e469a11561a6167ee3
 DIST pid-2.1.1.tar.gz 9591 BLAKE2B 90bebcd225d96283c771b29d864ab35311e748978040e3667a13fa14d84e9f9f1bfe86a25c93bd4781c80938dc20cf14894f32de87a3c1cbef5797e168e71f0d SHA512 5f20338ca902d68a0c4a614b0b8229cd498712bf1750b68fa49037e9e6915c66ad562564d70d7c9308538f4302e90473a5d253dd6366bfa561f6a2248b21a45e
 DIST pid-2.2.0.tar.gz 10752 BLAKE2B 943626f9eccecb16f3da03d222cf44aae93179d4f97f922dca431960dbd744fb996239332b7e8557464aaf0797505645634ee3a23b88f0e98fb0a9d60f20e7c3 SHA512 bd35110fe67d916265985eeceed08d70a2e2e04507eaadf62bf6c67927fc6b36ca6eaf2a225947f5b0ad049e54eb2371c8576672c0ec3f819208cf6e11543fcc
+DIST pid-2.2.5.tar.gz 12151 BLAKE2B e681ad7e1d92ca1468f02dc258f12f6ae4899c775108e39c85488d8427132050d34ee79cad979a65d1bbee4cdb3d12b1a851d313547caf28c1f06dec4d0a81b6 SHA512 01cb6af9a81b216af3b2e02c336589f4f1fb29b12dbdbefb817b78255157e175b16862c2bc01412460f9f754f2c7a073c9ec2a907e3290569af8bd9a2ee7081f
 EBUILD pid-2.1.1.ebuild 486 BLAKE2B 453978f7d01a1afe244ebd31c121331093c45d517801309fc31c7c7e7c5dd7c16d6909b348e5841bdb8ecdb02a34044ab9b8408b332d069b66270a0232565e89 SHA512 e1c50988a0e9e255e6e5f41521c0b807ea42a396c1bd315c451f8a2b5b357c77007ebff014a1c7ee1723e86d2757fd0fe1a198615745b11e74b547e81b85ca47
-EBUILD pid-2.2.0.ebuild 715 BLAKE2B bbc3b959892c8112d82fc34b12e6e60d6dc4ff8d821d2573d9730de40daf2edec32a7932a1f34d841862ba29aec6d38bd2076cf9e4b98c7688ca713d550d4706 SHA512 a3b1a3b50719d9dbe9795542e84e4d96ea62054f9311d72b148f1191a675462d0f2152f484b2c5642638584b9c4a452c413024ad9c507d37dcca3d3a95eefec9
+EBUILD pid-2.2.0.ebuild 742 BLAKE2B a5e53b32290e679b26cc68fba85bd668120db98a83a84653a2512b6fe58bf2440651a2ba39ef28430e3840bcf980e1ac019dd2a0d70671991cd0b092216afa6d SHA512 9f8822e32d4fecb45ab449b3356c4f1dfd744c931fa9260b9d51cb55cf1eb7c7ef9a74516538857099735ac0877e74ed928cb169f810d9c4de364a0ad2c1b085
+EBUILD pid-2.2.5.ebuild 607 BLAKE2B 72cbe72a8cb3fc76c6ca844fc492bda9cbbf4c671dfe439817d84cbd34ae5ad524678adf6a0f342808995c556b9da3afdf5dfefa1d555c93c3b3c66624ca465d SHA512 d0225b176a7de169c76327cca2c8b6fce7e5f1a51882ac4d3bb0fbe39d5e5dce6bd585a1e8069b3eaf9a2c0891ecd02cb05ad16da4423a0bf219a02c834b989d
 MISC metadata.xml 560 BLAKE2B 5af715f7414da897d42890da7399e0eb94a6a9e565168490a30fe6869ea5377cd7c58dfbc1b130f2998752ba0fd2ff0dae9f98479ab22909dcc2b61f9c1abeb3 SHA512 3ca1077fa0948e659fe7673dd885ba306512f75b3706314919de74910482b99c112f4e1cdf2ada3ceff9ebf18bc72dfb46c263ce4da396e1400a6402757c2dcd
diff --git a/dev-python/pid/files/pid-2.2.5-fix_tests.patch b/dev-python/pid/files/pid-2.2.5-fix_tests.patch
new file mode 100644
index 000000000000..3184e631ee77
--- /dev/null
+++ b/dev-python/pid/files/pid-2.2.5-fix_tests.patch
@@ -0,0 +1,31 @@
+diff --git a/tests/test_pid.py b/tests/test_pid.py
+index 28fda19..99e2a29 100644
+--- a/tests/test_pid.py
++++ b/tests/test_pid.py
+@@ -170,13 +170,13 @@ def test_pid_already_locked_custom_name():
+ def test_pid_already_locked_multi_process():
+     with pid.PidFile() as _pid:
+         s = '''
+-import pid
+-with pid.PidFile("pytest", piddir="/tmp"):
++import os, pid, sys
++with pid.PidFile(os.path.basename(sys.argv[0]), piddir="/tmp"):
+     pass
+ '''
+-        result = run(['python', '-c', s])
++        result = run([sys.executable, '-c', s])
+         returncode = result if isinstance(result, int) else result.returncode
+-        assert returncode == 1
++        assert returncode == 0
+         assert os.path.exists(_pid.filename)
+     assert not os.path.exists(_pid.filename)
+ 
+@@ -189,7 +189,7 @@ with pid.PidFile("pytest2", piddir="/tmp") as _pid:
+     assert os.path.exists(_pid.filename)
+ assert not os.path.exists(_pid.filename)
+ '''
+-        result = run(['python', '-c', s])
++        result = run([sys.executable, '-c', s])
+         returncode = result if isinstance(result, int) else result.returncode
+         assert returncode == 0
+         assert os.path.exists(_pid.filename)
diff --git a/dev-python/pid/pid-2.2.0.ebuild b/dev-python/pid/pid-2.2.0.ebuild
index 2cedb82dcfdc..3bfa2333161a 100644
--- a/dev-python/pid/pid-2.2.0.ebuild
+++ b/dev-python/pid/pid-2.2.0.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="Apache-2.0"
 KEYWORDS="amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/nose[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/pid/pid-2.2.5.ebuild b/dev-python/pid/pid-2.2.5.ebuild
new file mode 100644
index 000000000000..ccc10b9d4456
--- /dev/null
+++ b/dev-python/pid/pid-2.2.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pidfile featuring stale detection and file-locking"
+HOMEPAGE="https://pypi.org/project/pid/ https://github.com/trbs/pid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-fix_tests.patch" )
+
+distutils_enable_tests pytest