gentoo resync : 02.06.2019

12 files changed, 3 insertions, 846 deletions

diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 25e7971f53fa..61ed76ff3058 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,11 +1,4 @@
-AUX 3.2/conf 1287 BLAKE2B 167936b142892a5a9176b080724d734ef568e108c7c017b4b3be8ef927538a62a4755f1c88dc16444c30a833af45b9254bcf0c7bbda9a1e5d3987c195c91b128 SHA512 e3c32d1bf67fa475ce7b8f6f27835ca604eca23bcb338312c3b93d59123c2747a7c45b2ba7fe19a0c3eec9dca409aa036b1c7aa3776d0f163bd06ac7bb6b2e94
-AUX 3.2/distcc-config 5212 BLAKE2B 5be838fec5e9dfa25bd12f1dd535e95078c2fc9a57e7b7615652d276cbf2e6f05df2db455bf7005a3aabe9d71d39b362b07c7b1d0ac3d2474b76575120f4c0a7 SHA512 f465b6c2a203e0b39ccf36af2098ea7b56fedf3679336b0d3ba07716e8e6edaab2b03c78e428eb6fbaab27403e397d0dec880f853eba5cec4471a67bb14a576c
-AUX 3.2/init 671 BLAKE2B 1ccb01319545b0263e15f87ad5543da5b76adfe6453d0b49b640f25b10e6d387a4ad88a5fb9faf6b15b74a73bf424e2175a0d54c5a3bd71e599cbd132afb6817 SHA512 5e1ff2c6c72ec761afac48c17e5c558617b512676a007e076f9ecbdd1f69b95ff626929952b2f5fff9a927f0422bd2fded297ad494d64c1113ea11c55dcbe605
-AUX distcc-3.0-fix-fortify.patch 313 BLAKE2B a8832bdf00ad84332397815755063cfe9f8aa4faeb369a72da5482208cddb3818ce6da60f75d3d9435e05ffe7a9267fce137ece2c96e051ec228d303f40b2008 SHA512 11f125fd12398d7e7cdcbbb2bb57d5d374fc3dda0eb88d22176c1c9948393debaf4aa05975d79e6fa4ca8de69b332cd2a75b301868b473c42511901e38b4c2a1
 AUX distcc-3.0-xinetd.patch 558 BLAKE2B a381f2282c71f0eb28dc218cd57a2a914f02ffedad068c8cb7a510ae0cbf0a200de38e2bb31918ce5e10960359e1452365f36393c804984db1054410156e4b61 SHA512 1c0aa31606e1ce828ad52c9fff672d9e13a00494b8a3441095aca101d76f0f296308e359330a85745e2c60533eb1dcf82cea3feff2d0a3154b204d56735f0d14
