gentoo resync : 14.05.2020

3 files changed, 38 insertions, 11 deletions

diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index 06947218dd50..bb5a8315efa9 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -1,8 +1,9 @@
+AUX lz4-3.0.2-test-fail-skip.patch 680 BLAKE2B bd222f948084901cabb7e09e525707d0bf5182de216e8705a362fd7b9abdf376e3ea1daf3457fee96bb377e93b16a33bd163b9aee93011824147efc81c7f8b9a SHA512 77651611e228b103bf68f643c67ee7505b293e17d3b29f47e4a385dea334c441e77a7494cf1f72dc8a4713e89ad37ffac465fc36fa2ee0c044f1f47c355ffe07
 AUX test.py 269 BLAKE2B d0b9ff664ca4a954cb8ebf227a1b1c80f1eff8a9bacaf1cebf2f359a6a14dfa3d2f418820d3917a9107c66f4a8aaaa380cf749a9faf2cafb5265364a1955830d SHA512 7968adb54b414a8dc1ba9b3b8ba4f11695564239786cd37474122ce83f8976920206fec2b846eefcacdd307da6c9f6ac73ead87c78dfefab746540021f44964c
-DIST lz4-0.10.1.tar.gz 92068 BLAKE2B e581540036d1008c5efa008a1b980c1bd612bab94635b7a506e230921bd17c534fb99272e3ea09bc5be4faf09e0a8f701224c433df1615b4e708d620a23e1149 SHA512 538880742257e08b027c45c33aa29e12d7303826f63817d1f6d316ea9b69dfb20710a4f573499ce141cffd12fbac701305405521cb815e2329333934e7e1f2c9
 DIST lz4-0.8.2.tar.gz 30818 BLAKE2B ec51d733ebd33fcb00d3d3b634d11be39d92b14741a595139e23b5b067955a43ca325a0a655233a5ae3a62e18a1cf70cc21787d443703fc1a56ab7a765d5e2f4 SHA512 e516d5c3309f214fa422b040a0aacdda079395624dd4f5548ed7af637b1594012aac75b309cef260b41c10a623410f815fc089b54ca5d80955d5f2ead12841b1
 DIST lz4-2.1.6.tar.gz 129066 BLAKE2B 1a739c54946150441ddd4025b4ce8bf79a718d64a714ca5cfeaf8712c73fa88c47e1823a08ec7ad50acd31cba5bc10292f4c9e0905d8b5965b789944dd6eca9f SHA512 e37f9576f182adab263d8248e846c9f7d8a0260b2d2c5f94d74ebf3c2e51d91ba07d4bb0bf8a7560981a930fd380a2a3f5c4d21f4de5be3ae066d44a2246e9b5
-EBUILD lz4-0.10.1.ebuild 594 BLAKE2B d29d83e088b7abc4a639b3ccb4ec973941ec40832596704af6e2ffbee08f98351af70b54ef7375e5af3ec5a763d4fb8392ec1aebaee941b86f7d5ae804a8f32f SHA512 590efe82e6077286ba56aff018d4ab4dce0a28cdbdf3845f29b965ecfee5ce9b5e38025c19a0285a256c2fc60bfaf4f2ea888ce6e260d728c0e57613d9e55793
+DIST lz4-3.0.2.tar.gz 152443 BLAKE2B 3bf452b5b5ee65caed13b21fd7c39f32ccdea18e6d900facf74e3271868299a2da258b2b0058efaea12a3b42006f0ad0d17004692c95be951c173fee1a1162be SHA512 c31116ee3cd70241b19bff6c59d1852d4c26ad5f0c9a56cd2ecec58e8c2751773162c7ac6a2d887e8cf537bc869ed8866929164f976849efa3ea041eacc4535a
 EBUILD lz4-0.8.2.ebuild 819 BLAKE2B 468e9437f0b7a337e990e5fccc1087ba475767c82f7000940e8b01ce46a4644fd620c392e48cb358ad5bddf03c38933cf88f9c2337b8a9e548be561da4a119a3 SHA512 d7680bebe19102c0933f9723bc5a906aba6f8dcfdf98d313422804d9ef4bdd3840d765dad8f0edd1ffe4ed23f590920a9cec1045c85ab967e4e4ec5828c88ef4
 EBUILD lz4-2.1.6.ebuild 555 BLAKE2B 54679ccbd1c32044f5e2cda84f8d637d6c67106e873821120c77100f969123d706888de95ca90f3a7df2a4e8e3bf5c6651cf7b4ae8d149fddff1f64835e2dd17 SHA512 4f2286c51a425cdc5df1f5e11dd842d0984c6ed83dc3f679ce44fbd496ea9fe4e46ba43023d867ad0753365a0ddcb26fe241312cad9ddc2e8b5b9e0bbfacbd96
