commit: 8071d1527b1b5dc313cb77822edd04f63f644738 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Sun May 29 23:44:52 2022 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Mon May 30 00:11:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8071d152
dev-util/buildbot: Bump to 3.5.0 Update deps in 9999 Fix init script bug 845297 Closes: https://bugs.gentoo.org/845297 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> dev-util/buildbot/Manifest | 1 + .../{buildbot-9999.ebuild => buildbot-3.5.0.ebuild} | 13 +++++++++---- dev-util/buildbot/buildbot-9999.ebuild | 10 +++++----- dev-util/buildbot/files/buildmaster.initd | 4 ++-- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest index 3107d5d2b7f8..28cea4cfa214 100644 --- a/dev-util/buildbot/Manifest +++ b/dev-util/buildbot/Manifest @@ -1 +1,2 @@ DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b +DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4 SHA512 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-3.5.0.ebuild similarity index 95% copy from dev-util/buildbot/buildbot-9999.ebuild copy to dev-util/buildbot/buildbot-3.5.0.ebuild index 0f755c2b1c80..5157b8bb6383 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-3.5.0.ebuild @@ -5,17 +5,22 @@ EAPI=8 PYTHON_REQ_USE="sqlite" PYTHON_COMPAT=( python3_{8..10} ) -EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"; -inherit readme.gentoo-r1 git-r3 systemd distutils-r1 +inherit readme.gentoo-r1 systemd distutils-r1 + +MY_PV="${PV/_p/.post}" +MY_P="${PN}-${MY_PV}" DESCRIPTION="BuildBot build automation system" HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"; -S="${S}/master" +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="crypt docker examples irc test" RESTRICT="!test? ( test )" @@ -24,7 +29,7 @@ RDEPEND=" >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?] >=dev-python/jinja-2.1[${PYTHON_USEDEP}] >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] <dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}] >=dev-python/alembic-1.6.0[${PYTHON_USEDEP}] >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild index 0f755c2b1c80..bc6e6f1f0996 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-9999.ebuild @@ -24,7 +24,7 @@ RDEPEND=" >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?] >=dev-python/jinja-2.1[${PYTHON_USEDEP}] >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] <dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}] >=dev-python/alembic-1.6.0[${PYTHON_USEDEP}] >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] @@ -55,12 +55,12 @@ BDEPEND=" >=dev-python/boto3-1.12.48[${PYTHON_USEDEP}] dev-python/moto[${PYTHON_USEDEP}] >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}] dev-python/lz4[${PYTHON_USEDEP}] dev-python/ldap3[${PYTHON_USEDEP}] - ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] + dev-util/buildbot-pkg[${PYTHON_USEDEP}] + dev-util/buildbot-worker[${PYTHON_USEDEP}] + dev-util/buildbot-www[${PYTHON_USEDEP}] )" DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added diff --git a/dev-util/buildbot/files/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd index b75ae34830d4..2fe8db9f513e 100644 --- a/dev-util/buildbot/files/buildmaster.initd +++ b/dev-util/buildbot/files/buildmaster.initd @@ -1,10 +1,10 @@ #!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 extra_started_commands="reload" -BUILDMASTER_NAME=${RC_SVCNAME:12} +BUILDMASTER_NAME=${RC_SVCNAME#*.} BUILDMASTER_PATH="${BASEDIR}/${BUILDMASTER_NAME}" depend() {
