Preliminary distcc upgrade.

Crosscompilation patch is ported.

9 files changed, 732 insertions, 9 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index eb6a766..135860f 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for sys-devel/distcc
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.210 2011/03/30 11:12:30 angelos Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.215 2012/05/04 07:24:15 jdhore Exp $
+
+  04 May 2012; Jeff Horelick <jdhore@gentoo.org> distcc-2.18.3-r10.ebuild,
+  distcc-3.0-r4.ebuild, distcc-3.1-r5.ebuild, distcc-3.1-r6.ebuild,
+  distcc-3.2_rc1.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  10 Feb 2012; Patrick Lauer <patrick@gentoo.org> distcc-3.2_rc1.ebuild:
+  Changing python deps in preparation for 2.4 removal
+
+*distcc-3.1-r6 (09 Jan 2012)
+
+  09 Jan 2012; Alex Alexander <wired@gentoo.org> +distcc-3.1-r6.ebuild,
+  +files/distcc-3.1-argc-fix.patch:
+  added patch that increases argc properly, fixing virtualbox compilation.
+  acked by xarthisius and Ultrabug, bug #351979
+
+  27 Dec 2011; Ultrabug <ultrabug@gentoo.org> files/3.1/init:
+  Fix 3.1 series init script wrt #390063 thanks to André-Sebastian Liebe.
+
+*distcc-3.2_rc1 (28 Oct 2011)
+
+  28 Oct 2011; MATSUU Takuto <matsuu@gentoo.org> -distcc-3.1-r4.ebuild,
+  +files/distcc-config-3.2_rc1, +distcc-3.2_rc1.ebuild,
+  +files/distcc-3.2_rc1-freedesktop.patch, +files/distcc-3.2_rc1-gssapi.patch,
+  +files/distcc-3.2_rc1-python.patch, metadata.xml:
+  Version bumped. Removed old version.
 
   30 Mar 2011; Christoph Mende <angelos@gentoo.org> distcc-2.18.3-r10.ebuild,
   distcc-3.0-r4.ebuild, distcc-3.1-r4.ebuild:
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 5e4debe..e892988 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,13 +1,19 @@
 AUX 3.0/conf 1286 RMD160 52f0fb469fc83b2f28f032c81515773d09add0d5 SHA1 4860a6e2eea10d918058b0cdcb76ac196a2d7992 SHA256 28fa9a9ce30c9f979eac3d5be3fc64f199ecffa9d7e38e02f11957019152dc46
 AUX 3.0/distcc-config 3402 RMD160 ef72502f3b69d86884fcc038d84105be46b952f2 SHA1 bbef02b51241439f64a679c72b69428035a8c2a8 SHA256 b37627554a6b55671770dd005c85a68a3db83a0b9a5669517c11064b76086e71
-AUX 3.1/init 776 RMD160 a25d940287d0b87d2f9929d5a9f74ba7253124c6 SHA1 405eea7cb18b2c6015e0dada8878bcec2b8d09f7 SHA256 a902eccf102174e1ebb552cf8d078d42105787cfd8d9b11a120143a5131af98b
+AUX 3.1/init 778 RMD160 4f8a3411315663074ef43a70e4ac8bbdebafc4b4 SHA1 87e7ef465be6b2c332c38a7f1c8e4ec5474c7d50 SHA256 f5c66a7212eb91f3dec55287a6c2b703b390c6894a933e51592f2762db7d2f73
 AUX distcc-3.0-fix-fortify.patch 313 RMD160 e5edc96a4bc4fe06a58878011cbb466184946b3e SHA1 386ee72a9d0b620dfc3aa75324060f764ed44e6d SHA256 7b57ae28dcef0c1ecd273a8a10dd1a16fa6a7af618d5438e1fe4398863fa8901
 AUX distcc-3.0-xinetd.patch 558 RMD160 c69f8a379ec543972fac6ec3066989c5393223f3 SHA1 58d4393c6cdd3546f35efc57021de496c66c239d SHA256 9ef11743e91167548ac6324aa21608a62fd09149a8dbdbab32602f70804e0560
 AUX distcc-3.1-crosscompile.patch 4967 RMD160 47a76a5185224cb0a8289921ab9e575118a7799d SHA1 40ac3881eee04512645f40c286a3483c2cb6a5d7 SHA256 2522c3b0dc397424344cd80eaa66f6c6269fcdcca642e97d0835d60fc1b45686
 AUX distcc-3.1-freedesktop.patch 2959 RMD160 e2d503b80174709d0c416fd4feea8414e4a7900c SHA1 007161b1bec7a8d5b70e46077b307de21e2a7e1c SHA256 bf8694f4d1eb5e757615929bc58587f538ce733891097eb42204423cab644798
 AUX distcc-3.1-python.patch 10754 RMD160 6f4f5b2e8ec24ea969002cb00fc3d4a624edc65a SHA1 34f73e4f0494066be528339e5ac0956fb95414da SHA256 8ba3c0745a30b5901cfb37f4231d754e5779cbc5a6fa173fb196661d2a035cc2
