[gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-worker/

["Sam James" <sam@gentoo.org>]

commit:     574290a65df445a55d5456024e093f26459f32c6
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Feb 25 06:34:42 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 06:53:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574290a6

dev-util/buildbot-worker: add 3.11.1

Upstream point release officially drops dev-python/future as a
requirement by replacing it with dev-python/six instead, as a python2
compatibility library.

This is actually the only change for buildbot-worker, although there is
one commit each to buildbot and buildbot-www as well. This point release
truly is mild, like all the best bugfix patch releases.

Anyways, this is nice, because six is a tolerable dependency that we
have broad use of in the tree, whereas future is a hot mess, deprecated,
and broken entirely if you depend on it in python 3.12, so delayed
updating PYTHON_COMPAT in consumers.

Drop attempts at patching future out of buildbot-worker, it's not needed
anymore.

n.b. The new buildbot tag is not yet on PyPI, but buildbot gets
simultaneously released to Github Releases on a regular basis. Take this
opportunity to add the latter as a secondary download location.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/buildbot-worker/Manifest                                  | 3 +--
 ...buildbot-worker-3.11.0.ebuild => buildbot-worker-3.11.1.ebuild} | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 87b7af6c2388..0739b5d46cad 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,4 +1,3 @@
-DIST buildbot-worker-3.11.0-remove_py27.tar.gz 7134 BLAKE2B 8c92f8425b9a8d60e46228aab6aef49352090c931e21818d684167100f0c5c184e5e4e6aabdbb420bfe0b124d572194b33889deccf123b934754ad4e75037af0 SHA512 d9158e7936336d6147c0938ea212da55775ffe1c431b94b1b89274113fa45cbd62b7042737bac8a6580e268aca823fa072ee3d3bb49bad97aa99bd56995d7134
-DIST buildbot-worker-3.11.0.tar.gz 131028 BLAKE2B 644e10f1d90c75a9f20439bc902764d9f69b16781d710e56bf4cad40d30f06f137d6a00d4c450c1589909ca93c98ff9a0cd6e1363a8feff58a4832e0096aada7 SHA512 73f42495bd252e75cd984d3222663260079887caadff29b69c23f188a1f3208fc6e2acfa38553fb5615ba1c3d4996655c96faa16ba0eb7335c6290ce3ce58679
+DIST buildbot-worker-3.11.1.tar.gz 131129 BLAKE2B d8466c086261c612e976586b4589ca20617f5b9a7b69ccf276500fd351caead1425ae24897c4db242024de53f83c98b869dd9035bc366d9ee0376290307922a0 SHA512 c4560f69a15434cf93a43521bd1bbb568937a6ad8be338bca9089c9f449c3d0c5b8f000abf06a5fcfe4ebf5b206a9c81417a91cee633b67ca89ee67497a8368a
 DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 010893b7b4e5710654299b2541c4cdcdad47b3b763dbc7e2336e5480c841908e04d8350c7cb42edd9ea99d16fd26f36a524a6d6bec8c0f933665a02ded369f89 SHA512 f1e3bf7c0da2f31dd446dc16487e32fddaecc0c2f9c17c469146707322a3d7bb2cc77db4f6145c62530bce58dd61aa19e008e944a7f39a17dc66f1317ee26e1b
 DIST buildbot-worker-3.9.0.tar.gz 125913 BLAKE2B e053cd150cf21cc0e5dfb2d49c186c49d340670429b760ce9f697aa97a245d0e6a12f0ea84eb1256a610891042096877c89244b1f2862bf74160502170f9124c SHA512 08b74d6f019ca85f65c598a34c81bc47fdf873abad17205072788d938fcd5450f80aa6ca9d324edc01893947f4ac8e2968889dd73be854a82b4ea54e4730613b

diff --git a/dev-util/buildbot-worker/buildbot-worker-3.11.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.11.1.ebuild
similarity index 96%
rename from dev-util/buildbot-worker/buildbot-worker-3.11.0.ebuild
rename to dev-util/buildbot-worker/buildbot-worker-3.11.1.ebuild
index bd3115f4a7ec..8467423a060b 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.11.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.11.1.ebuild
@@ -19,13 +19,16 @@ KEYWORDS="~amd64 ~arm64 ~sparc ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~zorry/patches/buildbot/buildbot-worker-${PV}-remove_py27.tar.gz"
+SRC_URI+="
+	https://github.com/buildbot/buildbot/releases/download/v${PV}/${P}.tar.gz
+"
 
 RDEPEND="
 	acct-user/buildbot
 	!<dev-util/buildbot-3.0.0
 	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
@@ -48,8 +51,6 @@ src_prepare() {
 	# Remove shipped windows start script
 	sed -e "/'buildbot_worker_windows_service=buildbot_worker.scripts.windows_service:HandleCommandLine',/d" \
 		-i setup.py || die
-	# applay remove py 2.7 patch
-	eapply "${WORKDIR}/buildbot-worker-${PV}-remove_py27.patch"
 
 	distutils-r1_src_prepare
 }