commit:     48ecd5008646b9d70b728146f12e232b47794385
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 23:36:52 2022 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon May 30 00:11:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48ecd500

dev-util/buildbot-worker: Bump to 3.5.0

Update deps in 9999
Fix bug 845300

Closes: https://bugs.gentoo.org/845300
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 dev-util/buildbot-worker/Manifest                           |  1 +
 ...dbot-worker-9999.ebuild => buildbot-worker-3.5.0.ebuild} | 13 ++++++++++---
 dev-util/buildbot-worker/buildbot-worker-9999.ebuild        |  3 +++
 dev-util/buildbot-worker/files/buildbot_worker.initd2       |  4 ++--
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/dev-util/buildbot-worker/Manifest 
b/dev-util/buildbot-worker/Manifest
index 2143d4df82fc..8cdd489c081c 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1 +1,2 @@
 DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B 
c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc
 SHA512 
411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7
+DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 
90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774
 SHA512 
1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed

diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild 
b/dev-util/buildbot-worker/buildbot-worker-3.5.0.ebuild
similarity index 92%
copy from dev-util/buildbot-worker/buildbot-worker-9999.ebuild
copy to dev-util/buildbot-worker/buildbot-worker-3.5.0.ebuild
index 18ee776e0e52..7bf98bc994af 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.5.0.ebuild
@@ -4,30 +4,37 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git";
-inherit readme.gentoo-r1 git-r3 distutils-r1
+inherit readme.gentoo-r1 distutils-r1
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
 HOMEPAGE="https://buildbot.net/
        https://github.com/buildbot/buildbot
        https://pypi.org/project/buildbot-worker/";
-S="${S}/worker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
        acct-user/buildbot
+       >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
        >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
        dev-python/future[${PYTHON_USEDEP}]
        !<dev-util/buildbot-1.0.0
 "
 BDEPEND="
+       >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
        test? (
                ${RDEPEND}
                dev-python/mock[${PYTHON_USEDEP}]
+               dev-python/psutil[${PYTHON_USEDEP}]
        )
 "
 

diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild 
b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index 18ee776e0e52..511a5ed0a21b 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -20,14 +20,17 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
        acct-user/buildbot
+       >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
        >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
        dev-python/future[${PYTHON_USEDEP}]
        !<dev-util/buildbot-1.0.0
 "
 BDEPEND="
+       >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
        test? (
                ${RDEPEND}
                dev-python/mock[${PYTHON_USEDEP}]
+               dev-python/psutil[${PYTHON_USEDEP}]
        )
 "
 

diff --git a/dev-util/buildbot-worker/files/buildbot_worker.initd2 
b/dev-util/buildbot-worker/files/buildbot_worker.initd2
index 453d207e5d88..4ebfdd452926 100644
--- a/dev-util/buildbot-worker/files/buildbot_worker.initd2
+++ b/dev-util/buildbot-worker/files/buildbot_worker.initd2
@@ -1,8 +1,8 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-BUILDWORKER_NAME=${RC_SVCNAME:16}
+BUILDWORKER_NAME=${RC_SVCNAME#*.}
 BUILDWORKER_PATH="${BASEDIR}/${BUILDWORKER_NAME}"
 depend() {
        need net

Reply via email to