gentoo auto-resync : 25:10:2022 - 15:53:58

3 files changed, 2 insertions, 42 deletions

diff --git a/dev-python/spur/Manifest b/dev-python/spur/Manifest
index 668de22fa54a..b25637a7334f 100644
--- a/dev-python/spur/Manifest
+++ b/dev-python/spur/Manifest
@@ -1,5 +1,4 @@
 DIST spur-0.3.22-nose2pytest.diff 31953 BLAKE2B 6ff1ab74215df036101720ca7b1ed5c7f0f9e6dc000a55175da85024d771354cad33d967c7d5ce63bf47dc2009d82147d3da8091a8b605176040f1cef274429e SHA512 ed8617021fe3ea43d8e53dc601b3778026f20e472e7bea2ee9a7565ccc4568a29cb669d7892cb0e16afeb64cb04d0f3973b85a151b20e94ef7b7df4210b17f9d
 DIST spur.py-0.3.22.gh.tar.gz 17760 BLAKE2B 676484e73fa38ebcd3bcc2ace21853590b652d0ec2dc31f7635a55a8bbb213e559fbdd7b70e545091e7e28e6000862ef45eba748e13c546b765756b41c352028 SHA512 36518a080d3fff97fdab5af8e7e3045c58ad6b1acad9fb79e11da688d484565ee4d50868f3c3ee10299e135f2c01bd35348256df7bb1b4f6200aa175cafc7f0a
-EBUILD spur-0.3.22-r1.ebuild 902 BLAKE2B 07a6a0597a759296dfbeb9b36977154541b447b9735e989e0cea7f3a6413dd27e31e6ad8d95f9e246bd2263ddd4439f9be77b9e4ebce8b23858ad8b7359394c5 SHA512 2037f58c6f88da3e88d6f060c16d0acbb3976c614bbf086b5ec81e06aa8d54c31d9e59f1e1979fcfec35c9e08d37f8365d5c07506b323e6e3b8efcd8f427673d
-EBUILD spur-0.3.22.ebuild 1195 BLAKE2B 3b9c00dbf50ecac6ac5c4ebac350b4897bf9bbbe2c55f1b20675fc156cbf68f66b852a71a2a015c2168fbe8ea33d638095fb31e75a81e6fa5dc0b4756ce5b660 SHA512 77ee31dee19770962a3296d398925963ac35ce5b5c6a894c0b14ea1fcbd8e6c72802f4fc823ff5b0c602f2dfecbde874f11b51ad5a5d1ba85747efe58fcb76e4
+EBUILD spur-0.3.22-r1.ebuild 900 BLAKE2B ecd498de40f2da5dffc416abd519efaaac37d5d8609742c7165ad1c6075f323fe9188a6880efea8967aeff5f50d70af189f43a8120197377418e8fe43ddddec5 SHA512 b3c00891b945e9e61f810a619e29090df66d97439abcb0e8ab1a832ddc98f9e867e32a825b6f4f23b6b5a9f21bb10ef89f747be5a3e5286462ff33d7d1858cbd
 MISC metadata.xml 310 BLAKE2B 79198594601ed73656452cab90b2989e68ce1bb1ee3f93fa0b68a99e5952122244426f6dd8e5bed3d85adcdc6540ebec2d2b7e98c36c1f88762a876af18c7a90 SHA512 11b496bc054b786a938911ef5c5813168872af2646fa187bd8fbb45555f30d192207befa6e633033e94d841d1e7ef291b25243d13860b4bf0a66d8cc76565419
diff --git a/dev-python/spur/spur-0.3.22-r1.ebuild b/dev-python/spur/spur-0.3.22-r1.ebuild
index 3ae202674b5d..0ab6ca76649e 100644
--- a/dev-python/spur/spur-0.3.22-r1.ebuild
+++ b/dev-python/spur/spur-0.3.22-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
diff --git a/dev-python/spur/spur-0.3.22.ebuild b/dev-python/spur/spur-0.3.22.ebuild
deleted file mode 100644
index 0b5e31be2505..000000000000
--- a/dev-python/spur/spur-0.3.22.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=spur.py-${PV}
-DESCRIPTION="Run commands locally or over SSH using the same interface"
-HOMEPAGE="https://github.com/mwilliamson/spur.py"
-SRC_URI="
-	https://github.com/mwilliamson/spur.py/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# TODO: set up a local SSH server?
-	rm tests/{ssh_tests,testing}.py || die
-
-	# does random guesswork on top of exceptions that stopped working
-	# in py3.8;  this only causes a different exception to be raised
-	# https://github.com/mwilliamson/spur.py/issues/85
-	sed -e 's:spawning_command_that_uses_path_env_variable_asks_if_command_is_installed:_&:' \
-		-e 's:spawning_non_existent_command_raises_specific_no_such_command_exception:_&:' \
-		-e 's:using_non_existent_command_and_correct_cwd_raises_no_such_command_exception:_&:' \
-		-i tests/process_test_set.py || die
-
-	distutils-r1_src_prepare
-}