1 |
mgorny 15/01/01 23:31:50 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: distcc-3.2_rc1-r2.ebuild |
5 |
Removed: distcc-3.2_rc1-r1.ebuild |
6 |
Log: |
7 |
Fix installed module byte-compilation. |
8 |
|
9 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
10 |
|
11 |
Revision Changes Path |
12 |
1.239 sys-devel/distcc/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?rev=1.239&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?rev=1.239&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?r1=1.238&r2=1.239 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v |
21 |
retrieving revision 1.238 |
22 |
retrieving revision 1.239 |
23 |
diff -u -r1.238 -r1.239 |
24 |
--- ChangeLog 2 Nov 2014 10:10:01 -0000 1.238 |
25 |
+++ ChangeLog 1 Jan 2015 23:31:50 -0000 1.239 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for sys-devel/distcc |
28 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.238 2014/11/02 10:10:01 swift Exp $ |
30 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
31 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.239 2015/01/01 23:31:50 mgorny Exp $ |
32 |
+ |
33 |
+*distcc-3.2_rc1-r2 (01 Jan 2015) |
34 |
+ |
35 |
+ 01 Jan 2015; Michał Górny <mgorny@g.o> +distcc-3.2_rc1-r2.ebuild, |
36 |
+ -distcc-3.2_rc1-r1.ebuild: |
37 |
+ Fix installed module byte-compilation. |
38 |
|
39 |
02 Nov 2014; Sven Vermeulen <swift@g.o> distcc-3.1-r10.ebuild, |
40 |
distcc-3.2_rc1-r1.ebuild: |
41 |
|
42 |
|
43 |
|
44 |
1.1 sys-devel/distcc/distcc-3.2_rc1-r2.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1-r2.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1-r2.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: distcc-3.2_rc1-r2.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2015 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1-r2.ebuild,v 1.1 2015/01/01 23:31:50 mgorny Exp $ |
54 |
|
55 |
EAPI=5 |
56 |
|
57 |
PYTHON_COMPAT=( python2_7 ) |
58 |
|
59 |
inherit autotools eutils fdo-mime flag-o-matic multilib python-single-r1 systemd toolchain-funcs user |
60 |
|
61 |
MY_P="${P/_}" |
62 |
DESCRIPTION="Distribute compilation of C code across several machines on a network" |
63 |
HOMEPAGE="http://distcc.org/" |
64 |
SRC_URI="http://distcc.googlecode.com/files/${MY_P}.tar.bz2" |
65 |
|
66 |
LICENSE="GPL-2" |
67 |
SLOT="0" |
68 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
69 |
IUSE="avahi crossdev gnome gssapi gtk hardened ipv6 selinux xinetd" |
70 |
|
71 |
RESTRICT="test" |
72 |
|
73 |
CDEPEND="${PYTHON_DEPS} |
74 |
dev-libs/popt |
75 |
avahi? ( >=net-dns/avahi-0.6[dbus] ) |
76 |
gnome? ( |
77 |
>=gnome-base/libgnome-2 |
78 |
>=gnome-base/libgnomeui-2 |
79 |
x11-libs/gtk+:2 |
80 |
x11-libs/pango |
81 |
) |
82 |
gssapi? ( net-libs/libgssglue ) |
83 |
gtk? ( x11-libs/gtk+:2 )" |
84 |
DEPEND="${CDEPEND} |
85 |
virtual/pkgconfig" |
86 |
RDEPEND="${CDEPEND} |
87 |
!net-misc/pump |
88 |
>=sys-devel/gcc-config-1.4.1 |
89 |
selinux? ( sec-policy/selinux-distcc ) |
90 |
xinetd? ( sys-apps/xinetd )" |
91 |
|
92 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
93 |
|
94 |
S="${WORKDIR}/${MY_P}" |
95 |
|
96 |
DCCC_PATH="/usr/$(get_libdir)/distcc/bin" |
97 |
DISTCC_VERBOSE="0" |
98 |
|
99 |
pkg_setup() { |
100 |
enewuser distcc 240 -1 -1 daemon |
101 |
python-single-r1_pkg_setup |
102 |
} |
103 |
|
104 |
src_prepare() { |
105 |
epatch "${FILESDIR}/${PN}-3.0-xinetd.patch" |
106 |
# bug #253786 |
107 |
epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch" |
108 |
# bug #255188 |
109 |
epatch "${FILESDIR}/${PN}-3.2_rc1-freedesktop.patch" |
110 |
# bug #258364 |
111 |
epatch "${FILESDIR}/${PN}-3.2_rc1-python.patch" |
112 |
# for net-libs/libgssglue |
113 |
epatch "${FILESDIR}/${PN}-3.2_rc1-gssapi.patch" |
114 |
|
115 |
# Bugs #120001, #167844 and probably more. See patch for description. |
116 |
use hardened && epatch "${FILESDIR}/distcc-hardened.patch" |
117 |
|
118 |
sed -i \ |
119 |
-e "/PATH/s:\$distcc_location:${EPREFIX}${DCCC_PATH}:" \ |
120 |
-e "s:@PYTHON@:${EPYTHON}:" \ |
121 |
pump.in || die "sed failed" |
122 |
|
123 |
sed \ |
124 |
-e "s:@EPREFIX@:${EPREFIX:-/}:" \ |
125 |
-e "s:@libdir@:/usr/$(get_libdir):" \ |
126 |
"${FILESDIR}/distcc-config-3.2_rc1" > "${T}/distcc-config" || die |
127 |
|
128 |
eaclocal -Im4 --output=aclocal.m4 |
129 |
eautoconf |
130 |
} |
131 |
|
132 |
src_configure() { |
133 |
local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}" |
134 |
# More legacy stuff? |
135 |
[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags |
136 |
|
137 |
# --disable-rfc2553 b0rked, bug #254176 |
138 |
use ipv6 && myconf="${myconf} --enable-rfc2553" |
139 |
|
140 |
econf \ |
141 |
$(use_with avahi) \ |
142 |
$(use_with gtk) \ |
143 |
$(use_with gnome) \ |
144 |
$(use_with gssapi auth) \ |
145 |
${myconf} |
146 |
} |
147 |
|
148 |
src_install() { |
149 |
default |
150 |
python_optimize |
151 |
|
152 |
dobin "${FILESDIR}/3.0/distcc-config" |
153 |
|
154 |
newinitd "${FILESDIR}/3.1/init" distccd |
155 |
systemd_dounit "${FILESDIR}/distccd.service" |
156 |
systemd_install_serviced "${FILESDIR}/distccd.service.conf" |
157 |
|
158 |
cp "${FILESDIR}/3.0/conf" "${T}/distccd" || die |
159 |
if use avahi; then |
160 |
cat >> "${T}/distccd" <<-EOF |
161 |
|
162 |
# Enable zeroconf support in distccd |
163 |
DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" |
164 |
EOF |
165 |
|
166 |
sed -i '/ExecStart/ s|$| --zeroconf|' "${ED}"/usr/lib/systemd/system/distccd.service || die |
167 |
fi |
168 |
doconfd "${T}/distccd" || die |
169 |
|
170 |
cat > "${T}/02distcc" <<-EOF |
171 |
# This file is managed by distcc-config; use it to change these settings. |
172 |
# DISTCC_LOG and DISTCC_DIR should not be set. |
173 |
DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}" |
174 |
DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}" |
175 |
DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}" |
176 |
DISTCC_TCP_CORK="${DISTCC_TCP_CORK}" |
177 |
DISTCC_SSH="${DISTCC_SSH}" |
178 |
UNCACHED_ERR_FD="${UNCACHED_ERR_FD}" |
179 |
DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}" |
180 |
DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}" |
181 |
EOF |
182 |
doenvd "${T}/02distcc" || die |
183 |
|
184 |
keepdir "${DCCC_PATH}" || die |
185 |
|
186 |
dobin "${T}/distcc-config" || die |
187 |
|
188 |
# create the distccd pid directory |
189 |
keepdir /var/run/distccd || die |
190 |
fowners distcc:daemon /var/run/distccd || die |
191 |
|
192 |
if use gnome || use gtk; then |
193 |
einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" |
194 |
einfo "This is to have a little sensability in naming schemes between distccmon programs" |
195 |
mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die |
196 |
dosym distccmon-gui /usr/bin/distccmon-gnome || die |
197 |
fi |
198 |
|
199 |
if use xinetd; then |
200 |
insinto /etc/xinetd.d || die |
201 |
newins "doc/example/xinetd" distcc || die |
202 |
fi |
203 |
|
204 |
rm -r "${ED}/etc/default" || die |
205 |
rm "${ED}/etc/distcc/clients.allow" || die |
206 |
rm "${ED}/etc/distcc/commands.allow.sh" || die |
207 |
} |
208 |
|
209 |
pkg_postinst() { |
210 |
if [ -x "${EPREFIX}/usr/bin/distcc-config" ] ; then |
211 |
if use crossdev; then |
212 |
"${EPREFIX}/usr/bin/distcc-config" --update-masquerade-with-crossdev |
213 |
else |
214 |
"${EPREFIX}/usr/bin/distcc-config" --update-masquerade |
215 |
fi |
216 |
fi |
217 |
|
218 |
use gnome && fdo-mime_desktop_database_update |
219 |
|
220 |
elog |
221 |
elog "Tips on using distcc with Gentoo can be found at" |
222 |
elog "http://www.gentoo.org/doc/en/distcc.xml" |
223 |
elog |
224 |
elog "How to use pump mode with Gentoo:" |
225 |
elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\"" |
226 |
elog "# echo 'FEATURES=\"\${FEATURES} distcc distcc-pump\"' >> /etc/make.conf" |
227 |
elog "# emerge -u world" |
228 |
elog |
229 |
elog "To use the distccmon programs with Gentoo you should use this command:" |
230 |
elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5" |
231 |
|
232 |
if use gnome || use gtk; then |
233 |
elog "Or:" |
234 |
elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome" |
235 |
fi |
236 |
|
237 |
elog |
238 |
elog "***SECURITY NOTICE***" |
239 |
elog "If you are upgrading distcc please make sure to run etc-update to" |
240 |
elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" |
241 |
elog "added security precautions (the --listen and --allow directives)" |
242 |
elog |
243 |
} |
244 |
|
245 |
pkg_postrm() { |
246 |
# delete the masquerade directory |
247 |
if [ ! -f "${EPREFIX}/usr/bin/distcc" ] ; then |
248 |
einfo "Remove masquerade symbolic links." |
249 |
rm "${EPREFIX}${DCCC_PATH}/"*{cc,c++,gcc,g++} |
250 |
rmdir "${EPREFIX}${DCCC_PATH}" |
251 |
fi |
252 |
|
253 |
use gnome && fdo-mime_desktop_database_update |
254 |
} |