1 |
axs 14/10/29 18:52:29 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: distcc-3.1-r10.ebuild distcc-3.2_rc1-r1.ebuild |
5 |
Removed: distcc-3.1-r5.ebuild distcc-3.1-r7.ebuild |
6 |
distcc-3.2_rc1.ebuild distcc-3.1-r9.ebuild |
7 |
distcc-3.1-r6.ebuild |
8 |
Log: |
9 |
Added missing python dependencies, cleaned up old v3.1 ebuilds as per discussion with untrabug on irc |
10 |
|
11 |
(Portage version: 2.2.8-r2/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 2B6559ED) |
12 |
|
13 |
Revision Changes Path |
14 |
1.237 sys-devel/distcc/ChangeLog |
15 |
|
16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?rev=1.237&view=markup |
17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?rev=1.237&content-type=text/plain |
18 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?r1=1.236&r2=1.237 |
19 |
|
20 |
Index: ChangeLog |
21 |
=================================================================== |
22 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v |
23 |
retrieving revision 1.236 |
24 |
retrieving revision 1.237 |
25 |
diff -u -r1.236 -r1.237 |
26 |
--- ChangeLog 21 May 2014 06:38:17 -0000 1.236 |
27 |
+++ ChangeLog 29 Oct 2014 18:52:28 -0000 1.237 |
28 |
@@ -1,6 +1,15 @@ |
29 |
# ChangeLog for sys-devel/distcc |
30 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
31 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.236 2014/05/21 06:38:17 jlec Exp $ |
32 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.237 2014/10/29 18:52:28 axs Exp $ |
33 |
+ |
34 |
+*distcc-3.2_rc1-r1 (29 Oct 2014) |
35 |
+*distcc-3.1-r10 (29 Oct 2014) |
36 |
+ |
37 |
+ 29 Oct 2014; Ian Stakenvicius (_AxS_) <axs@g.o> +distcc-3.1-r10.ebuild, |
38 |
+ +distcc-3.2_rc1-r1.ebuild, -distcc-3.1-r5.ebuild, -distcc-3.1-r6.ebuild, |
39 |
+ -distcc-3.1-r7.ebuild, -distcc-3.1-r9.ebuild, -distcc-3.2_rc1.ebuild: |
40 |
+ Added missing python dependencies, cleaned up old v3.1 ebuilds as per |
41 |
+ discussion with untrabug on irc |
42 |
|
43 |
21 May 2014; Justin Lecher <jlec@g.o> distcc-3.1-r9.ebuild, |
44 |
distcc-3.2_rc1.ebuild: |
45 |
|
46 |
|
47 |
|
48 |
1.1 sys-devel/distcc/distcc-3.1-r10.ebuild |
49 |
|
50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.1-r10.ebuild?rev=1.1&view=markup |
51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.1-r10.ebuild?rev=1.1&content-type=text/plain |
52 |
|
53 |
Index: distcc-3.1-r10.ebuild |
54 |
=================================================================== |
55 |
# Copyright 1999-2014 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r10.ebuild,v 1.1 2014/10/29 18:52:28 axs Exp $ |
58 |
|
59 |
EAPI=5 |
60 |
|
61 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
62 |
|
63 |
inherit eutils fdo-mime flag-o-matic multilib python-single-r1 systemd toolchain-funcs user |
64 |
|
65 |
DESCRIPTION="Distribute compilation of C code across several machines on a network" |
66 |
HOMEPAGE="http://distcc.org/" |
67 |
SRC_URI="http://distcc.googlecode.com/files/${P}.tar.bz2" |
68 |
|
69 |
LICENSE="GPL-2" |
70 |
SLOT="0" |
71 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" |
72 |
IUSE="avahi gtk hardened ipv6 selinux xinetd" |
73 |
|
74 |
RESTRICT="test" |
75 |
|
76 |
RDEPEND="${PYTHON_DEPS} |
77 |
dev-libs/popt |
78 |
avahi? ( >=net-dns/avahi-0.6[dbus] ) |
79 |
gtk? ( x11-libs/gtk+:2 )" |
80 |
DEPEND="${RDEPEND} |
81 |
virtual/pkgconfig" |
82 |
RDEPEND="${RDEPEND} |
83 |
!net-misc/pump |
84 |
>=sys-devel/gcc-config-1.4.1 |
85 |
selinux? ( sec-policy/selinux-distcc ) |
86 |
xinetd? ( sys-apps/xinetd )" |
87 |
|
88 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
89 |
|
90 |
DISTCC_LOG="" |
91 |
DCCC_PATH="/usr/$(get_libdir)/distcc/bin" |
92 |
DISTCC_VERBOSE="0" |
93 |
|
94 |
pkg_setup() { |
95 |
enewuser distcc 240 -1 -1 daemon |
96 |
python-single-r1_pkg_setup |
97 |
} |
98 |
|
99 |
src_prepare() { |
100 |
epatch "${FILESDIR}/${PN}-3.0-xinetd.patch" |
101 |
# bug #253786 |
102 |
epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch" |
103 |
# bug #255188 |
104 |
epatch "${FILESDIR}/${P}-freedesktop.patch" |
105 |
# bug #258364 |
106 |
epatch "${FILESDIR}/${P}-python.patch" |
107 |
# bug #351979 |
108 |
epatch "${FILESDIR}/${P}-argc-fix.patch" |
109 |
|
110 |
sed -i -e "/PATH/s:\$distcc_location:${DCCC_PATH}:" pump.in || die |
111 |
|
112 |
# Bugs #120001, #167844 and probably more. See patch for description. |
113 |
use hardened && epatch "${FILESDIR}/distcc-hardened.patch" |
114 |
} |
115 |
|
116 |
src_configure() { |
117 |
local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}" |
118 |
# More legacy stuff? |
119 |
[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags |
120 |
|
121 |
# --disable-rfc2553 b0rked, bug #254176 |
122 |
use ipv6 && myconf="${myconf} --enable-rfc2553" |
123 |
|
124 |
econf \ |
125 |
$(use_with avahi) \ |
126 |
$(use_with gtk) \ |
127 |
${myconf} |
128 |
} |
129 |
|
130 |
src_install() { |
131 |
# In rare cases, parallel make install failed |
132 |
MAKEOPTS+=" -j1" |
133 |
default |
134 |
|
135 |
dobin "${FILESDIR}/3.0/distcc-config" |
136 |
|
137 |
newinitd "${FILESDIR}/${PV}/init" distccd |
138 |
systemd_dounit "${FILESDIR}/distccd.service" |
139 |
systemd_install_serviced "${FILESDIR}/distccd.service.conf" |
140 |
|
141 |
cp "${FILESDIR}/3.1/conf" "${T}/distccd" || die |
142 |
if use avahi; then |
143 |
cat >> "${T}/distccd" <<-EOF |
144 |
|
145 |
# Enable zeroconf support in distccd |
146 |
DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" |
147 |
EOF |
148 |
|
149 |
sed -i '/ExecStart/ s|$| --zeroconf|' "${ED}"/usr/lib/systemd/system/distccd.service || die |
150 |
fi |
151 |
doconfd "${T}/distccd" |
152 |
|
153 |
cat > "${T}/02distcc" <<-EOF |
154 |
# This file is managed by distcc-config; use it to change these settings. |
155 |
DISTCC_LOG="${DISTCC_LOG}" |
156 |
DCCC_PATH="${DCCC_PATH}" |
157 |
DISTCC_VERBOSE="${DISTCC_VERBOSE}" |
158 |
EOF |
159 |
doenvd "${T}/02distcc" |
160 |
|
161 |
# create the masquerade directory |
162 |
dodir "${DCCC_PATH}" |
163 |
for f in cc c++ gcc g++; do |
164 |
dosym /usr/bin/distcc "${DCCC_PATH}/${f}" |
165 |
if [ "${f}" != "cc" ]; then |
166 |
dosym /usr/bin/distcc "${DCCC_PATH}/${CTARGET:-${CHOST}}-${f}" |
167 |
fi |
168 |
done |
169 |
|
170 |
# create the distccd pid directory |
171 |
keepdir /var/run/distccd |
172 |
fowners distcc:daemon /var/run/distccd |
173 |
|
174 |
if use gtk; then |
175 |
einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" |
176 |
einfo "This is to have a little sensability in naming schemes between distccmon programs" |
177 |
mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die |
178 |
dosym distccmon-gui /usr/bin/distccmon-gnome |
179 |
fi |
180 |
|
181 |
if use xinetd; then |
182 |
insinto /etc/xinetd.d |
183 |
newins "doc/example/xinetd" distcc |
184 |
fi |
185 |
|
186 |
rm -rf "${D}/etc/default" || die |
187 |
rm -f "${D}/etc/distcc/clients.allow" || die |
188 |
rm -f "${D}/etc/distcc/commands.allow.sh" || die |
189 |
|
190 |
python_fix_shebang "${ED}" |
191 |
python_optimize "${ED}"/$(python_get_sitedir) |
192 |
} |
193 |
|
194 |
pkg_postinst() { |
195 |
use gtk && fdo-mime_desktop_database_update |
196 |
|
197 |
if use ipv6; then |
198 |
elog |
199 |
elog "IPv6 is not supported yet by ${P}." |
200 |
fi |
201 |
elog |
202 |
elog "Tips on using distcc with Gentoo can be found at" |
203 |
elog "http://www.gentoo.org/doc/en/distcc.xml" |
204 |
elog |
205 |
elog "How to use pump mode with Gentoo:" |
206 |
elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\"" |
207 |
elog "# pump emerge -u world" |
208 |
elog |
209 |
elog "To use the distccmon programs with Gentoo you should use this command:" |
210 |
elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-text 5" |
211 |
|
212 |
if use gtk; then |
213 |
elog "Or:" |
214 |
elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-gnome" |
215 |
fi |
216 |
|
217 |
elog |
218 |
elog "***SECURITY NOTICE***" |
219 |
elog "If you are upgrading distcc please make sure to run etc-update to" |
220 |
elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" |
221 |
elog "added security precautions (the --listen and --allow directives)" |
222 |
elog |
223 |
} |
224 |
|
225 |
pkg_postrm() { |
226 |
use gtk && fdo-mime_desktop_database_update |
227 |
} |
228 |
|
229 |
|
230 |
|
231 |
1.1 sys-devel/distcc/distcc-3.2_rc1-r1.ebuild |
232 |
|
233 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1-r1.ebuild?rev=1.1&view=markup |
234 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1-r1.ebuild?rev=1.1&content-type=text/plain |
235 |
|
236 |
Index: distcc-3.2_rc1-r1.ebuild |
237 |
=================================================================== |
238 |
# Copyright 1999-2014 Gentoo Foundation |
239 |
# Distributed under the terms of the GNU General Public License v2 |
240 |
# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1-r1.ebuild,v 1.1 2014/10/29 18:52:28 axs Exp $ |
241 |
|
242 |
EAPI=5 |
243 |
|
244 |
PYTHON_COMPAT=( python2_7 ) |
245 |
|
246 |
inherit autotools eutils fdo-mime flag-o-matic multilib python-single-r1 systemd toolchain-funcs user |
247 |
|
248 |
MY_P="${P/_}" |
249 |
DESCRIPTION="Distribute compilation of C code across several machines on a network" |
250 |
HOMEPAGE="http://distcc.org/" |
251 |
SRC_URI="http://distcc.googlecode.com/files/${MY_P}.tar.bz2" |
252 |
|
253 |
LICENSE="GPL-2" |
254 |
SLOT="0" |
255 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
256 |
IUSE="avahi crossdev gnome gssapi gtk hardened ipv6 selinux xinetd" |
257 |
|
258 |
RESTRICT="test" |
259 |
|
260 |
RDEPEND="${PYTHON_DEPS} |
261 |
dev-libs/popt |
262 |
avahi? ( >=net-dns/avahi-0.6[dbus] ) |
263 |
gnome? ( |
264 |
>=gnome-base/libgnome-2 |
265 |
>=gnome-base/libgnomeui-2 |
266 |
x11-libs/gtk+:2 |
267 |
x11-libs/pango |
268 |
) |
269 |
gssapi? ( net-libs/libgssglue ) |
270 |
gtk? ( x11-libs/gtk+:2 )" |
271 |
DEPEND="${RDEPEND} |
272 |
virtual/pkgconfig" |
273 |
RDEPEND="${RDEPEND} |
274 |
!net-misc/pump |
275 |
>=sys-devel/gcc-config-1.4.1 |
276 |
selinux? ( sec-policy/selinux-distcc ) |
277 |
xinetd? ( sys-apps/xinetd )" |
278 |
|
279 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
280 |
|
281 |
S="${WORKDIR}/${MY_P}" |
282 |
|
283 |
DCCC_PATH="/usr/$(get_libdir)/distcc/bin" |
284 |
DISTCC_VERBOSE="0" |
285 |
|
286 |
pkg_setup() { |
287 |
enewuser distcc 240 -1 -1 daemon |
288 |
python-single-r1_pkg_setup |
289 |
} |
290 |
|
291 |
src_prepare() { |
292 |
epatch "${FILESDIR}/${PN}-3.0-xinetd.patch" |
293 |
# bug #253786 |
294 |
epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch" |
295 |
# bug #255188 |
296 |
epatch "${FILESDIR}/${PN}-3.2_rc1-freedesktop.patch" |
297 |
# bug #258364 |
298 |
epatch "${FILESDIR}/${PN}-3.2_rc1-python.patch" |
299 |
# for net-libs/libgssglue |
300 |
epatch "${FILESDIR}/${PN}-3.2_rc1-gssapi.patch" |
301 |
|
302 |
# Bugs #120001, #167844 and probably more. See patch for description. |
303 |
use hardened && epatch "${FILESDIR}/distcc-hardened.patch" |
304 |
|
305 |
sed -i \ |
306 |
-e "/PATH/s:\$distcc_location:${EPREFIX}${DCCC_PATH}:" \ |
307 |
-e "s:@PYTHON@:${EPYTHON}:" \ |
308 |
pump.in || die "sed failed" |
309 |
|
310 |
sed \ |
311 |
-e "s:@EPREFIX@:${EPREFIX:-/}:" \ |
312 |
-e "s:@libdir@:/usr/$(get_libdir):" \ |
313 |
"${FILESDIR}/distcc-config-3.2_rc1" > "${T}/distcc-config" || die |
314 |
|
315 |
eaclocal -Im4 --output=aclocal.m4 |
316 |
eautoconf |
317 |
} |
318 |
|
319 |
src_configure() { |
320 |
local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}" |
321 |
# More legacy stuff? |
322 |
[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags |
323 |
|
324 |
# --disable-rfc2553 b0rked, bug #254176 |
325 |
use ipv6 && myconf="${myconf} --enable-rfc2553" |
326 |
|
327 |
econf \ |
328 |
$(use_with avahi) \ |
329 |
$(use_with gtk) \ |
330 |
$(use_with gnome) \ |
331 |
$(use_with gssapi auth) \ |
332 |
${myconf} |
333 |
} |
334 |
|
335 |
src_install() { |
336 |
default |
337 |
|
338 |
dobin "${FILESDIR}/3.0/distcc-config" |
339 |
|
340 |
newinitd "${FILESDIR}/3.1/init" distccd |
341 |
systemd_dounit "${FILESDIR}/distccd.service" |
342 |
systemd_install_serviced "${FILESDIR}/distccd.service.conf" |
343 |
|
344 |
cp "${FILESDIR}/3.0/conf" "${T}/distccd" || die |
345 |
if use avahi; then |
346 |
cat >> "${T}/distccd" <<-EOF |
347 |
|
348 |
# Enable zeroconf support in distccd |
349 |
DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" |
350 |
EOF |
351 |
|
352 |
sed -i '/ExecStart/ s|$| --zeroconf|' "${ED}"/usr/lib/systemd/system/distccd.service || die |
353 |
fi |
354 |
doconfd "${T}/distccd" || die |
355 |
|
356 |
cat > "${T}/02distcc" <<-EOF |
357 |
# This file is managed by distcc-config; use it to change these settings. |
358 |
# DISTCC_LOG and DISTCC_DIR should not be set. |
359 |
DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}" |
360 |
DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}" |
361 |
DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}" |
362 |
DISTCC_TCP_CORK="${DISTCC_TCP_CORK}" |
363 |
DISTCC_SSH="${DISTCC_SSH}" |
364 |
UNCACHED_ERR_FD="${UNCACHED_ERR_FD}" |
365 |
DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}" |
366 |
DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}" |
367 |
EOF |
368 |
doenvd "${T}/02distcc" || die |
369 |
|
370 |
keepdir "${DCCC_PATH}" || die |
371 |
|
372 |
dobin "${T}/distcc-config" || die |
373 |
|
374 |
# create the distccd pid directory |
375 |
keepdir /var/run/distccd || die |
376 |
fowners distcc:daemon /var/run/distccd || die |
377 |
|
378 |
if use gnome || use gtk; then |
379 |
einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" |
380 |
einfo "This is to have a little sensability in naming schemes between distccmon programs" |
381 |
mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die |
382 |
dosym distccmon-gui /usr/bin/distccmon-gnome || die |
383 |
fi |
384 |
|
385 |
if use xinetd; then |
386 |
insinto /etc/xinetd.d || die |
387 |
newins "doc/example/xinetd" distcc || die |
388 |
fi |
389 |
|
390 |
rm -r "${ED}/etc/default" || die |
391 |
rm "${ED}/etc/distcc/clients.allow" || die |
392 |
rm "${ED}/etc/distcc/commands.allow.sh" || die |
393 |
} |
394 |
|
395 |
pkg_postinst() { |
396 |
if [ -x "${EPREFIX}/usr/bin/distcc-config" ] ; then |
397 |
if use crossdev; then |
398 |
"${EPREFIX}/usr/bin/distcc-config" --update-masquerade-with-crossdev |
399 |
else |
400 |
"${EPREFIX}/usr/bin/distcc-config" --update-masquerade |
401 |
fi |
402 |
fi |
403 |
|
404 |
python_mod_optimize include_server |
405 |
use gnome && fdo-mime_desktop_database_update |
406 |
|
407 |
elog |
408 |
elog "Tips on using distcc with Gentoo can be found at" |
409 |
elog "http://www.gentoo.org/doc/en/distcc.xml" |
410 |
elog |
411 |
elog "How to use pump mode with Gentoo:" |
412 |
elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\"" |
413 |
elog "# echo 'FEATURES=\"\${FEATURES} distcc distcc-pump\"' >> /etc/make.conf" |
414 |
elog "# emerge -u world" |
415 |
elog |
416 |
elog "To use the distccmon programs with Gentoo you should use this command:" |
417 |
elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5" |
418 |
|
419 |
if use gnome || use gtk; then |
420 |
elog "Or:" |
421 |
elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome" |
422 |
fi |
423 |
|
424 |
elog |
425 |
elog "***SECURITY NOTICE***" |
426 |
elog "If you are upgrading distcc please make sure to run etc-update to" |
427 |
elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" |
428 |
elog "added security precautions (the --listen and --allow directives)" |
429 |
elog |
430 |
} |
431 |
|
432 |
pkg_postrm() { |
433 |
# delete the masquerade directory |
434 |
if [ ! -f "${EPREFIX}/usr/bin/distcc" ] ; then |
435 |
einfo "Remove masquerade symbolic links." |
436 |
rm "${EPREFIX}${DCCC_PATH}/"*{cc,c++,gcc,g++} |
437 |
rmdir "${EPREFIX}${DCCC_PATH}" |
438 |
fi |
439 |
|
440 |
python_mod_cleanup include_server |
441 |
use gnome && fdo-mime_desktop_database_update |
442 |
} |