Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/distcc/
Date: Sun, 09 Dec 2018 08:36:00
Message-Id: 1544344364.86c70ade701f5e8cb6c6d87f20c1e5f01af90ee7.gyakovlev@gentoo
1 commit: 86c70ade701f5e8cb6c6d87f20c1e5f01af90ee7
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 9 08:31:47 2018 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 9 08:32:44 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c70ade
7
8 sys-devel/distcc: drop broken versions
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 sys-devel/distcc/distcc-3.3.2-r2.ebuild | 196 --------------------------------
14 sys-devel/distcc/distcc-3.3.2.ebuild | 196 --------------------------------
15 2 files changed, 392 deletions(-)
16
17 diff --git a/sys-devel/distcc/distcc-3.3.2-r2.ebuild b/sys-devel/distcc/distcc-3.3.2-r2.ebuild
18 deleted file mode 100644
19 index 22f3c738ebd..00000000000
20 --- a/sys-devel/distcc/distcc-3.3.2-r2.ebuild
21 +++ /dev/null
22 @@ -1,196 +0,0 @@
23 -# Copyright 1999-2018 Gentoo Authors
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=6
27 -
28 -PYTHON_COMPAT=( python3_{5,6} )
29 -
30 -inherit autotools flag-o-matic python-single-r1 systemd \
31 - toolchain-funcs user xdg-utils prefix
32 -
33 -DESCRIPTION="Distribute compilation of C code across several machines on a network"
34 -HOMEPAGE="http://distcc.org/"
35 -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
36 -
37 -LICENSE="GPL-2+"
38 -SLOT="0"
39 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
40 -IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
41 -
42 -RESTRICT="test"
43 -
44 -CDEPEND="${PYTHON_DEPS}
45 - dev-libs/popt
46 - gnome? (
47 - >=gnome-base/libgnome-2
48 - >=gnome-base/libgnomeui-2
49 - x11-libs/gtk+:2
50 - x11-libs/pango
51 - )
52 - gssapi? ( net-libs/libgssglue )
53 - gtk? ( x11-libs/gtk+:2 )
54 - zeroconf? ( >=net-dns/avahi-0.6[dbus] )
55 -"
56 -DEPEND="${CDEPEND}
57 - sys-libs/binutils-libs
58 - virtual/pkgconfig"
59 -RDEPEND="${CDEPEND}
60 - !net-misc/pump
61 - dev-util/shadowman
62 - >=sys-devel/gcc-config-1.4.1
63 - selinux? ( sec-policy/selinux-distcc )
64 - xinetd? ( sys-apps/xinetd )"
65 -
66 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
67 -
68 -S="${WORKDIR}/distcc"
69 -
70 -pkg_setup() {
71 - enewuser distcc 240 -1 -1 daemon
72 - python-single-r1_pkg_setup
73 -}
74 -
75 -src_prepare() {
76 - eapply "${FILESDIR}/${PN}-3.0-xinetd.patch"
77 - # bug #255188
78 - eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch"
79 - # SOCKSv5 support needed for Portage, bug #537616
80 - eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
81 - eapply_user
82 -
83 - # Bugs #120001, #167844 and probably more. See patch for description.
84 - use hardened && eapply "${FILESDIR}/distcc-hardened.patch"
85 -
86 - sed -i \
87 - -e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \
88 - -e "s:@PYTHON@:${EPYTHON}:" \
89 - pump.in || die "sed failed"
90 -
91 - sed \
92 - -e "s:@EPREFIX@:${EPREFIX:-/}:" \
93 - -e "s:@libdir@:/usr/lib:" \
94 - "${FILESDIR}/distcc-config" > "${T}/distcc-config" || die
95 -
96 - hprefixify update-distcc-symlinks.py src/{serve,daemon}.c
97 - python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config"
98 - eautoreconf
99 -}
100 -
101 -src_configure() {
102 - local myconf=(
103 - --disable-Werror
104 - $(use_enable ipv6 rfc2553)
105 - $(use_with gtk)
106 - $(use_with gnome)
107 - $(use_with gssapi auth)
108 - $(use_with zeroconf avahi)
109 - )
110 -
111 - econf "${myconf[@]}"
112 -}
113 -
114 -src_install() {
115 - # override GZIP_BIN to stop it from compressing manpages
116 - emake DESTDIR="${D}" GZIP_BIN=false install
117 - python_optimize
118 -
119 - newinitd "${FILESDIR}/distccd.initd" distccd
120 - systemd_dounit "${FILESDIR}/distccd.service"
121 - systemd_install_serviced "${FILESDIR}/distccd.service.conf"
122 -
123 - cp "${FILESDIR}/distccd.confd" "${T}/distccd" || die
124 - if use zeroconf; then
125 - cat >> "${T}/distccd" <<-EOF || die
126 -
127 - # Enable zeroconf support in distccd
128 - DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
129 - EOF
130 -
131 - sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die
132 - fi
133 - doconfd "${T}/distccd"
134 -
135 - newenvd - 02distcc <<-EOF || die
136 - # This file is managed by distcc-config; use it to change these settings.
137 - # DISTCC_LOG and DISTCC_DIR should not be set.
138 - DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
139 - DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
140 - DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
141 - DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
142 - DISTCC_SSH="${DISTCC_SSH}"
143 - UNCACHED_ERR_FD="${UNCACHED_ERR_FD}"
144 - DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}"
145 - DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}"
146 - EOF
147 -
148 - keepdir /usr/lib/distcc
149 -
150 - dobin "${T}/distcc-config"
151 -
152 - if use gnome || use gtk; then
153 - einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
154 - einfo "This is to have a little sensability in naming schemes between distccmon programs"
155 - mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
156 - dosym distccmon-gui /usr/bin/distccmon-gnome
157 - fi
158 -
159 - if use xinetd; then
160 - insinto /etc/xinetd.d
161 - newins "doc/example/xinetd" distcc
162 - fi
163 -
164 - insinto /usr/share/shadowman/tools
165 - newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin"
166 - newins - distccd <<<"${EPREFIX}/usr/lib/distcc"
167 -
168 - rm -r "${ED}/etc/default" || die
169 - rm "${ED}/etc/distcc/clients.allow" || die
170 - rm "${ED}/etc/distcc/commands.allow.sh" || die
171 -}
172 -
173 -pkg_postinst() {
174 - # remove the old paths when switching from libXX to lib
175 - if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \
176 - -d ${EROOT%/}/usr/$(get_libdir)/distcc ]]; then
177 - rm -r -f "${EROOT%/}/usr/$(get_libdir)/distcc" || die
178 - fi
179 -
180 - if [[ ${ROOT} == / ]]; then
181 - eselect compiler-shadow update distcc
182 - eselect compiler-shadow update distccd
183 - fi
184 -
185 - use gnome && xdg_desktop_database_update
186 -
187 - elog
188 - elog "Tips on using distcc with Gentoo can be found at"
189 - elog "https://wiki.gentoo.org/wiki/Distcc"
190 - elog
191 - elog "distcc-pump is known to cause breakage with multiple packages."
192 - elog "Do NOT enable it globally."
193 - elog
194 - elog "To use the distccmon programs with Gentoo you should use this command:"
195 - elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
196 -
197 - if use gnome || use gtk; then
198 - elog "Or:"
199 - elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
200 - fi
201 -
202 - elog
203 - elog "***SECURITY NOTICE***"
204 - elog "Since distcc-3.3, whitelist is used for what distccd could execute. The whilelist"
205 - elog "has been generated by compiler-shadow distccd. To revert to the old behavior, "
206 - elog "you need to pass --make-me-a-botnet to distccd in /etc/conf.d/distccd."
207 - elog "Cf. https://github.com/distcc/distcc/pull/243."
208 -}
209 -
210 -pkg_prerm() {
211 - if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then
212 - eselect compiler-shadow remove distcc
213 - fi
214 -}
215 -
216 -pkg_postrm() {
217 - use gnome && xdg_desktop_database_update
218 -}
219
220 diff --git a/sys-devel/distcc/distcc-3.3.2.ebuild b/sys-devel/distcc/distcc-3.3.2.ebuild
221 deleted file mode 100644
222 index 2b510f85325..00000000000
223 --- a/sys-devel/distcc/distcc-3.3.2.ebuild
224 +++ /dev/null
225 @@ -1,196 +0,0 @@
226 -# Copyright 1999-2018 Gentoo Foundation
227 -# Distributed under the terms of the GNU General Public License v2
228 -
229 -EAPI=6
230 -
231 -PYTHON_COMPAT=( python3_{5,6} )
232 -
233 -inherit autotools flag-o-matic python-single-r1 systemd \
234 - toolchain-funcs user xdg-utils prefix
235 -
236 -DESCRIPTION="Distribute compilation of C code across several machines on a network"
237 -HOMEPAGE="http://distcc.org/"
238 -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
239 -
240 -LICENSE="GPL-2+"
241 -SLOT="0"
242 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
243 -IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
244 -
245 -RESTRICT="test"
246 -
247 -CDEPEND="${PYTHON_DEPS}
248 - dev-libs/popt
249 - gnome? (
250 - >=gnome-base/libgnome-2
251 - >=gnome-base/libgnomeui-2
252 - x11-libs/gtk+:2
253 - x11-libs/pango
254 - )
255 - gssapi? ( net-libs/libgssglue )
256 - gtk? ( x11-libs/gtk+:2 )
257 - zeroconf? ( >=net-dns/avahi-0.6[dbus] )
258 -"
259 -DEPEND="${CDEPEND}
260 - sys-libs/binutils-libs
261 - virtual/pkgconfig"
262 -RDEPEND="${CDEPEND}
263 - !net-misc/pump
264 - dev-util/shadowman
265 - >=sys-devel/gcc-config-1.4.1
266 - selinux? ( sec-policy/selinux-distcc )
267 - xinetd? ( sys-apps/xinetd )"
268 -
269 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
270 -
271 -S="${WORKDIR}/distcc"
272 -
273 -pkg_setup() {
274 - enewuser distcc 240 -1 -1 daemon
275 - python-single-r1_pkg_setup
276 -}
277 -
278 -src_prepare() {
279 - eapply "${FILESDIR}/${PN}-3.0-xinetd.patch"
280 - # bug #255188
281 - eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch"
282 - # SOCKSv5 support needed for Portage, bug #537616
283 - eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
284 - eapply_user
285 -
286 - # Bugs #120001, #167844 and probably more. See patch for description.
287 - use hardened && eapply "${FILESDIR}/distcc-hardened.patch"
288 -
289 - sed -i \
290 - -e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \
291 - -e "s:@PYTHON@:${EPYTHON}:" \
292 - pump.in || die "sed failed"
293 -
294 - sed \
295 - -e "s:@EPREFIX@:${EPREFIX:-/}:" \
296 - -e "s:@libdir@:/usr/lib:" \
297 - "${FILESDIR}/3.2/distcc-config" > "${T}/distcc-config" || die
298 -
299 - hprefixify update-distcc-symlinks.py src/{serve,daemon}.c
300 - python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config"
301 - eautoreconf
302 -}
303 -
304 -src_configure() {
305 - local myconf=(
306 - --disable-Werror
307 - $(use_enable ipv6 rfc2553)
308 - $(use_with gtk)
309 - $(use_with gnome)
310 - $(use_with gssapi auth)
311 - $(use_with zeroconf avahi)
312 - )
313 -
314 - econf "${myconf[@]}"
315 -}
316 -
317 -src_install() {
318 - # override GZIP_BIN to stop it from compressing manpages
319 - emake DESTDIR="${D}" GZIP_BIN=false install
320 - python_optimize
321 -
322 - newinitd "${FILESDIR}/3.2/init" distccd
323 - systemd_dounit "${FILESDIR}/distccd.service"
324 - systemd_install_serviced "${FILESDIR}/distccd.service.conf"
325 -
326 - cp "${FILESDIR}/3.2/conf" "${T}/distccd" || die
327 - if use zeroconf; then
328 - cat >> "${T}/distccd" <<-EOF || die
329 -
330 - # Enable zeroconf support in distccd
331 - DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
332 - EOF
333 -
334 - sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die
335 - fi
336 - doconfd "${T}/distccd"
337 -
338 - newenvd - 02distcc <<-EOF || die
339 - # This file is managed by distcc-config; use it to change these settings.
340 - # DISTCC_LOG and DISTCC_DIR should not be set.
341 - DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
342 - DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
343 - DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
344 - DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
345 - DISTCC_SSH="${DISTCC_SSH}"
346 - UNCACHED_ERR_FD="${UNCACHED_ERR_FD}"
347 - DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}"
348 - DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}"
349 - EOF
350 -
351 - keepdir /usr/lib/distcc
352 -
353 - dobin "${T}/distcc-config"
354 -
355 - if use gnome || use gtk; then
356 - einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
357 - einfo "This is to have a little sensability in naming schemes between distccmon programs"
358 - mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
359 - dosym distccmon-gui /usr/bin/distccmon-gnome
360 - fi
361 -
362 - if use xinetd; then
363 - insinto /etc/xinetd.d
364 - newins "doc/example/xinetd" distcc
365 - fi
366 -
367 - insinto /usr/share/shadowman/tools
368 - newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin"
369 - newins - distccd <<<"${EPREFIX}/usr/lib/distcc"
370 -
371 - rm -r "${ED}/etc/default" || die
372 - rm "${ED}/etc/distcc/clients.allow" || die
373 - rm "${ED}/etc/distcc/commands.allow.sh" || die
374 -}
375 -
376 -pkg_postinst() {
377 - # remove the old paths when switching from libXX to lib
378 - if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \
379 - -d ${EROOT%/}/usr/$(get_libdir)/distcc ]]; then
380 - rm -r -f "${EROOT%/}/usr/$(get_libdir)/distcc" || die
381 - fi
382 -
383 - if [[ ${ROOT} == / ]]; then
384 - eselect compiler-shadow update distcc
385 - eselect compiler-shadow update distccd
386 - fi
387 -
388 - use gnome && xdg_desktop_database_update
389 -
390 - elog
391 - elog "Tips on using distcc with Gentoo can be found at"
392 - elog "https://wiki.gentoo.org/wiki/Distcc"
393 - elog
394 - elog "distcc-pump is known to cause breakage with multiple packages."
395 - elog "Do NOT enable it globally."
396 - elog
397 - elog "To use the distccmon programs with Gentoo you should use this command:"
398 - elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
399 -
400 - if use gnome || use gtk; then
401 - elog "Or:"
402 - elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
403 - fi
404 -
405 - elog
406 - elog "***SECURITY NOTICE***"
407 - elog "Since distcc-3.3, whitelist is used for what distccd could execute. The whilelist"
408 - elog "has been generated by compiler-shadow distccd. To revert to the old behavior, "
409 - elog "you need to pass --make-me-a-botnet to distccd in /etc/conf.d/distccd."
410 - elog "Cf. https://github.com/distcc/distcc/pull/243."
411 -}
412 -
413 -pkg_prerm() {
414 - if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then
415 - eselect compiler-shadow remove distcc
416 - fi
417 -}
418 -
419 -pkg_postrm() {
420 - use gnome && xdg_desktop_database_update
421 -}