-AUX distcc-3.2_rc1-freedesktop.patch 3140 BLAKE2B ff3fe91dc9ad84185246611b7abc4f4a6aee7fcf5dc3365f6bc0f86218cbbc2528bd5f4c53b4063eaf510c973b1df4d40072801c5fe2172a03dbb51ae381628b SHA512 fe953e1884b498da9cbb83ca90af9e49b554ad56fef8a8f55b9e6b46e5904f7376e5e58a9123f4acb474e16577fb6c9371a12eddc29c07c5d488be847f4ed2ef
-AUX distcc-3.2_rc1-gssapi.patch 1638 BLAKE2B dac27f0480d828a04a58cafb63277ffa54de8556bc3ab2673b8900ec4a8c0893674f0a06bfc276cc43fd2b701ffd9329cedffafd1b19efaef22742b78cae1520 SHA512 c804189f87068f82e7cb18de4e8d30cc67db7cc7fbcb13872d44e3f6fb006b3c779adf9c6068ae50831ef649da718ddb33c0efc4354636aacc9a7217b3c9a348
-AUX distcc-3.2_rc1-python.patch 10592 BLAKE2B 561cb33d2699faa069377fb4c43227cc5fd96c6c81176094cc0f7958c547d37076e204277360361e7a13b32b6bc4b91c8c5d266b853af156590b5c1f00846c07 SHA512 513c2fb9aa8f222a0f6062795fac1f855d67467d796b406c6b685e345554ce09a96ab9e594d6a05aad6c5a0f8c7906700529cfb562f2dd7c498d9078219b3d6b
 AUX distcc-3.2_rc1-socks5.patch 5462 BLAKE2B 5c18de909306bf0fa24690fae618c193396f5d27ef77cb9341bda69e3f8319f3b779c760af27cb19e9a6f88a46f02fe888d4bf4fbaef6419beae239964c4ee47 SHA512 707b6ad02bb7ff1507cfbfbb4cee673d5f0dc776006e9b7e801deabccf05c6057b33ea43c6a3ddd1756b8d07ff1d5e3087b635f15285195ba795b8679ebdc860
 AUX distcc-3.3.2-freedesktop.patch 4210 BLAKE2B 7c1500df8cd8568d68c51a3d14eb7240f16adabf9c664b3295171901f4781a9d7b9b9510e577ca0b85abaf21b9783dd9fa98f351089dc98f52f6182bb841c658 SHA512 7454df35d134dff9f5640f7a1a4241b99fe4c6051682af185657837f25cb870c27885ec9be74b5f01075801542decb54daf7db5d80fbdbecf5c8c721a6ee4e7c
 AUX distcc-3.3.2-noexist-crash.patch 732 BLAKE2B 36aa1175d9650ca4f7799e595346dd59d480b8ff478b286fcb93448e7cff1e64b1658869679687ebebdf39dc94fa183b3370fcddfc493ca4f858dd76289b24e0 SHA512 ff8369a7acc09ed366709000ed2fac726cc74d4bce29f9ed5b1dc40e683a250219e552d2caebde7d8a801cc40fb1a97086332a07fd4c295e688ef22f234c0116
@@ -13,11 +6,8 @@ AUX distcc-config 5218 BLAKE2B 41d483481e483217ed6313b4f82ed66c4f006070c269bc5ee
 AUX distcc-hardened.patch 1084 BLAKE2B 4b78fce2ab19b3832006a8b0092d3d38df07ce8225eb367c90256a158a41121e09269cd4bf59a1fc450db58eafe09e757f6e3ca4ae074a4567676701228c8289 SHA512 d1150dc83bf89c332f8c0bd01e15f52f95d71868733bd2e5430a5377f1a4aaa2b5b6e0cd488d33d9b94ce18b0eeeadf4af719db536b001b50e4d482b35c7e057
 AUX distccd.confd 1189 BLAKE2B 62791080d43004faf5fc4fb61e506bf3f0f8c2a677d4c24e7d44af692ca7b825e173624343f7e89ae7bff206fdf9543e0308ea4b2db90326c0de04eaaeb62f0b SHA512 1769bd32b1e03e7f8a8e6dea82c1709754d4d0fb12e59e9bdf885ac98f13e26d6c3fdf6575512a8b65299043beeb4b86f6c0b1c884daaee73a5c77d09e474545
 AUX distccd.initd 341 BLAKE2B 0781b860647e68511d19d592cb65cf4c03ea15a8499783755772f5a448393befc2b450de703168a2b062e9fe0d8690a7ea3cda271a5bad2560099c0b5dc6c12f SHA512 bd5aecda5153589a78cd5ff82c34b10176efbd994ab82caf8f63951c04983f6e65459784c1e7644a323ad1696aa0a62b38e863ee1c42a15241a60b22942f8dce
