| 1 |
commit: 8071d1527b1b5dc313cb77822edd04f63f644738 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 29 23:44:52 2022 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 30 00:11:18 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8071d152 |
| 7 |
|
| 8 |
dev-util/buildbot: Bump to 3.5.0 |
| 9 |
|
| 10 |
Update deps in 9999 |
| 11 |
Fix init script bug 845297 |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/845297 |
| 14 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 15 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-util/buildbot/Manifest | 1 + |
| 18 |
.../{buildbot-9999.ebuild => buildbot-3.5.0.ebuild} | 13 +++++++++---- |
| 19 |
dev-util/buildbot/buildbot-9999.ebuild | 10 +++++----- |
| 20 |
dev-util/buildbot/files/buildmaster.initd | 4 ++-- |
| 21 |
4 files changed, 17 insertions(+), 11 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest |
| 24 |
index 3107d5d2b7f8..28cea4cfa214 100644 |
| 25 |
--- a/dev-util/buildbot/Manifest |
| 26 |
+++ b/dev-util/buildbot/Manifest |
| 27 |
@@ -1 +1,2 @@ |
| 28 |
DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b |
| 29 |
+DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4 SHA512 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f |
| 30 |
|
| 31 |
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-3.5.0.ebuild |
| 32 |
similarity index 95% |
| 33 |
copy from dev-util/buildbot/buildbot-9999.ebuild |
| 34 |
copy to dev-util/buildbot/buildbot-3.5.0.ebuild |
| 35 |
index 0f755c2b1c80..5157b8bb6383 100644 |
| 36 |
--- a/dev-util/buildbot/buildbot-9999.ebuild |
| 37 |
+++ b/dev-util/buildbot/buildbot-3.5.0.ebuild |
| 38 |
@@ -5,17 +5,22 @@ EAPI=8 |
| 39 |
|
| 40 |
PYTHON_REQ_USE="sqlite" |
| 41 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 42 |
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" |
| 43 |
-inherit readme.gentoo-r1 git-r3 systemd distutils-r1 |
| 44 |
+inherit readme.gentoo-r1 systemd distutils-r1 |
| 45 |
+ |
| 46 |
+MY_PV="${PV/_p/.post}" |
| 47 |
+MY_P="${PN}-${MY_PV}" |
| 48 |
|
| 49 |
DESCRIPTION="BuildBot build automation system" |
| 50 |
HOMEPAGE="https://buildbot.net/ |
| 51 |
https://github.com/buildbot/buildbot |
| 52 |
https://pypi.org/project/buildbot/" |
| 53 |
-S="${S}/master" |
| 54 |
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
| 55 |
+S=${WORKDIR}/${MY_P} |
| 56 |
|
| 57 |
LICENSE="GPL-2" |
| 58 |
SLOT="0" |
| 59 |
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" |
| 60 |
+ |
| 61 |
IUSE="crypt docker examples irc test" |
| 62 |
RESTRICT="!test? ( test )" |
| 63 |
|
| 64 |
@@ -24,7 +29,7 @@ RDEPEND=" |
| 65 |
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?] |
| 66 |
>=dev-python/jinja-2.1[${PYTHON_USEDEP}] |
| 67 |
>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] |
| 68 |
- >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}] |
| 69 |
+ >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] |
| 70 |
<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}] |
| 71 |
>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}] |
| 72 |
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] |
| 73 |
|
| 74 |
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild |
| 75 |
index 0f755c2b1c80..bc6e6f1f0996 100644 |
| 76 |
--- a/dev-util/buildbot/buildbot-9999.ebuild |
| 77 |
+++ b/dev-util/buildbot/buildbot-9999.ebuild |
| 78 |
@@ -24,7 +24,7 @@ RDEPEND=" |
| 79 |
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?] |
| 80 |
>=dev-python/jinja-2.1[${PYTHON_USEDEP}] |
| 81 |
>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] |
| 82 |
- >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}] |
| 83 |
+ >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] |
| 84 |
<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}] |
| 85 |
>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}] |
| 86 |
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] |
| 87 |
@@ -55,12 +55,12 @@ BDEPEND=" |
| 88 |
>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}] |
| 89 |
dev-python/moto[${PYTHON_USEDEP}] |
| 90 |
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
| 91 |
- dev-python/parameterized[${PYTHON_USEDEP}] |
| 92 |
+ >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}] |
| 93 |
dev-python/lz4[${PYTHON_USEDEP}] |
| 94 |
dev-python/ldap3[${PYTHON_USEDEP}] |
| 95 |
- ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}] |
| 96 |
- ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] |
| 97 |
- ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] |
| 98 |
+ dev-util/buildbot-pkg[${PYTHON_USEDEP}] |
| 99 |
+ dev-util/buildbot-worker[${PYTHON_USEDEP}] |
| 100 |
+ dev-util/buildbot-www[${PYTHON_USEDEP}] |
| 101 |
)" |
| 102 |
|
| 103 |
DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added |
| 104 |
|
| 105 |
diff --git a/dev-util/buildbot/files/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd |
| 106 |
index b75ae34830d4..2fe8db9f513e 100644 |
| 107 |
--- a/dev-util/buildbot/files/buildmaster.initd |
| 108 |
+++ b/dev-util/buildbot/files/buildmaster.initd |
| 109 |
@@ -1,10 +1,10 @@ |
| 110 |
#!/sbin/openrc-run |
| 111 |
-# Copyright 1999-2018 Gentoo Foundation |
| 112 |
+# Copyright 1999-2022 Gentoo Authors |
| 113 |
# Distributed under the terms of the GNU General Public License v2 |
| 114 |
|
| 115 |
extra_started_commands="reload" |
| 116 |
|
| 117 |
-BUILDMASTER_NAME=${RC_SVCNAME:12} |
| 118 |
+BUILDMASTER_NAME=${RC_SVCNAME#*.} |
| 119 |
BUILDMASTER_PATH="${BASEDIR}/${BUILDMASTER_NAME}" |
| 120 |
|
| 121 |
depend() { |
Archives