1 |
matsuu 09/04/07 15:52:16 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: distcc-3.1-r4.ebuild |
5 |
Removed: distcc-3.1-r2.ebuild distcc-3.1-r1.ebuild |
6 |
Log: |
7 |
Fixed dependency related zeroconf, bug #263939. Removed old versions. |
8 |
(Portage version: 2.1.6.11/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.198 sys-devel/distcc/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/distcc/ChangeLog?rev=1.198&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/distcc/ChangeLog?rev=1.198&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/distcc/ChangeLog?r1=1.197&r2=1.198 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v |
20 |
retrieving revision 1.197 |
21 |
retrieving revision 1.198 |
22 |
diff -u -r1.197 -r1.198 |
23 |
--- ChangeLog 19 Mar 2009 17:56:09 -0000 1.197 |
24 |
+++ ChangeLog 7 Apr 2009 15:52:16 -0000 1.198 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for sys-devel/distcc |
27 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.197 2009/03/19 17:56:09 matsuu Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.198 2009/04/07 15:52:16 matsuu Exp $ |
30 |
+ |
31 |
+*distcc-3.1-r4 (07 Apr 2009) |
32 |
+ |
33 |
+ 07 Apr 2009; MATSUU Takuto <matsuu@g.o> -distcc-3.1-r1.ebuild, |
34 |
+ -distcc-3.1-r2.ebuild, +distcc-3.1-r4.ebuild: |
35 |
+ Fixed dependency related zeroconf, bug #263939. Removed old versions. |
36 |
|
37 |
*distcc-3.1-r3 (19 Mar 2009) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 sys-devel/distcc/distcc-3.1-r4.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/distcc/distcc-3.1-r4.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/distcc/distcc-3.1-r4.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: distcc-3.1-r4.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2009 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r4.ebuild,v 1.1 2009/04/07 15:52:16 matsuu Exp $ |
52 |
|
53 |
EAPI="2" |
54 |
inherit eutils fdo-mime flag-o-matic multilib toolchain-funcs |
55 |
|
56 |
DESCRIPTION="a program to distribute compilation of C code across several machines on a network" |
57 |
HOMEPAGE="http://distcc.org/" |
58 |
SRC_URI="http://distcc.googlecode.com/files/${P}.tar.bz2" |
59 |
|
60 |
LICENSE="GPL-2" |
61 |
SLOT="0" |
62 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
63 |
IUSE="avahi gnome gtk hardened ipv6 selinux xinetd" |
64 |
|
65 |
RESTRICT="test" |
66 |
|
67 |
RDEPEND=">=dev-lang/python-2.4 |
68 |
dev-libs/popt |
69 |
avahi? ( >=net-dns/avahi-0.6[dbus] ) |
70 |
gnome? ( |
71 |
>=gnome-base/libgnome-2 |
72 |
>=gnome-base/libgnomeui-2 |
73 |
>=x11-libs/gtk+-2 |
74 |
x11-libs/pango |
75 |
) |
76 |
gtk? ( |
77 |
>=x11-libs/gtk+-2 |
78 |
)" |
79 |
DEPEND="${RDEPEND} |
80 |
dev-util/pkgconfig" |
81 |
RDEPEND="${RDEPEND} |
82 |
!net-misc/pump |
83 |
>=sys-devel/gcc-config-1.4.1 |
84 |
selinux? ( sec-policy/selinux-distcc ) |
85 |
xinetd? ( sys-apps/xinetd )" |
86 |
|
87 |
DISTCC_LOG="" |
88 |
DCCC_PATH="/usr/$(get_libdir)/distcc/bin" |
89 |
DISTCC_VERBOSE="0" |
90 |
|
91 |
pkg_setup() { |
92 |
enewuser distcc 240 -1 -1 daemon |
93 |
} |
94 |
|
95 |
src_prepare() { |
96 |
epatch "${FILESDIR}/${PN}-3.0-xinetd.patch" |
97 |
# bug #253786 |
98 |
epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch" |
99 |
# bug #255188 |
100 |
epatch "${FILESDIR}/${P}-freedesktop.patch" |
101 |
# bug #258364 |
102 |
epatch "${FILESDIR}/${P}-python.patch" |
103 |
|
104 |
sed -i -e "/PATH/s:\$distcc_location:${DCCC_PATH}:" pump.in || die |
105 |
|
106 |
# Bugs #120001, #167844 and probably more. See patch for description. |
107 |
use hardened && epatch "${FILESDIR}/distcc-hardened.patch" |
108 |
} |
109 |
|
110 |
src_configure() { |
111 |
local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}" |
112 |
# More legacy stuff? |
113 |
[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags |
114 |
|
115 |
# --disable-rfc2553 b0rked, bug #254176 |
116 |
use ipv6 && myconf="${myconf} --enable-rfc2553" |
117 |
|
118 |
econf \ |
119 |
$(use_with avahi) \ |
120 |
$(use_with gtk) \ |
121 |
$(use_with gnome) \ |
122 |
${myconf} || die "econf failed" |
123 |
} |
124 |
|
125 |
src_install() { |
126 |
# In rare cases, parallel make install failed |
127 |
emake -j1 DESTDIR="${D}" install || die |
128 |
|
129 |
dobin "${FILESDIR}/3.0/distcc-config" |
130 |
|
131 |
newinitd "${FILESDIR}/${PV}/init" distccd |
132 |
|
133 |
cp "${FILESDIR}/3.0/conf" "${T}/distccd" |
134 |
if use avahi; then |
135 |
cat >> "${T}/distccd" <<-EOF |
136 |
|
137 |
# Enable zeroconf support in distccd |
138 |
DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" |
139 |
EOF |
140 |
fi |
141 |
doconfd "${T}/distccd" |
142 |
|
143 |
cat > "${T}/02distcc" <<-EOF |
144 |
# This file is managed by distcc-config; use it to change these settings. |
145 |
DISTCC_LOG="${DISTCC_LOG}" |
146 |
DCCC_PATH="${DCCC_PATH}" |
147 |
DISTCC_VERBOSE="${DISTCC_VERBOSE}" |
148 |
EOF |
149 |
doenvd "${T}/02distcc" |
150 |
|
151 |
# create the masquerade directory |
152 |
dodir "${DCCC_PATH}" |
153 |
for f in cc c++ gcc g++; do |
154 |
dosym /usr/bin/distcc "${DCCC_PATH}/${f}" |
155 |
if [ "${f}" != "cc" ]; then |
156 |
dosym /usr/bin/distcc "${DCCC_PATH}/${CTARGET:-${CHOST}}-${f}" |
157 |
fi |
158 |
done |
159 |
|
160 |
# create the distccd pid directory |
161 |
keepdir /var/run/distccd |
162 |
fowners distcc:daemon /var/run/distccd |
163 |
|
164 |
if use gnome || use gtk; then |
165 |
einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" |
166 |
einfo "This is to have a little sensability in naming schemes between distccmon programs" |
167 |
mv "${D}/usr/bin/distccmon-gnome" "${D}/usr/bin/distccmon-gui" || die |
168 |
dosym distccmon-gui /usr/bin/distccmon-gnome |
169 |
fi |
170 |
|
171 |
if use xinetd; then |
172 |
insinto /etc/xinetd.d |
173 |
newins "doc/example/xinetd" distcc |
174 |
fi |
175 |
|
176 |
rm -rf "${D}/etc/default" |
177 |
rm -f "${D}/etc/distcc/clients.allow" |
178 |
rm -f "${D}/etc/distcc/commands.allow.sh" |
179 |
prepalldocs |
180 |
} |
181 |
|
182 |
pkg_postinst() { |
183 |
use gnome && fdo-mime_desktop_database_update |
184 |
|
185 |
if use ipv6; then |
186 |
elog |
187 |
elog "IPv6 has not supported yet by ${P}." |
188 |
fi |
189 |
elog |
190 |
elog "Tips on using distcc with Gentoo can be found at" |
191 |
elog "http://www.gentoo.org/doc/en/distcc.xml" |
192 |
elog |
193 |
elog "How to use pump mode with Gentoo:" |
194 |
elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\"" |
195 |
elog "# pump emerge -u world" |
196 |
elog |
197 |
elog "To use the distccmon programs with Gentoo you should use this command:" |
198 |
elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-text 5" |
199 |
|
200 |
if use gnome || use gtk; then |
201 |
elog "Or:" |
202 |
elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-gnome" |
203 |
fi |
204 |
|
205 |
elog |
206 |
elog "***SECURITY NOTICE***" |
207 |
elog "If you are upgrading distcc please make sure to run etc-update to" |
208 |
elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" |
209 |
elog "added security precautions (the --listen and --allow directives)" |
210 |
elog |
211 |
} |
212 |
|
213 |
pkg_postrm() { |
214 |
use gnome && fdo-mime_desktop_database_update |
215 |
} |