+AUX distcc-3.2_rc1-crosscompile.patch 5029 RMD160 3b763c1b81390bd4565b50ec9426e3f0da967191 SHA1 5419d3effeadcecced0a735f637f1ceb71417406 SHA256 98f878fec98e19011505a4d43ee4719e615a76863af8d0e15c19784c9cd43fef
+AUX distcc-3.2_rc1-freedesktop.patch 3140 RMD160 7402c835493978e3a2e4b338bf783f1958f7694b SHA1 b117588006f1b3d6de3bb7034f0fa303c1957f1d SHA256 7ead1174fc170cee5c32ac183edf0c15ae35df56bedbbf6bc24c0099fe23b7f6
+AUX distcc-3.2_rc1-gssapi.patch 1638 RMD160 88adbe60a6818075a7153ed99a638cb46418c86c SHA1 a911bdef83ca0d17dcbc7121e4dc71987c5fb6ce SHA256 2693fbf5b76ab64874e0a4bc1540067f402799dfabde5202a89ec045f1d88ea0
+AUX distcc-3.2_rc1-python.patch 10592 RMD160 fd8af66d2470fd9a6823765fafd726d5a8a3b64c SHA1 21dba21ddd532c74f8ba337555bcb352b30c02be SHA256 935328943efe26f20bfb94952bc8bcb7f8536465db72411d81e6f3d1ade37989
 AUX distcc-hardened.patch 1084 RMD160 0f11c9c8e8b56e91399b054fb57566e290a0baa5 SHA1 746f1905a9bc45ea7b71d71f4b1feba7d96d0f7f SHA256 dcf63f201cb7f4bf13eeb1485a5056c64370b9239d28e4acc77a47046dcda6cf
 DIST distcc-3.1.tar.bz2 588820 RMD160 82229c230e6917b0df7db275460579b02dbf6b60 SHA1 30663e8ff94f13c0553fbfb928adba91814e1b3a SHA256 f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89
+DIST distcc-3.2rc1.tar.bz2 609904 RMD160 505447b910d90ea403a98fe0d0a3a0fa92cd7039 SHA1 7564e4a4890ad6ff78ec0de620329b71179361e7 SHA256 311671e844625d7fdb18dd3d096cd855751cfe8de13827682bcb7beff9133b30
 EBUILD distcc-3.1-r5.ebuild 4786 RMD160 b204ebbac855bd5e02543062cd21f566852c6c98 SHA1 00dc1b4b045b49bf1c292ca9552c460b53d0e6a8 SHA256 69677c61c50012ae74bd9f0f81afb1472fd8237e19a31382d9440137af75e7b0