+EBUILD lz4-3.0.2.ebuild 770 BLAKE2B 3e67f9f3c77e2c6db67ce630c9f16703dd2102f0f52af6bd432381d6fa5c23cae9d3360268e1b2a4eb967722b69b708c07686fa2316ff8eabdcadd579b6ce202 SHA512 db662b6f827e7d3570c34fb5c232eab6a3e10c32c62d3f04b924942d3a76450e1fbccab143cf58b38d28eacdafd093b8370da9f9d89bb2bc6d68b5b9a5c27249
 MISC metadata.xml 465 BLAKE2B 3eeb9b063e836d19b4ebfed81a89895f9d4e650b1788ca602f77f4cf3b5ad94cd6af93788293b9656baac1bce29a90a957c8d4afd02ee25b2aae42aefe211a37 SHA512 e5f75916075710426f9a7b875aaeb1239b948f11ac97a8d8bc45032d99985d6659916cd3c126bd37fb0fa53c97cca5b4eeeb4228180633809edc01af3b89ad91
diff --git a/dev-python/lz4/files/lz4-3.0.2-test-fail-skip.patch b/dev-python/lz4/files/lz4-3.0.2-test-fail-skip.patch
new file mode 100644
index 000000000000..40e6be63ff01
--- /dev/null
+++ b/dev-python/lz4/files/lz4-3.0.2-test-fail-skip.patch
@@ -0,0 +1,19 @@
+--- a/tests/stream/test_stream_1.py	2020-04-29 13:00:05.213776356 -0700
++++ b/tests/stream/test_stream_1.py	2020-04-29 13:16:33.958779776 -0700
+@@ -172,6 +172,8 @@
+ 
+ 
+ def test_invalid_config_d_4(store_comp_size):
++    
++    pytest.skip('Known test failure, bug: https://github.com/python-lz4/python-lz4/issues/199')
+     d_kwargs = {}
+     d_kwargs['strategy'] = "double_buffer"
+     d_kwargs['buffer_size'] = 1 << (8 * store_comp_size['store_comp_size'])
+@@ -231,6 +233,8 @@
+ 
+ 
+ def test_invalid_config_d_5():
++    
++    pytest.skip('Known test failure, bug: https://github.com/python-lz4/python-lz4/issues/199')
+     d_kwargs = {}
+     d_kwargs['strategy'] = "double_buffer"
diff --git a/dev-python/lz4/lz4-0.10.1.ebuild b/dev-python/lz4/lz4-3.0.2.ebuild
index 53344e14b708..f46bebe41b22 100644
--- a/dev-python/lz4/lz4-0.10.1.ebuild
+++ b/dev-python/lz4/lz4-3.0.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -14,12 +14,19 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="app-arch/lz4"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
 
-python_test() {
-	nosetests || die
-}
+# known test failure: https://github.com/python-lz4/python-lz4/issues/199
+PATCHES=( "${FILESDIR}/lz4-3.0.2-test-fail-skip.patch"
+)
+
+distutils_enable_tests pytest