1 |
commit: d99f955327514ef544f5deecb4f0ef8dc0bac656 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 23 02:20:35 2022 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 23 03:00:28 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d99f9553 |
7 |
|
8 |
dev-util/buildbot: Version bump to 3.6.1 |
9 |
|
10 |
Update 9999, confd file |
11 |
|
12 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
13 |
|
14 |
dev-util/buildbot/Manifest | 1 + |
15 |
.../{buildbot-9999.ebuild => buildbot-3.6.1.ebuild} | 17 +++++++++++------ |
16 |
dev-util/buildbot/buildbot-9999.ebuild | 2 +- |
17 |
dev-util/buildbot/files/buildmaster.confd | 2 +- |
18 |
4 files changed, 14 insertions(+), 8 deletions(-) |
19 |
|
20 |
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest |
21 |
index 2a4093a0408e..ad7526384cac 100644 |
22 |
--- a/dev-util/buildbot/Manifest |
23 |
+++ b/dev-util/buildbot/Manifest |
24 |
@@ -1,3 +1,4 @@ |
25 |
DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b |
26 |
DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4 SHA512 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f |
27 |
DIST buildbot-3.6.0.tar.gz 2458029 BLAKE2B 5f41702d4d61fbcbfa878c6febbb89a38da2648403c4fdcab24bde246adc225e9ac3f72eb7dc893e03763f00c2d3548c31b2d6597904032e4b75e660bb1faf72 SHA512 c0bec931d08adb1eec51114619d2a085fbef224944a4c0acf3ab396f84d846fd620b84379affee238d02dd90ca1294fdb2b7fb8ea6e82d95c4cfeae93a0b5e73 |
28 |
+DIST buildbot-3.6.1.tar.gz 2458176 BLAKE2B 4587ed222e2fae424f3c4f275e67e72bf25b0ce88231a29f931582d82fbe93a846f85b14bdc64740939466ccdc3f15dab3774244aa5c0a293250b52b542014ea SHA512 62a993d1acd8bc5cc916f009909b4b099d9f64007fe790dc219104f248bb21e0ab8f1771c354ef61e6d8ba497451cdef5e7a7de17a87cfd1e941b3b49fbf2206 |
29 |
|
30 |
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-3.6.1.ebuild |
31 |
similarity index 94% |
32 |
copy from dev-util/buildbot/buildbot-9999.ebuild |
33 |
copy to dev-util/buildbot/buildbot-3.6.1.ebuild |
34 |
index b0ebb30b9273..9ca1baf06d21 100644 |
35 |
--- a/dev-util/buildbot/buildbot-9999.ebuild |
36 |
+++ b/dev-util/buildbot/buildbot-3.6.1.ebuild |
37 |
@@ -6,17 +6,22 @@ EAPI=8 |
38 |
DISTUTILS_USE_PEP517=setuptools |
39 |
PYTHON_REQ_USE="sqlite" |
40 |
PYTHON_COMPAT=( python3_{8..10} ) |
41 |
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" |
42 |
-inherit readme.gentoo-r1 git-r3 systemd distutils-r1 |
43 |
+inherit readme.gentoo-r1 systemd distutils-r1 |
44 |
+ |
45 |
+MY_PV="${PV/_p/.post}" |
46 |
+MY_P="${PN}-${MY_PV}" |
47 |
|
48 |
DESCRIPTION="BuildBot build automation system" |
49 |
HOMEPAGE="https://buildbot.net/ |
50 |
https://github.com/buildbot/buildbot |
51 |
https://pypi.org/project/buildbot/" |
52 |
-S="${S}/master" |
53 |
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
54 |
+S=${WORKDIR}/${MY_P} |
55 |
|
56 |
LICENSE="GPL-2" |
57 |
SLOT="0" |
58 |
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" |
59 |
+ |
60 |
IUSE="crypt docker examples irc test" |
61 |
RESTRICT="!test? ( test )" |
62 |
|
63 |
@@ -60,12 +65,12 @@ BDEPEND=" |
64 |
>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}] |
65 |
dev-python/moto[${PYTHON_USEDEP}] |
66 |
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
67 |
- >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}] |
68 |
+ dev-python/parameterized[${PYTHON_USEDEP}] |
69 |
dev-python/lz4[${PYTHON_USEDEP}] |
70 |
dev-python/ldap3[${PYTHON_USEDEP}] |
71 |
- dev-util/buildbot-pkg[${PYTHON_USEDEP}] |
72 |
+ ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}] |
73 |
dev-util/buildbot-worker[${PYTHON_USEDEP}] |
74 |
- dev-util/buildbot-www[${PYTHON_USEDEP}] |
75 |
+ ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] |
76 |
)" |
77 |
|
78 |
DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added |
79 |
|
80 |
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild |
81 |
index b0ebb30b9273..17faf70a4028 100644 |
82 |
--- a/dev-util/buildbot/buildbot-9999.ebuild |
83 |
+++ b/dev-util/buildbot/buildbot-9999.ebuild |
84 |
@@ -33,7 +33,7 @@ RDEPEND=" |
85 |
>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] |
86 |
dev-python/pyjwt[${PYTHON_USEDEP}] |
87 |
dev-python/pyyaml[${PYTHON_USEDEP}] |
88 |
- ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] |
89 |
+ dev-util/buildbot-worker[${PYTHON_USEDEP}] |
90 |
crypt? ( |
91 |
>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] |
92 |
dev-python/service_identity[${PYTHON_USEDEP}] |
93 |
|
94 |
diff --git a/dev-util/buildbot/files/buildmaster.confd b/dev-util/buildbot/files/buildmaster.confd |
95 |
index eb3185aef358..9bb2eb0328d9 100644 |
96 |
--- a/dev-util/buildbot/files/buildmaster.confd |
97 |
+++ b/dev-util/buildbot/files/buildmaster.confd |
98 |
@@ -11,5 +11,5 @@ TWISTD_OPTS="" |
99 |
|
100 |
# Optional specific python version to run in |
101 |
# (if not the system default version) |
102 |
-# ie: RUNTIME_PYTHON="/usr/bin/python2.7" |
103 |
+# ie: RUNTIME_PYTHON="/usr/bin/python3.8" |
104 |
RUNTIME_PYTHON="" |