gentoo resync : 06.04.2022

3 files changed, 2 insertions, 53 deletions

diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index cb9a530775cd..2c2bcb90cbc3 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,4 +1,3 @@
 DIST plumbum-1.7.2.tar.gz 323051 BLAKE2B a16d9210606ac67abd425fcff109d40836dc969729cc5bf78a5d224c0beabf09d56d35f17809994d758153c6e18e4af91403f7ae0111912447367be68f6592c1 SHA512 77e75988255ca78fa5c253c6d076d63f8f9250a2b153ef23e40f35315e255ea09403d854a19bb265fd658bb9e5f0f705dc7530ecacc40b4b48e33acdf50dddf9
-EBUILD plumbum-1.7.2-r1.ebuild 1351 BLAKE2B ed382fa4f048cf9b39acc62988c6861ca4aafea393d338d77e5901884e3dde18ab424715c0756a04729e62427276e5ed39b7a2302c4dff0545ff78a2c2e7caf2 SHA512 63b9e3d7ebd4bd6ed44e4354e5222169619c31efb8c8b10f28b56bf85be5fff24ae615884095bb54ccc81b747cefbea9847e9c523939e8dec66056ce78fb0c4b
-EBUILD plumbum-1.7.2.ebuild 1315 BLAKE2B 11233b942f7b26e8393ece3e0b0cea492afecd622e645527689eb3a01932e8e108c0f0101a669434643b82bee993221921e811f4fafa960004cf308fedb94ace SHA512 98dd03672a5d8ca42ff237dbb86061bd2d5720e0615c3927abc90290019ae9d4241a684f7ea8c81c080aa611f7ee288a81bf2c51010136ce95116a7576280f8d
+EBUILD plumbum-1.7.2-r1.ebuild 1349 BLAKE2B 0bd3562a8e693869d886507384e3797cf3c8b4032c6ec2b403b2f1b466569f52d82d65caab4bda619538d9a5752024b44692a3ac995ea93a1af7ed431f96ef93 SHA512 29bee99a54ed7441b6e107ba63fceb7114db50110e68f370cd27f7a4baddbd173634ee702a626b7f9663ea6471c038e36609ea58a2e68292eed218cf3d688f7f
 MISC metadata.xml 754 BLAKE2B b6d00fe0747da15445953a29abdd6f14112d02f2162746992f2fca80a321cd10f3cad40294e4bdbcf3f04d432b4d81902667296a0a5b8f99da2df2a5c58b18c1 SHA512 fbadbb7e5edd1573994cfc843e4a254ae5d12be5a3372f4fb061647983e360c2b0ea4a9e41ea8c9ff26028db75ad9cd5de881b8fdd9bf35864442e215aa42175
diff --git a/dev-python/plumbum/plumbum-1.7.2-r1.ebuild b/dev-python/plumbum/plumbum-1.7.2-r1.ebuild
index 6a5214728397..1e6e36a83392 100644
--- a/dev-python/plumbum/plumbum-1.7.2-r1.ebuild
+++ b/dev-python/plumbum/plumbum-1.7.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/plumbum/plumbum-1.7.2.ebuild b/dev-python/plumbum/plumbum-1.7.2.ebuild
deleted file mode 100644
index 1c7d193c0d43..000000000000
--- a/dev-python/plumbum/plumbum-1.7.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A library for shell script-like programs in python"
-HOMEPAGE="https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Need sshd running
-	tests/test_remote.py
-	tests/test_utils.py
-	# Windows specific
-	tests/test_putty.py
-	# Needs sudo without password
-	tests/test_sudo.py
-	# Wrong assumptions about env handling
-	tests/test_env.py::TestEnv::test_change_env
-	tests/test_env.py::TestEnv::test_dictlike
-	tests/test_local.py::TestLocalPath::test_iterdir
-)
-
-src_prepare() {
-	sed -e '/addopts/d' -i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "remote commands via ssh" dev-python/paramiko
-	optfeature "progress bars in jupyter" dev-python/ipywidgets
-	optfeature "colored output in jupyter" dev-python/ipython
-	optfeature "images on the command line" dev-python/pillow
-}