-MISC ChangeLog 37945 RMD160 194b1ca1f7a3af2385425f98a65b0432cbc19b94 SHA1 37e7a8590bcc78dc01356e72be4d4abcd22cb878 SHA256 7da6e03d65adbe95b3f060422ecd38826cb6188360cc9e4d0a1065a40acdf423
-MISC metadata.xml 372 RMD160 39cf4903218a1394a2dbbe5b4b5f53bda0b3791a SHA1 f68a302b90535835e7119f9701d445a5dfc05129 SHA256 25318fa35e9a311cf00b5ce32d90e524e17599eb8c091de96547030a647e80f4
+EBUILD distcc-3.2_rc1.ebuild 5866 RMD160 661416401f534e4a616e1782edab3c96336412ca SHA1 2c6163befb66031637a16bdf7c8239465c7198fa SHA256 d2fcd69552e0807c8262f4e8f484bf45a021ac41af8bfbd4e6acfe6eab43d69e
+MISC ChangeLog 39013 RMD160 ed5599776bf39550454122f8cfe6694df6161f75 SHA1 cc8d97d75c630738edaaf6c26985fa4b3f73f2f7 SHA256 14cb2096de869443987101c0540d479ab3554d9bfca2058579986048833a5e36
+MISC metadata.xml 546 RMD160 51a7caedb84842f9efa58ce9ec9da75b60e9378d SHA1 0d8767f8e7ca64a5c2c00eb4c20102955c2c12c1 SHA256 e94ab6ea446d8831bc33afa52dc75b25255bef5a05a1c2af22ba5b1ffc8d55d8
diff --git a/sys-devel/distcc/distcc-3.2_rc1.ebuild b/sys-devel/distcc/distcc-3.2_rc1.ebuild
new file mode 100644
index 0000000..88ba2d7
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.2_rc1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1.ebuild,v 1.3 2012/05/04 07:24:15 jdhore Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+
+inherit autotools eutils fdo-mime flag-o-matic multilib python toolchain-funcs
+
+MY_P="${P/_}"
+DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
+HOMEPAGE="http://distcc.org/"
+SRC_URI="http://distcc.googlecode.com/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="avahi crossdev gnome gssapi gtk hardened ipv6 selinux xinetd"
+
+RESTRICT="test"
+
+RDEPEND="dev-libs/popt
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	gnome? (
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	gssapi? ( net-libs/libgssglue )
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	!net-misc/pump
+	>=sys-devel/gcc-config-1.4.1
+	selinux? ( sec-policy/selinux-distcc )
+	xinetd? ( sys-apps/xinetd )"
+
+S="${WORKDIR}/${MY_P}"
+
+DCCC_PATH="/usr/$(get_libdir)/distcc/bin"
+
+pkg_setup() {
+	enewuser distcc 240 -1 -1 daemon
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.0-xinetd.patch"
+	# bug #253786
+	epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch"
+	# bug #255188
+	epatch "${FILESDIR}/${PN}-3.2_rc1-freedesktop.patch"
+	# bug #258364
+	epatch "${FILESDIR}/${PN}-3.2_rc1-python.patch"
+	# for net-libs/libgssglue
+	epatch "${FILESDIR}/${PN}-3.2_rc1-gssapi.patch"
+	# for cross-compiling
+	epatch "${FILESDIR}/${P}-crosscompile.patch"
+
+	# Bugs #120001, #167844 and probably more. See patch for description.
+	use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
+
+	python_convert_shebangs -r $(python_get_version) .
+	sed -i \
+		-e "/PATH/s:\$distcc_location:${EPREFIX}${DCCC_PATH}:" \
+		-e "s:@PYTHON@:${EPREFIX}$(PYTHON -a):" \
+		pump.in || die "sed failed"
+
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX:-/}:" \
+		-e "s:@libdir@:/usr/$(get_libdir):" \
+		"${FILESDIR}/distcc-config-3.2_rc1" > "${T}/distcc-config" || die
+
+	eaclocal -Im4 --output=aclocal.m4
+	eautoconf
+}
+
+src_configure() {
+	local myconf="--disable-Werror"
+	# More legacy stuff?
+	[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags
+
+	# --disable-rfc2553 b0rked, bug #254176
+	use ipv6 && myconf="${myconf} --enable-rfc2553"
+
+	econf \
+		$(use_with avahi) \
+		$(use_with gtk) \
+		$(use_with gnome) \
+		$(use_with gssapi auth) \
+		--with-docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		${myconf} || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dobin "${FILESDIR}/3.0/distcc-config" || die
+
+	newinitd "${FILESDIR}/3.1/init" distccd || die
+
+	cp "${FILESDIR}/3.0/conf" "${T}/distccd" || die
+	if use avahi; then
+		cat >> "${T}/distccd" <<-EOF
+
+		# Enable zeroconf support in distccd
+		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
+		EOF
+	fi
+	doconfd "${T}/distccd" || die
+
+	cat > "${T}/02distcc" <<-EOF
+	# This file is managed by distcc-config; use it to change these settings.
+	# DISTCC_LOG and DISTCC_DIR should not be set.
+	DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
+	DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
+	DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
+	DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
+	DISTCC_SSH="${DISTCC_SSH}"
+	UNCACHED_ERR_FD="${UNCACHED_ERR_FD}"
+	DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}"
+	DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}"
+	EOF
+	doenvd "${T}/02distcc" || die
+
+	keepdir "${DCCC_PATH}" || die
+
+	dobin "${T}/distcc-config" || die
+
+	# create the distccd pid directory
+	keepdir /var/run/distccd || die
+	fowners distcc:daemon /var/run/distccd || die
+
+	if use gnome || use gtk; then
+		einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
+		einfo "This is to have a little sensability in naming schemes between distccmon programs"
+		mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
+		dosym distccmon-gui /usr/bin/distccmon-gnome || die
+	fi
+
+	if use xinetd; then
+		insinto /etc/xinetd.d || die
+		newins "doc/example/xinetd" distcc || die
+	fi
+
+	rm -r "${ED}/etc/default" || die
+	rm "${ED}/etc/distcc/clients.allow" || die
+	rm "${ED}/etc/distcc/commands.allow.sh" || die
+}
+
+pkg_postinst() {
+	if [ -x "${EPREFIX}/usr/bin/distcc-config" ] ; then
+		if use crossdev; then
+			"${EPREFIX}/usr/bin/distcc-config" --update-masquerade-with-crossdev
+		else
+			"${EPREFIX}/usr/bin/distcc-config" --update-masquerade
+		fi
+	fi
+
+	python_mod_optimize include_server
+	use gnome && fdo-mime_desktop_database_update
+
+	elog
+	elog "Tips on using distcc with Gentoo can be found at"
+	elog "http://www.gentoo.org/doc/en/distcc.xml"
+	elog
+	elog "How to use pump mode with Gentoo:"
+	elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\""
+	elog "# echo 'FEATURES=\"\${FEATURES} distcc distcc-pump\"' >> /etc/make.conf"
+	elog "# emerge -u world"
+	elog
+	elog "To use the distccmon programs with Gentoo you should use this command:"
+	elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
+
+	if use gnome || use gtk; then
+		elog "Or:"
+		elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
+	fi
+
+	elog
+	elog "***SECURITY NOTICE***"
+	elog "If you are upgrading distcc please make sure to run etc-update to"
+	elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with"
+	elog "added security precautions (the --listen and --allow directives)"
+	elog
+}
+
+pkg_postrm() {
+	# delete the masquerade directory
+	if [ ! -f "${EPREFIX}/usr/bin/distcc" ] ; then
+		einfo "Remove masquerade symbolic links."
+		rm "${EPREFIX}${DCCC_PATH}/"*{cc,c++,gcc,g++}
+		rmdir "${EPREFIX}${DCCC_PATH}"
+	fi
+
+	python_mod_cleanup include_server
+	use gnome && fdo-mime_desktop_database_update
+}
diff --git a/sys-devel/distcc/files/3.1/init b/sys-devel/distcc/files/3.1/init
index 7c4277c..02a9dc2 100755
--- a/sys-devel/distcc/files/3.1/init
+++ b/sys-devel/distcc/files/3.1/init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/3.1/init,v 1.1 2009/03/19 17:56:09 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/3.1/init,v 1.2 2011/12/27 16:09:23 ultrabug Exp $
 
 depend() {
 	need net
@@ -19,8 +19,8 @@ start() {
 	# Load PATH and GCC_SPECS from gcc-config, bug #262773
 	eval "$(gcc-config -E)"
 
-	start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" -- \
-		--daemon --pid-file "${DISTCCD_PIDFILE}" --user distcc \
+	start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" --user distcc -- \
+		--daemon --pid-file "${DISTCCD_PIDFILE}" \
 		${DISTCCD_OPTS}
 	eend $?
 }
diff --git a/sys-devel/distcc/files/distcc-3.2_rc1-crosscompile.patch b/sys-devel/distcc/files/distcc-3.2_rc1-crosscompile.patch
new file mode 100644
index 0000000..a52d9e8
--- /dev/null
+++ b/sys-devel/distcc/files/distcc-3.2_rc1-crosscompile.patch
@@ -0,0 +1,125 @@
+diff -Naur distcc-3.2rc1/src/compile.c distcc-3.2rc1.new/src/compile.c
+--- distcc-3.2rc1/src/compile.c	2011-04-05 22:58:58.000000000 +0400
++++ distcc-3.2rc1.new/src/compile.c	2012-05-23 10:20:17.069363983 +0400
+@@ -379,7 +379,7 @@
+ 
+     /* We don't do any redirection of file descriptors when running locally,
+      * so if for example cpp is being used in a pipeline we should be fine. */
+-    if ((ret = dcc_spawn_child(argv, &pid, NULL, NULL, NULL)) != 0)
++    if ((ret = dcc_spawn_child(argv, &pid, NULL, NULL, NULL, 1)) != 0)
+         return ret;
+ 
+     if ((ret = dcc_collect_child("cc", pid, &status, timeout_null_fd)))
+diff -Naur distcc-3.2rc1/src/cpp.c distcc-3.2rc1.new/src/cpp.c
+--- distcc-3.2rc1/src/cpp.c	2008-12-03 00:50:24.000000000 +0300
++++ distcc-3.2rc1.new/src/cpp.c	2012-05-23 10:20:17.069363983 +0400
+@@ -97,5 +97,5 @@
+     /* FIXME: cpp_argv is leaked */
+ 
+     return dcc_spawn_child(cpp_argv, cpp_pid,
+-                           "/dev/null", *cpp_fname, NULL);
++                           "/dev/null", *cpp_fname, NULL, 1);
+ }
+diff -Naur distcc-3.2rc1/src/exec.c distcc-3.2rc1.new/src/exec.c
+--- distcc-3.2rc1/src/exec.c	2011-04-05 22:58:58.000000000 +0400
++++ distcc-3.2rc1.new/src/exec.c	2012-05-23 10:29:50.225179904 +0400
+@@ -80,10 +80,11 @@
+ static void dcc_inside_child(char **argv,
+                              const char *stdin_file,
+                              const char *stdout_file,
+-                             const char *stderr_file) NORETURN;
++                             const char *stderr_file,
++                             const char local) NORETURN;
+ 
+ 
+-static void dcc_execvp(char **argv) NORETURN;
++static void dcc_execvp(char **argv, const char local) NORETURN;
+ 
+ void dcc_note_execution(struct dcc_hostdef *host, char **argv)
+ {
+@@ -242,12 +243,20 @@
+  *
+  * Does not return, either execs the compiler in place, or exits with
+  * a message.
++ *
++ * local -- determines compile host type, on remote targets
++ * special crosscompile-friendly check must be done, but on local
++ * targets it will broke things
++ *
+  **/
+-static void dcc_execvp(char **argv)
++static void dcc_execvp(char **argv, const char local)
+ {
+     char *slash;
+ 
+-    execvp(argv[0], argv);
++    /* do not exectute full path mindlessly, this breaks
++     * cross-compilation for names like gcc, g++, etc */
++    if (local || argv[0][0] != '/')
++        execvp(argv[0], argv);
+ 
+     /* If we're still running, the program was not found on the path.  One
+      * thing that might have happened here is that the client sent an absolute
+@@ -290,7 +299,8 @@
+ static void dcc_inside_child(char **argv,
+                              const char *stdin_file,
+                              const char *stdout_file,
+-                             const char *stderr_file)
++                             const char *stderr_file,
++                             const char local)
+ {
+     int ret;
+ 
+@@ -334,7 +344,7 @@
+     if ((ret = dcc_redirect_fds(stdin_file, stdout_file, stderr_file)))
+         goto fail;
+ 
+-    dcc_execvp(argv);
++    dcc_execvp(argv, local);
+ 
+     ret = EXIT_DISTCC_FAILED;
+ 
+@@ -378,7 +388,8 @@
+ int dcc_spawn_child(char **argv, pid_t *pidptr,
+                     const char *stdin_file,
+                     const char *stdout_file,
+-                    const char *stderr_file)
++                    const char *stderr_file,
++                    const char local)
+ {
+     pid_t pid;
+ 
+@@ -400,7 +411,7 @@
+             if (dcc_new_pgrp() != 0)
+                 rs_trace("Unable to start a new group\n");
+         }
+-        dcc_inside_child(argv, stdin_file, stdout_file, stderr_file);
++        dcc_inside_child(argv, stdin_file, stdout_file, stderr_file, local);
+         /* !! NEVER RETURN FROM HERE !! */
+     } else {
+         *pidptr = pid;
+diff -Naur distcc-3.2rc1/src/exec.h distcc-3.2rc1.new/src/exec.h
+--- distcc-3.2rc1/src/exec.h	2008-12-03 00:50:24.000000000 +0300
++++ distcc-3.2rc1.new/src/exec.h	2012-05-23 10:20:17.069363983 +0400
+@@ -30,7 +30,8 @@
+                      const char *stderr_file);
+ 
+ int dcc_spawn_child(char **argv, pid_t *pidptr,
+-                    const char *, const char *, const char *);
++                    const char *, const char *, const char *,
++                    const char local);
+ 
+ /* if in_fd is timeout_null_fd, means this parameter is not used */
+ int dcc_collect_child(const char *what, pid_t pid,
+diff -Naur distcc-3.2rc1/src/serve.c distcc-3.2rc1.new/src/serve.c
+--- distcc-3.2rc1/src/serve.c	2011-04-06 00:53:20.000000000 +0400
++++ distcc-3.2rc1.new/src/serve.c	2012-05-23 10:20:17.069363983 +0400
+@@ -679,7 +679,7 @@
+         goto out_cleanup;
+ 
+     if ((compile_ret = dcc_spawn_child(argv, &cc_pid,
+-                                       "/dev/null", out_fname, err_fname))
++                                       "/dev/null", out_fname, err_fname, 0))
+         || (compile_ret = dcc_collect_child("cc", cc_pid, &status, in_fd))) {
+         /* We didn't get around to finding a wait status from the actual
+          * compiler */
diff --git a/sys-devel/distcc/files/distcc-3.2_rc1-freedesktop.patch b/sys-devel/distcc/files/distcc-3.2_rc1-freedesktop.patch
new file mode 100644
index 0000000..8f0d8d7
--- /dev/null
+++ b/sys-devel/distcc/files/distcc-3.2_rc1-freedesktop.patch
@@ -0,0 +1,79 @@
+diff -Naur distcc-3.2rc1.orig/Makefile.in distcc-3.2rc1/Makefile.in
+--- distcc-3.2rc1.orig/Makefile.in	2011-10-26 11:07:15.000000000 +0900
++++ distcc-3.2rc1/Makefile.in	2011-10-27 16:57:46.815272689 +0900
+@@ -50,13 +50,14 @@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+ docdir = @docdir@
+-pkgdatadir = $(datadir)/@PACKAGE_NAME@
++icondir = $(datadir)/pixmaps
++desktopdir = $(datadir)/applications
+ 
+ include_server_builddir = $(builddir)/_include_server
+ 
+ # These must be done from here, not from autoconf, because they can 
+ # contain variable expansions written in Make syntax.  Ew.
+-DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\""
++DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\""
+ 
+ # arguments to pkgconfig
+ GNOME_PACKAGES = @GNOME_PACKAGES@
+@@ -1016,7 +1017,8 @@
+ 	@echo "  documents            $(DESTDIR)$(docdir)"
+ 	@echo "  programs             $(DESTDIR)$(bindir)"
+ 	@echo "  system configuration $(DESTDIR)$(sysconfdir)"
+-	@echo "  shared data files    $(DESTDIR)$(pkgdatadir)"
++	@echo "  icons                $(DESTDIR)$(icondir)"
++	@echo "  .desktop file        $(DESTDIR)$(desktopdir)"
+ 
+ 
+ # install-sh can't handle multiple arguments, but we don't need any
+@@ -1108,10 +1110,10 @@
+ 	done
+ 
+ install-gnome-data: $(gnome_data)
+-	$(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)"
+-	for p in $(gnome_data); do \
+-	  $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+-	done
++	$(mkinstalldirs) "$(DESTDIR)$(icondir)"
++	$(mkinstalldirs) "$(DESTDIR)$(desktopdir)"
++	$(INSTALL_DATA) gnome/distccmon-gnome-icon.png "$(DESTDIR)$(icondir)" || exit 1
++	$(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" || exit 1
+ 
+ install-conf: $(conf_files) $(default_files)
+ 	$(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc"
+diff -Naur distcc-3.2rc1.orig/gnome/distccmon-gnome.desktop distcc-3.2rc1/gnome/distccmon-gnome.desktop
+--- distcc-3.2rc1.orig/gnome/distccmon-gnome.desktop	2011-04-06 03:58:58.000000000 +0900
++++ distcc-3.2rc1/gnome/distccmon-gnome.desktop	2011-10-27 17:01:50.792242592 +0900
+@@ -1,6 +1,4 @@
+ [Desktop Entry]
+-Version=0.9.4
+-Encoding=UTF-8
+ Exec=distccmon-gnome
+ Name=distcc monitor
+ Name[sv]=distcc övervakare
+@@ -8,9 +6,9 @@
+ GenericName[sv]=Distribuerad kompilerings-övervakare
+ Comment=Graphical view of distributed compile tasks
+ Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter
+-Icon=distccmon-gnome-icon.png
++Icon=distccmon-gnome-icon
+ TryExec=distccmon-gnome
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;Development;
++Categories=GNOME;Development;
+ StartupNotify=true
+diff -Naur distcc-3.2rc1.orig/src/mon-gnome.c distcc-3.2rc1/src/mon-gnome.c
+--- distcc-3.2rc1.orig/src/mon-gnome.c	2008-12-03 06:50:25.000000000 +0900
++++ distcc-3.2rc1/src/mon-gnome.c	2011-10-27 16:54:50.220566026 +0900
+@@ -599,7 +599,7 @@
+ 
+ #if GTK_CHECK_VERSION(2,2,0)
+   gtk_window_set_icon_from_file (GTK_WINDOW (mainwin),
+-                                 PKGDATADIR "/distccmon-gnome-icon.png",
++                                 ICONDIR "/distccmon-gnome-icon.png",
+                                  NULL);
+ #endif
+ 
diff --git a/sys-devel/distcc/files/distcc-3.2_rc1-gssapi.patch b/sys-devel/distcc/files/distcc-3.2_rc1-gssapi.patch
new file mode 100644
index 0000000..73551f8
--- /dev/null
+++ b/sys-devel/distcc/files/distcc-3.2_rc1-gssapi.patch
@@ -0,0 +1,36 @@
+diff -Naur distcc-3.2rc1.orig/configure.ac distcc-3.2rc1/configure.ac
+--- distcc-3.2rc1.orig/configure.ac	2011-10-21 13:40:55.000000000 +0900
++++ distcc-3.2rc1/configure.ac	2011-10-27 18:06:58.938922585 +0900
+@@ -15,6 +15,8 @@
+ AC_CONFIG_HEADERS(src/config.h)
+ AC_CANONICAL_HOST
+ 
++PKG_PROG_PKG_CONFIG
++
+ # FreeBSD installs its version of libpopt into /usr/local/, but does
+ # not put that on the default library and header path.
+ # Solaris doesn't even ship libpopt.  We used to add that path if
+@@ -502,16 +504,17 @@
+ 	    [provide mutual authentication services via the GSS-API])])
+ 
+ if test x"$with_auth" = xyes; then
+-        AC_SEARCH_LIBS([gss_init_sec_context],
+-                        [gssapi gssapi_krb5],
+-	                AC_DEFINE(HAVE_GSSAPI, 1, [Define if the GSS_API is available])
++        PKG_CHECK_MODULES(GSSAPI, libgssglue,
++	                [AC_DEFINE(HAVE_GSSAPI, 1, [Define if the GSS_API is available])
++	                CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
++	                LIBS="$LIBS $GSSAPI_LIBS"
+ 	                AUTH_COMMON_OBJS="src/auth_common.o"
+ 	                AUTH_DISTCC_OBJS="src/auth_distcc.o"
+-	                AUTH_DISTCCD_OBJS="src/auth_distccd.o",
+-	                AC_MSG_FAILURE([--with-auth was given but no GSS-API library found])
++	                AUTH_DISTCCD_OBJS="src/auth_distccd.o"],
++	                [AC_MSG_FAILURE([--with-auth was given but no GSS-API library found])
+ 	                AUTH_COMMON_OBJS=""
+                         AUTH_DISTCC_OBJS=""
+-                        AUTH_DISTCCD_OBJS="")
++                        AUTH_DISTCCD_OBJS=""])
+ fi
+ 
+ AC_SUBST(AUTH_COMMON_OBJS)
diff --git a/sys-devel/distcc/files/distcc-3.2_rc1-python.patch b/sys-devel/distcc/files/distcc-3.2_rc1-python.patch
new file mode 100644
index 0000000..409b5a1
--- /dev/null
+++ b/sys-devel/distcc/files/distcc-3.2_rc1-python.patch
@@ -0,0 +1,246 @@
+diff -Naur distcc-3.2rc1.orig/bench/statistics.py distcc-3.2rc1/bench/statistics.py
+--- distcc-3.2rc1.orig/bench/statistics.py	2008-12-03 06:50:21.000000000 +0900
++++ distcc-3.2rc1/bench/statistics.py	2011-10-27 17:05:08.418023081 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python2.2
++#! /usr/bin/env python
+ 
+ # benchmark -- automated system for testing distcc correctness
+ # and performance on various source trees.
+diff -Naur distcc-3.2rc1.orig/configure.ac distcc-3.2rc1/configure.ac
+--- distcc-3.2rc1.orig/configure.ac	2011-10-21 13:40:55.000000000 +0900
++++ distcc-3.2rc1/configure.ac	2011-10-27 17:05:31.179112690 +0900
+@@ -243,7 +243,7 @@
+ #
+ # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present
+ # in autoconf 2.53.
+-AC_PATH_PROGS(PYTHON, [python2.6 python-2.6 python2.5 python-2.5 python2.4 python-2.4 python])
++AC_PATH_PROGS(PYTHON, [python])
+ AC_ARG_VAR(PYTHON, [Python interpreter])
+ # Python 1 doesn't even support -V
+ if ! "$PYTHON" -V 2>&1 | grep "^Python" >/dev/null; then
+diff -Naur distcc-3.2rc1.orig/include_server/basics.py distcc-3.2rc1/include_server/basics.py
+--- distcc-3.2rc1.orig/include_server/basics.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/basics.py	2011-10-27 17:05:08.421023097 +0900
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.4
++#!/usr/bin/python
+ #
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/basics_test.py distcc-3.2rc1/include_server/basics_test.py
+--- distcc-3.2rc1.orig/include_server/basics_test.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/basics_test.py	2011-10-27 17:05:08.421023097 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4
++#! /usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/c_extensions_test.py distcc-3.2rc1/include_server/c_extensions_test.py
+--- distcc-3.2rc1.orig/include_server/c_extensions_test.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/c_extensions_test.py	2011-10-27 17:05:08.421023097 +0900
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.4
++#!/usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/cache_basics.py distcc-3.2rc1/include_server/cache_basics.py
+--- distcc-3.2rc1.orig/include_server/cache_basics.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/cache_basics.py	2011-10-27 17:05:08.422023101 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4
++#! /usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/compiler_defaults.py distcc-3.2rc1/include_server/compiler_defaults.py
+--- distcc-3.2rc1.orig/include_server/compiler_defaults.py	2011-04-06 03:58:59.000000000 +0900
++++ distcc-3.2rc1/include_server/compiler_defaults.py	2011-10-27 17:05:08.422023101 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4
++#! /usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/compress_files.py distcc-3.2rc1/include_server/compress_files.py
+--- distcc-3.2rc1.orig/include_server/compress_files.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/compress_files.py	2011-10-27 17:05:08.422023101 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4
++#! /usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/include_analyzer.py distcc-3.2rc1/include_server/include_analyzer.py
+--- distcc-3.2rc1.orig/include_server/include_analyzer.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/include_analyzer.py	2011-10-27 17:05:08.422023101 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4
++#! /usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/include_analyzer_memoizing_node.py distcc-3.2rc1/include_server/include_analyzer_memoizing_node.py
+--- distcc-3.2rc1.orig/include_server/include_analyzer_memoizing_node.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/include_analyzer_memoizing_node.py	2011-10-27 17:05:08.422023101 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4
++#! /usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/include_analyzer_memoizing_node_test.py distcc-3.2rc1/include_server/include_analyzer_memoizing_node_test.py
+--- distcc-3.2rc1.orig/include_server/include_analyzer_memoizing_node_test.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/include_analyzer_memoizing_node_test.py	2011-10-27 17:05:08.423023105 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4 
++#! /usr/bin/python 
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/include_analyzer_test.py distcc-3.2rc1/include_server/include_analyzer_test.py
+--- distcc-3.2rc1.orig/include_server/include_analyzer_test.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/include_analyzer_test.py	2011-10-27 17:05:08.423023105 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4
++#! /usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/include_server.py distcc-3.2rc1/include_server/include_server.py
+--- distcc-3.2rc1.orig/include_server/include_server.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/include_server.py	2011-10-27 17:05:08.423023105 +0900
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.4
++#!/usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/include_server_test.py distcc-3.2rc1/include_server/include_server_test.py
+--- distcc-3.2rc1.orig/include_server/include_server_test.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/include_server_test.py	2011-10-27 17:05:08.423023105 +0900
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.4
++#!/usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/macro_eval.py distcc-3.2rc1/include_server/macro_eval.py
+--- distcc-3.2rc1.orig/include_server/macro_eval.py	2011-04-06 03:58:59.000000000 +0900
++++ distcc-3.2rc1/include_server/macro_eval.py	2011-10-27 17:05:08.423023105 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4
++#! /usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/macro_eval_test.py distcc-3.2rc1/include_server/macro_eval_test.py
+--- distcc-3.2rc1.orig/include_server/macro_eval_test.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/macro_eval_test.py	2011-10-27 17:05:08.423023105 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4
++#! /usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/mirror_path.py distcc-3.2rc1/include_server/mirror_path.py
+--- distcc-3.2rc1.orig/include_server/mirror_path.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/mirror_path.py	2011-10-27 17:05:08.424023109 +0900
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.4
++#!/usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/mirror_path_test.py distcc-3.2rc1/include_server/mirror_path_test.py
+--- distcc-3.2rc1.orig/include_server/mirror_path_test.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/mirror_path_test.py	2011-10-27 17:05:08.424023109 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4
++#! /usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/parse_command.py distcc-3.2rc1/include_server/parse_command.py
+--- distcc-3.2rc1.orig/include_server/parse_command.py	2011-04-06 03:58:59.000000000 +0900
++++ distcc-3.2rc1/include_server/parse_command.py	2011-10-27 17:05:08.424023109 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4 
++#! /usr/bin/python 
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/parse_command_test.py distcc-3.2rc1/include_server/parse_command_test.py
+--- distcc-3.2rc1.orig/include_server/parse_command_test.py	2011-04-06 03:58:59.000000000 +0900
++++ distcc-3.2rc1/include_server/parse_command_test.py	2011-10-27 17:05:08.424023109 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4
++#! /usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/parse_file.py distcc-3.2rc1/include_server/parse_file.py
+--- distcc-3.2rc1.orig/include_server/parse_file.py	2011-04-06 03:58:59.000000000 +0900
++++ distcc-3.2rc1/include_server/parse_file.py	2011-10-27 17:05:08.424023109 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4
++#! /usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/parse_file_test.py distcc-3.2rc1/include_server/parse_file_test.py
+--- distcc-3.2rc1.orig/include_server/parse_file_test.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/parse_file_test.py	2011-10-27 17:05:08.424023109 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4
++#! /usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/run.py distcc-3.2rc1/include_server/run.py
+--- distcc-3.2rc1.orig/include_server/run.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/run.py	2011-10-27 17:05:08.424023109 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4 
++#! /usr/bin/python 
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/setup.py distcc-3.2rc1/include_server/setup.py
+--- distcc-3.2rc1.orig/include_server/setup.py	2011-04-06 03:58:59.000000000 +0900
++++ distcc-3.2rc1/include_server/setup.py	2011-10-27 17:05:08.425023113 +0900
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.4
++#!/usr/bin/python
+ 
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/include_server/statistics.py distcc-3.2rc1/include_server/statistics.py
+--- distcc-3.2rc1.orig/include_server/statistics.py	2008-12-03 06:50:31.000000000 +0900
++++ distcc-3.2rc1/include_server/statistics.py	2011-10-27 17:05:08.425023113 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python2.4 
++#! /usr/bin/python 
+ #
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/test/onetest.py distcc-3.2rc1/test/onetest.py
+--- distcc-3.2rc1.orig/test/onetest.py	2008-12-03 06:50:22.000000000 +0900
++++ distcc-3.2rc1/test/onetest.py	2011-10-27 17:05:08.432023140 +0900
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.4
++#!/usr/bin/python
+ #
+ # Copyright 2007 Google Inc.
+ #
+diff -Naur distcc-3.2rc1.orig/test/testdistcc.py distcc-3.2rc1/test/testdistcc.py
+--- distcc-3.2rc1.orig/test/testdistcc.py	2011-10-21 11:40:49.000000000 +0900
++++ distcc-3.2rc1/test/testdistcc.py	2011-10-27 17:05:08.432023140 +0900
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python2.2
++#! /usr/bin/env python
+ 
+ # Copyright (C) 2002, 2003, 2004 by Martin Pool <mbp@samba.org>
+ # Copyright 2007 Google Inc.
diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml
index afc07f8..f1a9c5a 100644
--- a/sys-devel/distcc/metadata.xml
+++ b/sys-devel/distcc/metadata.xml
@@ -9,4 +9,8 @@
 		Distcc is a program to distribute compilation of C code across several
 		machines on a network.
 	</longdescription>
+	<use>
+		<flag name="crossdev">Enable support for <pkg>sys-devel/crossdev</pkg></flag>
+		<flag name="gssapi">Enable support for <pkg>net-libs/libgssglue</pkg></flag>
+	</use>
 </pkgmetadata>