Gentoo Archives: gentoo-commits

From: Louis Sautier <sbraz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/supervisor/
Date: Tue, 11 Feb 2020 12:03:34
Message-Id: 1581422596.17f398a363f8b5f0078c7f9046f3c2f5bc9b9741.sbraz@gentoo
1 commit: 17f398a363f8b5f0078c7f9046f3c2f5bc9b9741
2 Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 11 11:56:50 2020 +0000
4 Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 11 12:03:16 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f398a3
7
8 app-admin/supervisor: remove old versions and Python 2 support
9
10 Package-Manager: Portage-2.3.87, Repoman-2.3.20
11 Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
12
13 app-admin/supervisor/Manifest | 3 -
14 app-admin/supervisor/supervisor-3.1.4.ebuild | 47 ----------------
15 app-admin/supervisor/supervisor-3.3.5.ebuild | 82 ----------------------------
16 app-admin/supervisor/supervisor-4.0.3.ebuild | 76 --------------------------
17 4 files changed, 208 deletions(-)
18
19 diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
20 index f05c7faf453..1c7ee90462b 100644
21 --- a/app-admin/supervisor/Manifest
22 +++ b/app-admin/supervisor/Manifest
23 @@ -1,4 +1 @@
24 -DIST supervisor-3.1.4.tar.gz 392321 BLAKE2B 316789fae200f02242a90d3a22a3c6486576f74dbab81b95efc72768a89c54999a370625f9589afe1edff08351840fbe27a7ef8674e6f1e3bbdd4237f3227df6 SHA512 7182db4169d37aa8f7a2a4e1d57ce40f6dea21759ed73fb49286dd5ffb2bdede0fccdc71344e93c8f8c067a2cbc4e3cb0a9a50b22bacdb1b8bc1378581ed5f07
25 -DIST supervisor-3.3.5.tar.gz 421220 BLAKE2B 63e9db005596921c4a4426de361fc20992a27b67b67ee1256cd64fe6d385909682a5055e4797512410f36f6855592f53c9c5720c54a2dae967578691d05ff3fc SHA512 66c43d40c216e5c3120e083407c848295fa1e59d6d9da916a4bae5c37d4d13208c3bf7c0c8b8a5d570270eb44fac0b1bbcceddb2e84e4f3fc1b6241b43116af7
26 -DIST supervisor-4.0.3.tar.gz 435960 BLAKE2B 001f556b955311e2453fe1091e46696f3712751e20fad54437fd86c6020e844047ac6cd8983d46a07dd1830e6324d198c84c9d0c8fe301bb5ca568e4c7345d72 SHA512 09de52dca9f71409954fb4782d42099d19892bd82797d2b3dc7100b2693da292fe9822b5144eaf4dcbe295f4e227d62601c8791016e1bcd5c253d99c89f59368
27 DIST supervisor-4.0.4.tar.gz 437708 BLAKE2B 211726da07ce31c00da0d6edba57942d78ee5d2757927b22afe569364c29aaf55375d4895b381f06071bc6b6c39a926ca2073e8fcb8e0ea9673a89aafd08b346 SHA512 22a38f759b0584310f5e16acbfc7b0c4cc59f3206fbfaf6295bd40a826d50ad02c8b0093821362c5038dd987a6599879d82dcefe948a2eda702b89e9f92e471e
28
29 diff --git a/app-admin/supervisor/supervisor-3.1.4.ebuild b/app-admin/supervisor/supervisor-3.1.4.ebuild
30 deleted file mode 100644
31 index 7eb4c5a3325..00000000000
32 --- a/app-admin/supervisor/supervisor-3.1.4.ebuild
33 +++ /dev/null
34 @@ -1,47 +0,0 @@
35 -# Copyright 1999-2019 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI="5"
39 -
40 -PYTHON_COMPAT=( python2_7 ) # py2 only
41 -# xml.etree.ElementTree module required.
42 -PYTHON_REQ_USE="xml"
43 -
44 -inherit distutils-r1
45 -
46 -MY_PV="${PV/_beta/b}"
47 -
48 -DESCRIPTION="A system for controlling process state under UNIX"
49 -HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
50 -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
51 -
52 -LICENSE="repoze ZPL BSD HPND GPL-2"
53 -SLOT="0"
54 -KEYWORDS="amd64 x86"
55 -IUSE="doc test"
56 -RESTRICT="!test? ( test )"
57 -
58 -# ALL versions of meld3 match to >=meld3-0.6.5
59 -RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
60 - dev-python/setuptools[${PYTHON_USEDEP}]"
61 -DEPEND="${RDEPEND}
62 - test? ( dev-python/mock[${PYTHON_USEDEP}] )
63 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
64 -
65 -S="${WORKDIR}/${PN}-${MY_PV}"
66 -
67 -python_compile_all() {
68 - # Somehow the test phase is called and run on invoking a doc build; harmless
69 - use doc && emake -C docs html
70 -}
71 -
72 -python_test() {
73 - esetup.py test
74 -}
75 -
76 -python_install_all() {
77 - newinitd "${FILESDIR}/init.d-r1" supervisord
78 - newconfd "${FILESDIR}/conf.d" supervisord
79 - use doc && local HTML_DOCS=( docs/.build/html/. )
80 - distutils-r1_python_install_all
81 -}
82
83 diff --git a/app-admin/supervisor/supervisor-3.3.5.ebuild b/app-admin/supervisor/supervisor-3.3.5.ebuild
84 deleted file mode 100644
85 index 3abc9b5b415..00000000000
86 --- a/app-admin/supervisor/supervisor-3.3.5.ebuild
87 +++ /dev/null
88 @@ -1,82 +0,0 @@
89 -# Copyright 1999-2019 Gentoo Authors
90 -# Distributed under the terms of the GNU General Public License v2
91 -
92 -EAPI=7
93 -
94 -PYTHON_COMPAT=( python2_7 ) # py2 only
95 -# xml.etree.ElementTree module required.
96 -PYTHON_REQ_USE="xml"
97 -
98 -inherit distutils-r1 systemd user
99 -
100 -MY_PV="${PV/_beta/b}"
101 -
102 -DESCRIPTION="A system for controlling process state under UNIX"
103 -HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
104 -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
105 -
106 -LICENSE="repoze ZPL BSD HPND GPL-2"
107 -SLOT="0"
108 -KEYWORDS="~amd64 ~x86"
109 -IUSE="doc test"
110 -RESTRICT="!test? ( test )"
111 -
112 -RDEPEND="
113 - dev-python/meld3[${PYTHON_USEDEP}]
114 - dev-python/setuptools[${PYTHON_USEDEP}]
115 -"
116 -DEPEND="
117 - dev-python/setuptools[${PYTHON_USEDEP}]
118 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
119 - test? (
120 - ${RDEPEND}
121 - dev-python/mock[${PYTHON_USEDEP}]
122 - )
123 -"
124 -
125 -S="${WORKDIR}/${PN}-${MY_PV}"
126 -
127 -python_prepare_all() {
128 - # https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
129 - sed -i '/namespace_packages=/d' setup.py || die
130 - distutils-r1_python_prepare_all
131 -}
132 -
133 -python_compile_all() {
134 - if use doc; then
135 - emake -C docs html
136 - HTML_DOCS=( docs/.build/html/. )
137 - fi
138 -}
139 -
140 -python_test() {
141 - esetup.py test
142 -}
143 -
144 -python_install_all() {
145 - distutils-r1_python_install_all
146 - newinitd "${FILESDIR}/init.d-r2" supervisord
147 - newconfd "${FILESDIR}/conf.d-r1" supervisord
148 - dodoc supervisor/skel/sample.conf
149 - keepdir /etc/supervisord.d
150 - insinto /etc
151 - doins "${FILESDIR}/supervisord.conf"
152 - keepdir /var/log/supervisor
153 - systemd_dounit "${FILESDIR}/supervisord.service"
154 -}
155 -
156 -pkg_preinst() {
157 - enewgroup supervisor
158 - fowners :supervisor /var/log/supervisor
159 - fperms 750 /var/log/supervisor
160 -}
161 -
162 -pkg_postinst() {
163 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
164 - # This is a new installation
165 - elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
166 - elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
167 - elog ""
168 - elog "By default, only members of the supervisor group can run supervisorctl."
169 - fi
170 -}
171
172 diff --git a/app-admin/supervisor/supervisor-4.0.3.ebuild b/app-admin/supervisor/supervisor-4.0.3.ebuild
173 deleted file mode 100644
174 index f71315bfc37..00000000000
175 --- a/app-admin/supervisor/supervisor-4.0.3.ebuild
176 +++ /dev/null
177 @@ -1,76 +0,0 @@
178 -# Copyright 1999-2020 Gentoo Authors
179 -# Distributed under the terms of the GNU General Public License v2
180 -
181 -EAPI=7
182 -
183 -PYTHON_COMPAT=( python{2_7,3_{6,7}} )
184 -# xml.etree.ElementTree module required.
185 -PYTHON_REQ_USE="xml(+)"
186 -
187 -inherit distutils-r1 systemd user
188 -
189 -MY_PV="${PV/_beta/b}"
190 -
191 -DESCRIPTION="A system for controlling process state under UNIX"
192 -HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
193 -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
194 -
195 -LICENSE="repoze ZPL BSD HPND GPL-2"
196 -SLOT="0"
197 -KEYWORDS="~amd64 ~x86"
198 -IUSE="doc test"
199 -RESTRICT="!test? ( test )"
200 -
201 -RDEPEND="
202 - >=dev-python/meld3-1.0.0[${PYTHON_USEDEP}]
203 - dev-python/setuptools[${PYTHON_USEDEP}]
204 -"
205 -BDEPEND="
206 - dev-python/setuptools[${PYTHON_USEDEP}]
207 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
208 - test? (
209 - ${RDEPEND}
210 - dev-python/mock[${PYTHON_USEDEP}]
211 - )
212 -"
213 -
214 -S="${WORKDIR}/${PN}-${MY_PV}"
215 -
216 -python_compile_all() {
217 - if use doc; then
218 - emake -C docs html
219 - HTML_DOCS=( docs/.build/html/. )
220 - fi
221 -}
222 -
223 -python_test() {
224 - esetup.py test
225 -}
226 -
227 -python_install_all() {
228 - distutils-r1_python_install_all
229 - newinitd "${FILESDIR}/init.d-r2" supervisord
230 - newconfd "${FILESDIR}/conf.d-r1" supervisord
231 - dodoc supervisor/skel/sample.conf
232 - keepdir /etc/supervisord.d
233 - insinto /etc
234 - doins "${FILESDIR}/supervisord.conf"
235 - keepdir /var/log/supervisor
236 - systemd_dounit "${FILESDIR}/supervisord.service"
237 -}
238 -
239 -pkg_preinst() {
240 - enewgroup supervisor
241 - fowners :supervisor /var/log/supervisor
242 - fperms 750 /var/log/supervisor
243 -}
244 -
245 -pkg_postinst() {
246 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
247 - # This is a new installation
248 - elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
249 - elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
250 - elog ""
251 - elog "By default, only members of the supervisor group can run supervisorctl."
252 - fi
253 -}