-AUX distccd.service 244 BLAKE2B db5796f93fe36b2ed09cf84e54bacdb3483917438feb823bdc786983beebac13408bbfc7dd40b6bfd49341b4a2135a21ae49769c14a904ef37eecfa98c03306f SHA512 0626a2da412df4a124ec8f3486b48af92895e97ad626bb848f14e60c9b016de313ca7c17a09565de95fa48233c9f7e37bf79038d1115b339a2033f0eacf0a22f
 AUX distccd.service-1 234 BLAKE2B 0ab7f90e6f7274fd9fe72df6a58e5323b2d65e91ca8805c549f9f92fa41a3099ea3f0a422270ca0ffe37d682d435da513552e6b7c33617c767909577cc83f85a SHA512 c2aa1b5e0d34c6b8c20d3fb83b8328e6859cefc9f3f98130701f7448fe896f5c80e29091fc4bbab01d1f600c0258b790571d86e7057dc4cfe799b53aef92a1bc
 AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6
-DIST distcc-3.2rc1.tar.bz2 609904 BLAKE2B e6b928f3b9231524d37bdf86b39cd6a3601b6cdb1e03d913ae562286794240b4dd364d5d01da2176f9bb440809b166b4b877443459751adf8bd3ecf92ceb8476 SHA512 98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee
 DIST distcc-3.3.2.tar.gz 1008938 BLAKE2B e784002dffefd395b068d237a86203563fefc81e17a08c4d2e372eaaf62c5ac799011fc8633c8bfb717f0ebc8c8cb8b999c941e0f5f87c4077d031a9e5c4b138 SHA512 fdf11ed94ba50977b45e302179c5c4ba067cc3db37579cb8ed6d5b9487f8e3c89114f65af69333c38d374cf7634d7aef8d5a2d5c7fd8e9b1f4930c0897d6da10
