1 |
commit: 5419b754e5c7e5265e623a3124c5371687f02b15 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 1 18:32:30 2020 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 1 22:57:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5419b754 |
7 |
|
8 |
dev-util/buildbot-pkg: Version bump, clean vulnerable versions |
9 |
|
10 |
Gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=711702 |
11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
12 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
13 |
|
14 |
dev-util/buildbot-pkg/Manifest | 4 +- |
15 |
dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild | 49 ---------------------- |
16 |
dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild | 49 ---------------------- |
17 |
...pkg-0.9.12.ebuild => buildbot-pkg-2.8.0.ebuild} | 28 +++---------- |
18 |
4 files changed, 6 insertions(+), 124 deletions(-) |
19 |
|
20 |
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest |
21 |
index a78d6f88a10..769c73417a0 100644 |
22 |
--- a/dev-util/buildbot-pkg/Manifest |
23 |
+++ b/dev-util/buildbot-pkg/Manifest |
24 |
@@ -1,4 +1,2 @@ |
25 |
-DIST buildbot-pkg-0.9.12.tar.gz 4446 BLAKE2B e8077d3b212c968694d2d9e5018c9c985acbff592dbccfeb59543a507f263133268dde57efcacfabb90ea61c3184d34dced21f8e269f619d505166e68c76d43e SHA512 5b9847747924b7e04ae7584f549fa498715e293c6dbdbfef1fe5896c8c96cd65471a908b48c46a32eddbcf8f7b3642402974b4ed3319cf42e90028e772b5e34b |
26 |
-DIST buildbot-pkg-1.1.2.tar.gz 4838 BLAKE2B 437fd8c7d293622b8499c45072d03912cb196afa97f06220cd3279ad01d2426e399e9c95ee063146dd8713f0284981c8a42b79f44028aebd19cbd5a4fe518eff SHA512 11fcf96907274b699da23c667d7a634b1af3752b9edf651e3fd50f030bdd80d3170013ac2c789fc2943d2ca8a84cb02b5caaeb60e646a54cf8b89a5e701e21b5 |
27 |
-DIST buildbot-pkg-1.3.0.tar.gz 4835 BLAKE2B d035060ebf1e5823979adea8b7d31a13cc7bf3382eab571090d68db23b476e2fb959deaf249e6d4f2f3b44cf453c407dd0fd39e54a4e5a3d41462b125c573505 SHA512 b8e53de24cd41e31417a4259396fa080c7dad48b5ad2b15d5c9de9eb3fb35196a84f48ba589e8a077382e8a14d760f6148056bbe30972f0542512404e8efbefb |
28 |
DIST buildbot-pkg-2.7.0.tar.gz 4754 BLAKE2B 568c59e9ba60fb2a221794ea7cba44d0a1fb1f4e41368dfcc9199208733fdacb8052a90b64368e8cf5bd906c02ff2d4fddd65dfe4ea117566f176924d4dec621 SHA512 9a6b67dbee28ed352671c2da3b14a416761f49bee2e77cf7f55936cbd4556e5509a420c13c7d4d88756e01de8e1268e08b43fa48ac0cf6a00dbff8566042a33b |
29 |
+DIST buildbot-pkg-2.8.0.tar.gz 4768 BLAKE2B c07e7a46681319ebf2d5bdc1a2228218d9b48378cb877277b1e9c88285f4ac4246eea4cea8018d652b8beba01587ccd9c5e25464645f283ba7e8400c7a8efbe4 SHA512 962b1b8c56d15ad3b40148d2802630b34f808d7699747e8c97c9a5f48c7b4cdf6762c4994da4fb1a495ae9fa9fa1e1ee2d5076b4eaeb593f9c2090d2329c03cc |
30 |
|
31 |
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild |
32 |
deleted file mode 100644 |
33 |
index 2b270c46a06..00000000000 |
34 |
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,49 +0,0 @@ |
37 |
-# Copyright 1999-2020 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI="6" |
41 |
-PYTHON_REQ_USE="sqlite" |
42 |
-PYTHON_COMPAT=( python3_6 ) |
43 |
- |
44 |
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git" |
45 |
- |
46 |
-[[ ${PV} == *9999 ]] && inherit git-r3 |
47 |
-inherit distutils-r1 |
48 |
- |
49 |
-MY_PV="${PV/_p/.post}" |
50 |
-MY_P="${PN}-${MY_PV}" |
51 |
- |
52 |
-DESCRIPTION="BuildBot common www build tools for packaging releases" |
53 |
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/" |
54 |
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
55 |
- |
56 |
-LICENSE="GPL-2" |
57 |
-SLOT="0" |
58 |
- |
59 |
-if [[ ${PV} == *9999 ]]; then |
60 |
- KEYWORDS="" |
61 |
-else |
62 |
- KEYWORDS="~amd64" |
63 |
-fi |
64 |
- |
65 |
-# No real integration tests for this pkg. |
66 |
-# all tests are related to making releases and final checks for distribution |
67 |
- |
68 |
-RDEPEND=" |
69 |
- ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] |
70 |
- dev-python/mock[${PYTHON_USEDEP}] |
71 |
-" |
72 |
- |
73 |
-DEPEND="${RDEPEND} |
74 |
- >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] |
75 |
-" |
76 |
- |
77 |
-S=${WORKDIR}/${MY_P} |
78 |
- |
79 |
-PATCHES=( |
80 |
- "${FILESDIR}/${PN}-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch" |
81 |
-) |
82 |
- |
83 |
-python_install_all() { |
84 |
- distutils-r1_python_install_all |
85 |
-} |
86 |
|
87 |
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild |
88 |
deleted file mode 100644 |
89 |
index 2b270c46a06..00000000000 |
90 |
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild |
91 |
+++ /dev/null |
92 |
@@ -1,49 +0,0 @@ |
93 |
-# Copyright 1999-2020 Gentoo Authors |
94 |
-# Distributed under the terms of the GNU General Public License v2 |
95 |
- |
96 |
-EAPI="6" |
97 |
-PYTHON_REQ_USE="sqlite" |
98 |
-PYTHON_COMPAT=( python3_6 ) |
99 |
- |
100 |
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git" |
101 |
- |
102 |
-[[ ${PV} == *9999 ]] && inherit git-r3 |
103 |
-inherit distutils-r1 |
104 |
- |
105 |
-MY_PV="${PV/_p/.post}" |
106 |
-MY_P="${PN}-${MY_PV}" |
107 |
- |
108 |
-DESCRIPTION="BuildBot common www build tools for packaging releases" |
109 |
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/" |
110 |
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
111 |
- |
112 |
-LICENSE="GPL-2" |
113 |
-SLOT="0" |
114 |
- |
115 |
-if [[ ${PV} == *9999 ]]; then |
116 |
- KEYWORDS="" |
117 |
-else |
118 |
- KEYWORDS="~amd64" |
119 |
-fi |
120 |
- |
121 |
-# No real integration tests for this pkg. |
122 |
-# all tests are related to making releases and final checks for distribution |
123 |
- |
124 |
-RDEPEND=" |
125 |
- ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] |
126 |
- dev-python/mock[${PYTHON_USEDEP}] |
127 |
-" |
128 |
- |
129 |
-DEPEND="${RDEPEND} |
130 |
- >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] |
131 |
-" |
132 |
- |
133 |
-S=${WORKDIR}/${MY_P} |
134 |
- |
135 |
-PATCHES=( |
136 |
- "${FILESDIR}/${PN}-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch" |
137 |
-) |
138 |
- |
139 |
-python_install_all() { |
140 |
- distutils-r1_python_install_all |
141 |
-} |
142 |
|
143 |
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.8.0.ebuild |
144 |
similarity index 51% |
145 |
rename from dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild |
146 |
rename to dev-util/buildbot-pkg/buildbot-pkg-2.8.0.ebuild |
147 |
index 818b0848056..24f94f8cc0d 100644 |
148 |
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild |
149 |
+++ b/dev-util/buildbot-pkg/buildbot-pkg-2.8.0.ebuild |
150 |
@@ -1,13 +1,12 @@ |
151 |
# Copyright 1999-2020 Gentoo Authors |
152 |
# Distributed under the terms of the GNU General Public License v2 |
153 |
|
154 |
-EAPI="6" |
155 |
+EAPI="7" |
156 |
PYTHON_REQ_USE="sqlite" |
157 |
-PYTHON_COMPAT=( python3_6 ) |
158 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
159 |
|
160 |
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git" |
161 |
+DISTUTILS_USE_SETUPTOOLS="rdepend" |
162 |
|
163 |
-[[ ${PV} == *9999 ]] && inherit git-r3 |
164 |
inherit distutils-r1 |
165 |
|
166 |
MY_PV="${PV/_p/.post}" |
167 |
@@ -15,31 +14,14 @@ MY_P="${PN}-${MY_PV}" |
168 |
|
169 |
DESCRIPTION="BuildBot common www build tools for packaging releases" |
170 |
HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/" |
171 |
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
172 |
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
173 |
|
174 |
LICENSE="GPL-2" |
175 |
SLOT="0" |
176 |
|
177 |
-if [[ ${PV} == *9999 ]]; then |
178 |
- KEYWORDS="" |
179 |
-else |
180 |
- KEYWORDS="~amd64" |
181 |
-fi |
182 |
+KEYWORDS="~amd64" |
183 |
|
184 |
# No real integration tests for this pkg. |
185 |
# all tests are related to making releases and final checks for distribution |
186 |
|
187 |
-RDEPEND=" |
188 |
- ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] |
189 |
- dev-python/mock[${PYTHON_USEDEP}] |
190 |
-" |
191 |
- |
192 |
-DEPEND="${RDEPEND} |
193 |
- >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] |
194 |
-" |
195 |
- |
196 |
S=${WORKDIR}/${MY_P} |
197 |
- |
198 |
-python_install_all() { |
199 |
- distutils-r1_python_install_all |
200 |
-} |