-EBUILD distcc-3.2_rc1-r4.ebuild 5603 BLAKE2B 92accfb9fbdec29da8376407a7ee9e67f387bbdf1c5f3da22707917c1f600b64613225536064518aeef0c65d82f7a29f1f8b26c7c47b1306aa80c395bbde5313 SHA512 1f2766a19aaf84f4c7d37fca9f85b2badda7fa0fac6e8f7d2c819b303f4edf6b399e89a93abeca868ea28511b2985791ec91c32db89cb05d04b1a2ce984e669b
-EBUILD distcc-3.3.2-r5.ebuild 5699 BLAKE2B a092083fcd8f89cfbf9217909947fb6a622772d538bac4a595d157fc24aadc168837fae3f37041c2e04a575dff0a9220198ce239d29f163f2398fc370ea55611 SHA512 54be7c94089d70eccb276d3de06972b53de02b0ce5d087fec06aed95db96e7e4b8cea367fc2ace9e89531f5846cd89b03cc1eb770fa89bc2acc8db06256e75ca
-MISC metadata.xml 686 BLAKE2B 149386337b838821ca538556fa2548b759ed09a5a99ff2de536390ba0a39f30c72722e88e0e413122df2d893a317a25eed5e43046a0721b960e0c0b5bfbd8c8e SHA512 22eacde5aeb935c963a80bf5d3a39e4db08ad2613232aabba2a109748b29169ffca04cf53f946a6110d3cf66358ec53e4a025cbbe12a84597ea3130475e9343d
+EBUILD distcc-3.3.2-r5.ebuild 5698 BLAKE2B 5b8292c329aae5fd986e9866ce34a5aef87667ebdee12279e3c4382067c9c7d3b0c1b84ceabbf585d9f3f889314c20cd637042f659ad382f56a41f3213711a59 SHA512 37e46b0085ced2f6fcdb80548f176aee90ba80e0c81226f88404c3ab70c15a7e1c3f9d5565d9bf503807baa60f53ad19e316979ad0cab162d5da7fb9e9295ae7
+MISC metadata.xml 606 BLAKE2B e6d738b3d7fed20430d4ae45738c9e4b2447a61a1a57735bf0fa8e1e177e1e0d027a71ebff71de9cbcc5d1d5800a31946002b1e36d73a8c31b2c097360a1dc64 SHA512 e196028491d2e4bcbb7390e220313a1ce4f5a41706a792775d31c66b3caf92bbb23680d26d3f41d285b2ba2f8b4dceb4e09760ac7ed0724eafdbc4b2ca8ecc6f
diff --git a/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild b/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
deleted file mode 100644
index 0267f059b07f..000000000000
--- a/sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils fdo-mime flag-o-matic multilib python-single-r1 systemd toolchain-funcs user
-
-MY_P="${P/_}"
-DESCRIPTION="Distribute compilation of C code across several machines on a network"
-HOMEPAGE="http://distcc.org/"
-SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="crossdev gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
-
-RESTRICT="test"
-
-CDEPEND="${PYTHON_DEPS}
-	dev-libs/popt
-	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 )
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!net-misc/pump
-	>=sys-devel/gcc-config-1.4.1
-	selinux? ( sec-policy/selinux-distcc )
-	xinetd? ( sys-apps/xinetd )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-DCCC_PATH="/usr/$(get_libdir)/distcc/bin"
-DISTCC_VERBOSE="0"
-
-pkg_setup() {
-	enewuser distcc 240 -1 -1 daemon
-	python-single-r1_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"
-	# SOCKSv5 support needed for Portage, bug #537616
-	epatch "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
-	epatch_user
-
-	# Bugs #120001, #167844 and probably more. See patch for description.
-	use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
-
-	sed -i \
-		-e "/PATH/s:\$distcc_location:${EPREFIX}${DCCC_PATH}:" \
-		-e "s:@PYTHON@:${EPYTHON}:" \
-		pump.in || die "sed failed"
-
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX:-/}:" \
-		-e "s:@libdir@:/usr/$(get_libdir):" \
-		"${FILESDIR}/3.2/distcc-config" > "${T}/distcc-config" || die
-
-	eaclocal -Im4 --output=aclocal.m4
-	eautoconf
-}
-
-src_configure() {
-	local myconf="--disable-Werror --with-docdir=\$(datadir)/doc/${PF}"
-	# More legacy stuff?
-	[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags
-
-	# --disable-rfc2553 b0rked, bug #254176
-	use ipv6 && myconf="${myconf} --enable-rfc2553"
-
-	econf \
-		$(use_with gtk) \
-		$(use_with gnome) \
-		$(use_with gssapi auth) \
-		$(use_with zeroconf avahi) \
-		${myconf}
-}
-
-src_install() {
-	default
-	python_optimize
-
-	newinitd "${FILESDIR}/3.2/init" distccd
-	systemd_dounit "${FILESDIR}/distccd.service"
-	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
-
-	cp "${FILESDIR}/3.2/conf" "${T}/distccd" || die
-	if use zeroconf; then
-		cat >> "${T}/distccd" <<-EOF
-
-		# Enable zeroconf support in distccd
-		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
-		EOF
-
-		sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die
-	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
-
-	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
-
-	use gnome && fdo-mime_desktop_database_update
-
-	elog
-	elog "Tips on using distcc with Gentoo can be found at"
-	elog "https://wiki.gentoo.org/wiki/Distcc"
-	elog
-	elog "distcc-pump is known to cause breakage with multiple packages."
-	elog "Do NOT enable it globally."
-	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
-
-	use gnome && fdo-mime_desktop_database_update
-}
diff --git a/sys-devel/distcc/distcc-3.3.2-r5.ebuild b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
index ae95ed386c44..ebf2f5ab8472 100644
--- a/sys-devel/distcc/distcc-3.3.2-r5.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 RESTRICT="test"
diff --git a/sys-devel/distcc/files/3.2/conf b/sys-devel/distcc/files/3.2/conf
deleted file mode 100644
index c499271685e9..000000000000
--- a/sys-devel/distcc/files/3.2/conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# /etc/conf.d/distccd: config file for /etc/init.d/distccd
-
-DISTCCD_OPTS=""
-
-# this is the distccd executable 
-DISTCCD_EXEC="/usr/bin/distccd"
-
-# this is where distccd will store its pid file
-DISTCCD_PIDFILE="/var/run/distccd/distccd.pid"
-
-# set this option to run distccd with extra parameters
-# Default port is 3632.  For most people the default is okay.
-DISTCCD_OPTS="${DISTCCD_OPTS} --port 3632"
-
-# Logging
-# You can change some logging options here:
-# --log-file FILE
-# --log-level LEVEL  [critical,error,warning, notice, info, debug]
-#
-# Leaving --log-file blank will log to syslog
-# example: --log-file /dev/null --log-level warning
-# example: --log-level critical
-
-DISTCCD_OPTS="${DISTCCD_OPTS} --log-level critical"
-
-# SECURITY NOTICE:
-# It is HIGHLY recommended that you use the --listen option
-# for increased security. You can specify an IP to permit connections 
-# from or a CIDR mask
-# --listen accepts only a single IP
-# --allow is now mandatory as of distcc-2.18.
-# example:  --allow 192.168.0.0/24
-# example:  --allow 192.168.0.5 --allow 192.168.0.150
-# example:  --listen 192.168.0.2
-DISTCCD_OPTS="${DISTCCD_OPTS} --allow 192.168.0.0/24"
-#DISTCCD_OPTS="${DISTCCD_OPTS} --listen 192.168.0.2"
-
-# set this for niceness
-# Default is 15
-DISTCCD_OPTS="${DISTCCD_OPTS} -N 15"
diff --git a/sys-devel/distcc/files/3.2/distcc-config b/sys-devel/distcc/files/3.2/distcc-config
deleted file mode 100644
index 4902a9a42c5a..000000000000
--- a/sys-devel/distcc/files/3.2/distcc-config
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/usr/bin/env python
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-import os, re, signal, subprocess, sys
-
-options=[
-	'--get-hosts',
-	'--set-hosts',
-	'--get-verbose',
-	'--set-verbose',
-	'--get-log',
-	'--set-log',
-	'--update-masquerade',
-	'--update-masquerade-with-crossdev',
-	'--help',
-	'--get-env',
-	'--set-env'
-]
-
-tmpcmdline=sys.argv[1:]
-cmdline=[]
-
-eprefix = '@EPREFIX@'
-bindir = os.path.join(eprefix, 'usr', 'bin')
-sbindir = os.path.join(eprefix, 'usr', 'sbin')
-libdir = os.path.join(eprefix, '@libdir@')
-sysconfdir = os.path.join(eprefix, 'etc')
-
-gcc_config = os.path.join(bindir, 'gcc-config')
-env_update = os.path.join(sbindir, 'env-update')
-envfile = os.path.join(sysconfdir, 'env.d', '02distcc')
-default_distcc_dir = os.path.join(sysconfdir, 'distcc')
-hostfile = os.path.join(default_distcc_dir, 'hosts')
-distcc_path = os.path.join(bindir, 'distcc')
-dccc_dir = os.path.join(libdir, 'distcc', 'bin')
-
-def exithandler(foo,bar):
-	os.kill(0,signal.SIGKILL)
-	sys.exit(1)
-
-signal.signal(signal.SIGINT,exithandler)
-
-def isroot(ret=0):
-	if os.getuid() != 0:
-		if ret == 0:
-			print('!!! %s %s must be run as root' % (sys.argv[:1][0],tmpcmdline[0]))
-			sys.exit(1)
-		else:
-			retval = 0
-	else:
-		retval = 1
-	return retval
-
-def writeenv(var,value):
-	isroot()
-	distcc_env    = []
-	distcc_env    = open(envfile, 'r').readlines()
-	distcc_env_new = open(envfile, 'w')
-	for i in range(len(distcc_env)):
-		if re.compile(var+'="(.*)"').match(distcc_env[i]):
-			distcc_env[i] = var+'="'+value+'"\n'
-		distcc_env_new.write(distcc_env[i])
-	#print('Set %s to: %s ' % (var,value))
-	subprocess.Popen(env_update, shell=True)
-	print('If you want to use these new settings in an existing shell,')
-	print('you need to "source /etc/profile" to get the changes.')
-
-def readenv(var):
-	distcc_env = open(envfile, 'r').read()
-	match = re.compile(var+'="(.*)"').search(distcc_env)
-	if match:
-		print(var+'='+match.group(1))
-	else:
-		print(var,'not set.')
-
-def installlink(chost='', version=''):
-	for file in ['gcc', 'cc', 'c++', 'g++']:
-		if not chost == '':
-			file = '%s-%s' % (chost,file)
-		if not version == '':
-			file = '%s-%s' % (file,version)
-		path = os.path.join(dccc_dir,file)
-		if os.path.exists(os.path.join(bindir,file)):
-			if not os.path.exists(path):
-				print('Creating %s symlink...' % (path))
-				os.symlink(distcc_path,path)
-			#else:
-			#	print('Already exists. Skipping...')
-
-def installlinks():
-	p = subprocess.Popen([gcc_config+" -C -l"], shell=True, stdout=subprocess.PIPE)
-	lines = p.stdout.read().rstrip().split('\n')
-	for line in lines:
-		columns = line.split()
-		if len(columns) >= 2:
-			matches = re.match("(.*)-(.*)", columns[1])
-			chost = matches.group(1)
-			version = matches.group(2)
-			installlink(chost)
-			installlink(chost, version)
-
-def uninstalllinks():
-	for root, dirs, files in os.walk(dccc_dir):
-		for file in files:
-			os.remove(os.path.join(root, file))
-
-def createdistccdir(dir):
-	if not os.path.exists(dir):
-		os.mkdir(dir)
-		os.chmod(dir, 0o755)
-
-for x in tmpcmdline:
-	if not x:
-		continue
-	if x[0:2]=="--":
-		if not x in options:
-			print("!!! Error: %s is an invalid option." % (x))
-			sys.exit(1)
-	else:
-		cmdline = x
-
-if '--get-hosts' in tmpcmdline:
-	HOSTS_ENV  = os.environ.get('DISTCC_HOSTS')
-	HOSTS_HOME = os.path.join(os.environ.get('HOME'), '.distcc', 'hosts')
-	if HOSTS_ENV:
-		print(HOSTS_ENV)
-	elif os.path.isfile(HOSTS_HOME) and os.path.getsize(HOSTS_HOME) != 0:
-		print(HOSTS_HOME)
-	elif os.path.exists(hostfile):
-		print(open(hostfile, 'r').read().rstrip())
-	else:
-		print('No configuration file found. Setup your hosts with --set-hosts.')
-elif '--set-hosts' in tmpcmdline:
-	if isroot(1):
-		PATH = default_distcc_dir
-	else:
-		PATH = os.path.join(os.environ.get('HOME'), '.distcc')
-	createdistccdir(PATH)
-	open(os.path.join(PATH, 'hosts'), 'w').write(cmdline + '\n')
-elif '--get-verbose' in tmpcmdline:
-	readenv('DISTCC_VERBOSE')
-elif '--set-verbose' in tmpcmdline:
-	writeenv('DISTCC_VERBOSE',tmpcmdline[1])
-elif '--get-log' in tmpcmdline:
-	readenv('DISTCC_LOG')
-elif '--set-log' in tmpcmdline:
-	writeenv('DISTCC_LOG',tmpcmdline[1])
-elif '--update-masquerade' in tmpcmdline:
-	isroot()
-	uninstalllinks()
-	print('Creating symlinks...')
-	installlink()
-	installlinks()
-elif '--update-masquerade-with-crossdev' in tmpcmdline:
-	isroot()
-	uninstalllinks()
-	print('Creating symlinks...')
-	installlinks()
-elif '--get-env' in tmpcmdline:
-	if len(tmpcmdline) == 1:
-		print(open(envfile, 'r').read().rstrip())
-	elif len(tmpcmdline) == 2:
-		readenv(tmpcmdline[1])
-	else:
-		print('!!! Error: Specify only one variable.')
-elif '--set-env' in tmpcmdline:
-	if len(tmpcmdline) > 2 and len(tmpcmdline) <= 3:
-		isroot()
-		writeenv(tmpcmdline[1],tmpcmdline[2])
-	else:
-		print('!!! Error: Awaiting two parameters.')
-else:
-	cmd = sys.argv[:1][0]
-	print('Usage: %s --set-hosts DISTCC_HOSTS | --get-hosts' % (cmd))
-	print('       %s --set-verbose { 0 | 1 }  | --get-verbose' % (cmd))
-	print('       %s --set-log FILE           | --get-log' % (cmd))
-	print('       %s --set-env VARIABLE VALUE | --get-env [VARIABLE]' % (cmd))
-	print('       %s --update-masquerade' % (cmd))
-	print('       %s --update-masquerade-with-crossdev' % (cmd))
diff --git a/sys-devel/distcc/files/3.2/init b/sys-devel/distcc/files/3.2/init
deleted file mode 100644
index e89dcb3702b7..000000000000
--- a/sys-devel/distcc/files/3.2/init
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use avahi-daemon ypbind
-}
-
-start() {
-	ebegin "Starting distccd"
-
-	if [ ! -e /var/run/distccd ] ; then
-		mkdir -p /var/run/distccd
-		chown distcc:daemon /var/run/distccd
-	fi
-
-	# Load PATH and GCC_SPECS from gcc-config, bug #262773
-	eval "$(gcc-config -E)"
-
-	start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" --user distcc -- \
-		--daemon --pid-file "${DISTCCD_PIDFILE}" \
-		${DISTCCD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping distccd"
-	start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}"
-	eend $?
-}
diff --git a/sys-devel/distcc/files/distcc-3.0-fix-fortify.patch b/sys-devel/distcc/files/distcc-3.0-fix-fortify.patch
deleted file mode 100644
index 8edc330e324b..000000000000
--- a/sys-devel/distcc/files/distcc-3.0-fix-fortify.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru a/src/snprintf.h b/src/snprintf.h
---- a/src/snprintf.h	2008-08-06 15:52:06.000000000 -0500
-+++ b/src/snprintf.h	2009-01-04 15:19:22.000000000 -0600
-@@ -7,6 +7,7 @@
-  */
- 
- #include <stdarg.h>
-+#include "config.h"
- 
- #ifdef __GNUC__
- /** Use gcc attribute to check printf fns.  a1 is the 1-based index of
diff --git a/sys-devel/distcc/files/distcc-3.2_rc1-freedesktop.patch b/sys-devel/distcc/files/distcc-3.2_rc1-freedesktop.patch
deleted file mode 100644
index 8f0d8d77a12b..000000000000
--- a/sys-devel/distcc/files/distcc-3.2_rc1-freedesktop.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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
deleted file mode 100644
index 73551f8a7b80..000000000000
--- a/sys-devel/distcc/files/distcc-3.2_rc1-gssapi.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 409b5a19d321..000000000000
--- a/sys-devel/distcc/files/distcc-3.2_rc1-python.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-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/files/distccd.service b/sys-devel/distcc/files/distccd.service
deleted file mode 100644
index 3eb61396b84c..000000000000
--- a/sys-devel/distcc/files/distccd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Distccd: A Distributed Compilation Server
-After=network.target
-
-[Service]
-User=distcc
-ExecStart=/usr/bin/distccd --verbose --no-detach --daemon --port 3632 -N 15 --allow $ALLOWED_SERVERS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml
index 5daba0cb6edd..0b9bbc941d2d 100644
--- a/sys-devel/distcc/metadata.xml
+++ b/sys-devel/distcc/metadata.xml
@@ -14,7 +14,6 @@
 		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>