distcc cleanup

Remove old ebuilds and auxiliary files.

18 files changed, 0 insertions, 1067 deletions

diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 14191ab..fab5730 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,33 +1,14 @@
-AUX 2.18-r1/conf 1345 RMD160 6921e75f3d71ecebf66ebf4356482655ff1d0a19 SHA1 89aa69c5cc8a645fe3ff11282cd230c3a3dd898a SHA256 c48a04bd789d38682c8e1003f891a4428e5bb457696578afe56a913ec003fdef
-AUX 2.18-r1/init 927 RMD160 11638f1be4f1a55414517e9982b3a2ee508b9b9d SHA1 6456b0af8e63112258fd401afc1abe7b578004cb SHA256 3b7343b659ce864da8b730d2bf2c221de6446d6afc935f7686d85fc8d0983167
-AUX 2.18/conf 1267 RMD160 a12045786088255c9bc8f4ad826928c00efac567 SHA1 828f62bee16cfb4b2667cdbda5a18e9516bcf969 SHA256 51365685f2f02c6f2846e4b35ed1ae3628999ed5035af3ad0c7b2d68acfe7c3d
-AUX 2.18/init 733 RMD160 935e52d2ddfc6363f26a916666bbbc28b6fdb79b SHA1 737e969b122c70df6d54c7a98bfdc872af278ff6 SHA256 1477ab79b8be398b6acb7d44e0f0a66bb75d1918365b350b824e16b8b02af22b
 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.0/init 846 RMD160 313ba4a8b611254bd333364f54bd7dc73d988283 SHA1 4e4a271486ea78d4d126df5d3ee2a6d38af13b0e SHA256 ca81ef66534013ec10a10e3e58610170938b54fb75ced23e3507ebd166be99cc
 AUX 3.1/init 776 RMD160 a25d940287d0b87d2f9929d5a9f74ba7253124c6 SHA1 405eea7cb18b2c6015e0dada8878bcec2b8d09f7 SHA256 a902eccf102174e1ebb552cf8d078d42105787cfd8d9b11a120143a5131af98b
 AUX distcc-3.0-fix-fortify.patch 313 RMD160 e5edc96a4bc4fe06a58878011cbb466184946b3e SHA1 386ee72a9d0b620dfc3aa75324060f764ed44e6d SHA256 7b57ae28dcef0c1ecd273a8a10dd1a16fa6a7af618d5438e1fe4398863fa8901
-AUX distcc-3.0-gentoo.patch 1225 RMD160 5c305052c9ee62c7d60377b26e53f69a67438b39 SHA1 7114da1f2ddda38498d19a685782da48a8b37f30 SHA256 ba1895fa906ba18490b722f9eda07a96459949d879412c2aba0218f8854ca7cc
-AUX distcc-3.0-svn617.patch 533 RMD160 64c8712a9290b1fef776ca5517074748a0ec9255 SHA1 7b9b661b21aea2e1a338b3ed890c6bd7dc8064e3 SHA256 902d6715f443fceb7c799bcf4f82d637569db2da900be5e36bb40b57a3e9fa84
-AUX distcc-3.0-uninitialized.patch 448 RMD160 706d9923d257f7616775d55b287e02fb133dbdd9 SHA1 7275a1d4c314abc0ddac572cb85b49efaedee97b SHA256 2d4b0aefbe1e0245881d35c572605ee8f3c52e43316482041fadadc31e5fa9a6
 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-as-needed.patch 558 RMD160 faebf24490e3dd2a5247cfb6914dc88fb7b98e35 SHA1 5e5547032b6492f9f8b0511fd621a005dbd455a2 SHA256 9e87d3b0487ffc52ccf6362866e967dff9c2a85681175096ece11413f8c91e54
-AUX distcc-avahi-configure.patch 1263 RMD160 de3ba2d651b5a76d5ee71cde79a2555f77a70b1b SHA1 eddae708be95f4bbd7cbfed53439e2dc38a979e8 SHA256 9d967456da6631845b4262ae7508948d629764149fd568c367e76e89168bb132
 AUX distcc-config 4874 RMD160 07bd612fc11c785691bd56e4e7bb7994a2e4dbb8 SHA1 85b5f38d6024e4f454bfa07d96c13b4749ce3e2a SHA256 c6a7bb74eb235fd7896ca101c033a2e9faf80afeb7232bff3afe22f8a6268a5c
-AUX distcc-create-dir.patch 1404 RMD160 c9c878715ac02952d791da8776952e69d5de7e57 SHA1 387572bc6c05896386aef50db0d490168c1058f1 SHA256 b327b879f200d7a78cfe665cdba864e4d92a9fdecdd81149d75d72c8ba756bde
-AUX distcc-freedesktop.patch 2519 RMD160 98020f40eebe7ca9cd629e602a9ff216df0b97f9 SHA1 1cdcacc021a51ad3469ab16b90f43379538629f9 SHA256 632f7865da9f35773fb95df53ae77089e1bbf7aa936b86d0f4b938603a8c37c3
-AUX distcc-gentoo-multilib-r1.patch 4245 RMD160 175cb4c2ce0e8ecb2262165b3fd9a0d89ddc7beb SHA1 f617965969e7b4afd1b6467a56fe0f7f748c7717 SHA256 78839f7392769ab41509e84f07c36d07315d0220f7aacbb174ed1aba80b9c28d
-AUX distcc-gentoo-multilib.patch 3784 RMD160 f48a3f2f8c82379c30c9da0e49aa66ba34681882 SHA1 5a3ba956caaab2d5c6ef44ee3ded10a33ac870dc SHA256 d3af7a7592d0a11a35d294022b36feca2fb625e4799513bf56a79e0656278403
 AUX distcc-hardened.patch 1084 RMD160 0f11c9c8e8b56e91399b054fb57566e290a0baa5 SHA1 746f1905a9bc45ea7b71d71f4b1feba7d96d0f7f SHA256 dcf63f201cb7f4bf13eeb1485a5056c64370b9239d28e4acc77a47046dcda6cf
-AUX distcc-march-native.patch 934 RMD160 29908d5b5c4622285a78f221b2633e3ee495a648 SHA1 e1ac6912d55c9b3dda9b6f1a03c973ad1a85f359 SHA256 bc95daad65a3c3a7429b94b432b5d2aa470cb50d6e67c65303865df1e28831e7
-DIST distcc-2.18.3.tar.bz2 341601 RMD160 c7ac6f3e161dccf39b841b57a3328b4208d28c2d SHA1 88e4c15826bdbc5a3de0f7c1bcb429e558c6976d SHA256 6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434
-DIST distcc-3.0.tar.bz2 582700 RMD160 1e187fe09129dcc6e561bfb0cd0db9a43619acca SHA1 90cea1d7500e95d3c698e6ab9b9536a946f62824 SHA256 bb6f5674b619ef1438da67739d982e8a6b11e01f748708e0fcbe371c02f020fe
 DIST distcc-3.1.tar.bz2 588820 RMD160 82229c230e6917b0df7db275460579b02dbf6b60 SHA1 30663e8ff94f13c0553fbfb928adba91814e1b3a SHA256 f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89
-EBUILD distcc-2.18.3-r10.ebuild 5142 RMD160 64d8b7d135334e023aa4450be62da861ea591298 SHA1 8de697fc7beddfab8192be91ca27faeb4074dd25 SHA256 2dfc6ea7957cb4baf1632bac8d417be835cb6b893f83fbefece100b782ae55fe
-EBUILD distcc-3.0-r4.ebuild 4590 RMD160 624db18d0f56a00181e2d2897020f8e6e082fe82 SHA1 6d87b0491d21d599da3e9c56e329009b6a82a2e2 SHA256 417ffc3783df12916ff68402072c2684d46579b082dce14b567c91f3df0356e1
 EBUILD distcc-3.1-r4.ebuild 4516 RMD160 2bb97b3dd05e04fe04b0df7c69351bb7e54beb79 SHA1 f89835e957e4d375f208bcf974ab5563cbeb061a SHA256 e9226e201d1672657972ea79041c1f4751a4e6304a8bb9c2ac063fef55ab1d99
 MISC ChangeLog 37301 RMD160 af53ebae537554fb6accb7e5c54dd5471202eb73 SHA1 42fe279f259f1cfa588155eb29efd47ee062babe SHA256 4775c3770ff1dca81c41f7f77a2c4f3d7e746ee5fa6fb738eb2dc687513a158e
 MISC metadata.xml 375 RMD160 71766089deafcc906533d0dc537a46646f36b50a SHA1 c188ca1cdd4d1bc82f372608e8ad7fc473cb47e5 SHA256 adb92971f6939e55ce103e1c42d3ce3dfe82823d038db0e9cf9b08d9be888e1a
diff --git a/sys-devel/distcc/distcc-2.18.3-r10.ebuild b/sys-devel/distcc/distcc-2.18.3-r10.ebuild
deleted file mode 100644
index 48f13f2..0000000
--- a/sys-devel/distcc/distcc-2.18.3-r10.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r10.ebuild,v 1.11 2008/11/02 22:24:23 gengor Exp $
-
-# If you change this in any way please email lisa@gentoo.org and make an
-# entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye
-
-inherit eutils flag-o-matic toolchain-funcs
-
-PATCHLEVEL="2.18"
-
-DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
-HOMEPAGE="http://distcc.samba.org/"
-SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="gnome gtk hardened selinux ipv6"
-
-DEPEND=">=sys-devel/gcc-config-1.3.1
-	userland_GNU? ( sys-apps/shadow )
-	gnome? ( dev-util/pkgconfig )
-	gtk? ( dev-util/pkgconfig )"
-RDEPEND="
-	gnome? (
-		>=x11-libs/gtk+-2.0.0
-		>=gnome-base/libgnome-2.0.0
-		>=gnome-base/libgnomeui-2.0.0.0
-		>=gnome-base/libglade-2.0.0
-		x11-libs/pango
-		>=gnome-base/gconf-2.0.0
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.0.0
-		x11-libs/pango
-	)
-	selinux? ( sec-policy/selinux-distcc )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# -Wl,--as-needed to close bug #128605
-	epatch "${FILESDIR}/distcc-as-needed.patch"
-
-	# See bug #75420 for more multilib stuff
-	epatch "${FILESDIR}/distcc-gentoo-multilib-r1.patch"
-	einfo "Please report to bug #75420 success or failure of this patch."
-
-	# Bugs #120001, #167844 and probably more. See patch for description.
-	use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
-}
-
-src_compile() {
-	local myconf="--with-included-popt "
-	#Here we use the built in parse-options package. saves a dependancy
-
-	#not taking any chances here, guessing which takes precedence in the
-	#configure script, so we'll just make the distinction here:
-	#gnome takes precedence over gtk if both are specified (gnome pulls
-	#in gtk anyways...)
-	use gtk && ! use gnome && myconf="${myconf} --with-gtk"
-	use gtk && use gnome && myconf="${myconf} --with-gnome"
-
-	#More legacy stuff?
-	[ `gcc-major-version` -eq 2 ] && filter-lfs-flags
-
-	if use ipv6; then
-		ewarn "To use IPV6 you must have IPV6 compiled into your kernel"
-		ewarn "either via a module or compiled code"
-		ewarn "You can recompile without ipv6 with: USE='-ipv6' emerge distcc"
-		myconf=" ${myconf} --enable-rfc2553 "
-		epause 5
-	fi
-	econf ${myconf} || die "econf ${myconf} failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D%/}" install
-
-	insinto /usr/share/doc/${PN}
-	doins "${S}/survey.txt"
-
-	exeinto /usr/bin
-	doexe "${FILESDIR}/distcc-config"
-
-	newconfd "${FILESDIR}/${PATCHLEVEL}/conf" distccd
-
-	newinitd "${FILESDIR}/${PATCHLEVEL}/init" distccd
-
-	# create and keep the symlink dir
-	dodir /usr/lib/distcc/bin
-	keepdir /usr/lib/distcc/bin
-
-	# create the distccd pid directory
-	dodir /var/run/distccd
-	keepdir /var/run/distccd
-
-	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 "${D}/usr/bin/distccmon-gnome" "${D}/usr/bin/distccmon-gui"
-	  dosym /usr/bin/distccmon-gui /usr/bin/distccmon-gnome
-	fi
-
-}
-
-pkg_preinst() {
-	# non-/ installs don't require us to do anything here
-	[ "${ROOT}" != "/" ] && return 0
-
-	# stop daemon since script is being updated
-	[ -n "$(pidof distccd)" -a -x /etc/init.d/distccd ] && \
-		/etc/init.d/distccd stop
-}
-
-pkg_postinst() {
-	#are we doing bootstrap with has no useradd?
-	if [[ ${CHOST} != *-*-gnu && ${CHOST} != *-linux* ]] || [ -x /usr/sbin/useradd ]; then
-	  enewuser distcc 240
-	else
-	  ewarn "You do not have useradd (bootstrap) from shadow so I didn't"
-	  ewarn "install the distcc user.  Note that attempting to start the daemon"
-	  ewarn "will fail. Please install shadow and re-emerge distcc."
-	  ebeep 2
-	fi
-
-	# By now everyone should be using the right envfile
-
-	if [ "${ROOT}" = "/" ]; then
-		einfo "Installing links to native compilers..."
-		/usr/bin/distcc-config --install
-	else
-		# distcc-config can *almost* handle ROOT installs itself
-		#  but for now, but user must finsh things off
-		ewarn "*** Installation is not complete ***"
-		ewarn "You must run the following as root:"
-		ewarn "  /usr/bin/distcc-config --install"
-		ewarn "after booting or chrooting into ${ROOT}"
-	fi
-	einfo "Setting permissions on ${ROOT}var/run/distccd"
-	chown -R distcc:daemon "${ROOT}var/run/distccd"
-	echo ""
-
-	einfo "Tips on using distcc with Gentoo can be found at"
-	einfo "http://www.gentoo.org/doc/en/distcc.xml"
-	echo ""
-	einfo "To use the distccmon programs with Gentoo you should use this command:"
-	einfo "      DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N"
-	use gnome || use gtk && einfo "Or:   DISTCC_DIR=/var/tmp/portage/.distcc distccmon-gnome"
-
-	ewarn "***SECURITY NOTICE***"
-	ewarn "If you are upgrading distcc please make sure to run etc-update to"
-	ewarn "update your /etc/conf.d/distccd and /etc/init.d/distccd files with"
-	ewarn "added security precautions (the --listen and --allow directives)"
-	ebeep 5
-}
diff --git a/sys-devel/distcc/distcc-3.0-r4.ebuild b/sys-devel/distcc/distcc-3.0-r4.ebuild
deleted file mode 100644
index 6406110..0000000
--- a/sys-devel/distcc/distcc-3.0-r4.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.0-r4.ebuild,v 1.12 2009/03/13 17:10:24 armin76 Exp $
-
-inherit eutils fdo-mime flag-o-matic multilib toolchain-funcs
-
-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/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="avahi gnome gtk hardened ipv6 selinux xinetd"
-
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/python-2.4
-	dev-libs/popt
-	avahi? ( >=net-dns/avahi-0.6 )
-	gnome? (
-		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		>=x11-libs/gtk+-2
-		x11-libs/pango
-	)
-	gtk? (
-		>=x11-libs/gtk+-2
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-RDEPEND="${RDEPEND}
-	!net-misc/pump
-	>=sys-devel/gcc-config-1.3.1
-	selinux? ( sec-policy/selinux-distcc )
-	xinetd? ( sys-apps/xinetd )"
-
-DISTCC_LOG=""
-DCCC_PATH="/usr/$(get_libdir)/distcc/bin"
-DISTCC_VERBOSE="0"
-
-pkg_setup() {
-	enewuser distcc 240 -1 -1 daemon
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-svn617.patch"
-	epatch "${FILESDIR}/${P}-xinetd.patch"
-	epatch "${FILESDIR}/${P}-uninitialized.patch"
-	# bug #253786
-	epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch"
-	sed -i -e "/PATH/s:\$distcc_location:${DCCC_PATH}:" pump.in || die
-
-	# Bugs #120001, #167844 and probably more. See patch for description.
-	use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
-
-	# Bug #244847
-	sed -i -e "s:-Werror::" configure* include_server/setup.py || die
-}
-
-src_compile() {
-	# More legacy stuff?
-	[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags
-
-	# -O? is required
-	[ "${CFLAGS/-O}" = "${CFLAGS}" ] && CFLAGS="${CFLAGS} -O2"
-
-	econf \
-		$(use_with avahi) \
-		$(use_with gtk) \
-		$(use_with gnome) \
-		$(use_enable ipv6 rfc2553) \
-		--with-docdir="/usr/share/doc/${PF}" || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	# In rare cases, parallel make install failed, bug #249695
-	emake -j1 DESTDIR="${D}" install || die
-
-	dobin "${FILESDIR}/${PV}/distcc-config"
-
-	newinitd "${FILESDIR}/${PV}/init" distccd
-
-	cp "${FILESDIR}/${PV}/conf" "${T}/distccd"
-	if use avahi; then
-		cat >> "${T}/distccd" <<-EOF
-
-		# Enable zeroconf support in distccd
-		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
-		EOF
-	fi
-	doconfd "${T}/distccd"
-
-	cat > "${T}/02distcc" <<-EOF
-	# This file is managed by distcc-config; use it to change these settings.
-	DISTCC_LOG="${DISTCC_LOG}"
-	DCCC_PATH="${DCCC_PATH}"
-	DISTCC_VERBOSE="${DISTCC_VERBOSE}"
-	EOF
-	doenvd "${T}/02distcc"
-
-	# create the masquerade directory
-	dodir "${DCCC_PATH}"
-	for f in cc c++ gcc g++; do
-		dosym /usr/bin/distcc "${DCCC_PATH}/${f}"
-		if [ "${f}" != "cc" ]; then
-			dosym /usr/bin/distcc "${DCCC_PATH}/${CTARGET:-${CHOST}}-${f}"
-		fi
-	done
-
-	# create the distccd pid directory
-	keepdir /var/run/distccd
-	fowners distcc:daemon /var/run/distccd
-
-	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 "${D}/usr/bin/distccmon-gnome" "${D}/usr/bin/distccmon-gui" || die
-		dosym distccmon-gui /usr/bin/distccmon-gnome
-	fi
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins "doc/example/xinetd" distcc
-	fi
-
-	rm -rf "${D}/etc/default"
-	rm -f "${D}/etc/distcc/clients.allow"
-	rm -f "${D}/etc/distcc/commands.allow.sh"
-	prepalldocs
-}
-
-pkg_postinst() {
-	use gnome && fdo-mime_desktop_database_update
-
-	if use ipv6; then
-		elog
-		elog "IPv6 has not supported yet by ${P}."
-	fi
-	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 "# pump emerge -u world"
-	elog
-	elog "To use the distccmon programs with Gentoo you should use this command:"
-	elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-text 5"
-
-	if use gnome || use gtk; then
-		elog "Or:"
-		elog "# DISTCC_DIR=\"${DISTCC_DIR}\" 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() {
-	use gnome && fdo-mime_desktop_database_update
-}
diff --git a/sys-devel/distcc/files/2.18-r1/conf b/sys-devel/distcc/files/2.18-r1/conf
deleted file mode 100644
index 783236a..0000000
--- a/sys-devel/distcc/files/2.18-r1/conf
+++ /dev/null
@@ -1,45 +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 recomended 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_NICE="15"
-
-#ifdef AVAHI
-# Enable zeroconf support in distccd
-DISTCCD_AVAHI="yes"
-#endif
diff --git a/sys-devel/distcc/files/2.18-r1/init b/sys-devel/distcc/files/2.18-r1/init
deleted file mode 100644
index ae899aa..0000000
--- a/sys-devel/distcc/files/2.18-r1/init
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.18-r1/init,v 1.1 2008/01/04 03:53:15 betelgeuse Exp $
-
-depend() {
-	local avahi
-#ifdef AVAHI
-	[ ${DISTCCD_AVAHI} = yes ] && avahi="avahi-daemon"
-#endif
-	need net ${avahi}
-	use ypbind
-}
-
-start() {
-	[ -e "${DISTCCD_PIDFILE}" ] && rm -f ${DISTCCD_PIDFILE} &>/dev/null
-	
-	local args
-#ifdef AVAHI
-	[ ${DISTCCD_AVAHI} = yes ] && args="--zeroconf"
-#endif
-	
-	ebegin "Starting distccd"
-	chown distcc `dirname ${DISTCCD_PIDFILE}` &>/dev/null
-	TMPDIR="${TMPDIR}" \
-	PATH="$(gcc-config --get-bin-path):${PATH}" \
-	/sbin/start-stop-daemon --start --quiet --startas ${DISTCCD_EXEC} \
-	--pidfile ${DISTCCD_PIDFILE} -- \
-	--pid-file ${DISTCCD_PIDFILE} -N ${DISTCCD_NICE} --user distcc \
-	${args} ${DISTCCD_OPTS}
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping distccd"
-	start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}"
-	rm -f "${DISTCCD_PIDFILE}"
-	eend $?
-}
-
diff --git a/sys-devel/distcc/files/2.18/conf b/sys-devel/distcc/files/2.18/conf
deleted file mode 100644
index 3f6c3f0..0000000
--- a/sys-devel/distcc/files/2.18/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 recomended 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_NICE="15"
diff --git a/sys-devel/distcc/files/2.18/init b/sys-devel/distcc/files/2.18/init
deleted file mode 100755
index 1abe4a9..0000000
--- a/sys-devel/distcc/files/2.18/init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.18/init,v 1.1 2004/10/12 17:21:43 lisa Exp $
-
-depend() {
-	need net
-	use ypbind
-}
-
-start() {
-	[ -e "${DISTCCD_PIDFILE}" ] && rm -f ${DISTCCD_PIDFILE} &>/dev/null
-	
-	ebegin "Starting distccd"
-	chown distcc `dirname ${DISTCCD_PIDFILE}` &>/dev/null
-	TMPDIR="${TMPDIR}" \
-	PATH="$(gcc-config --get-bin-path):${PATH}" \
-	/sbin/start-stop-daemon --start --quiet --startas ${DISTCCD_EXEC} \
-	--pidfile ${DISTCCD_PIDFILE} -- \
-	--pid-file ${DISTCCD_PIDFILE} -N ${DISTCCD_NICE} --user distcc \
-	${DISTCCD_OPTS}
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping distccd"
-	start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}"
-	rm -f "${DISTCCD_PIDFILE}"
-	eend $?
-}
-
diff --git a/sys-devel/distcc/files/3.0/init b/sys-devel/distcc/files/3.0/init
deleted file mode 100755
index c4be986..0000000
--- a/sys-devel/distcc/files/3.0/init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/3.0/init,v 1.4 2008/11/16 16:36:37 matsuu Exp $
-
-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 GCC_SPECS from profile.env bug #164818
-	GCC_SPECS="$(. /etc/profile.env; echo "${GCC_SPECS}")" \
-	PATH="$(gcc-config --get-bin-path):${PATH}" \
-	start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" -- \
-		--daemon --pid-file "${DISTCCD_PIDFILE}" --user distcc \
-		${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-gentoo.patch b/sys-devel/distcc/files/distcc-3.0-gentoo.patch
deleted file mode 100644
index e2464df..0000000
--- a/sys-devel/distcc/files/distcc-3.0-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur distcc-3.0.orig/include_server/c_extensions/distcc_pump_c_extensions_module.c distcc-3.0/include_server/c_extensions/distcc_pump_c_extensions_module.c
---- distcc-3.0.orig/include_server/c_extensions/distcc_pump_c_extensions_module.c	2008-08-07 05:52:20.000000000 +0900
-+++ distcc-3.0/include_server/c_extensions/distcc_pump_c_extensions_module.c	2008-10-14 22:34:38.000000000 +0900
-@@ -23,17 +23,18 @@
- 
- #include "Python.h"
- 
--static char *version = ".01";
-+static const char *version = ".01";
- 
- /* To suppress compiler warnings */
- #define UNUSED(v) ((void)&v)
- 
--char *rs_program_name = "distcc_include_server";
-+const char *rs_program_name = "distcc_include_server";
- 
- #include "distcc.h"
- #include "rpc.h"
- 
- static PyObject *distcc_pump_c_extensionsError;
-+void initdistcc_pump_c_extensions(void);
- 
- 
- /***********************************************************************
-@@ -385,7 +386,7 @@
-   PyObject *module;
-   PyObject *py_str;
-   distcc_pump_c_extensionsError = PyErr_NewException(
--      "distcc_pump_c_extensions.Error", NULL, NULL);
-+      (char *)"distcc_pump_c_extensions.Error", NULL, NULL);
-   
-   module = Py_InitModule4("distcc_pump_c_extensions", 
-                           methods, 
diff --git a/sys-devel/distcc/files/distcc-3.0-svn617.patch b/sys-devel/distcc/files/distcc-3.0-svn617.patch
deleted file mode 100644
index 54f55dc..0000000
--- a/sys-devel/distcc/files/distcc-3.0-svn617.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/arg.c
-===================================================================
---- src/arg.c	(revision 616)
-+++ src/arg.c	(revision 617)
-@@ -453,7 +453,7 @@
-         dest_argv[i] = strdup(opt);
-         if (!dest_argv[i]) return EXIT_OUT_OF_MEMORY;
-         i++;
--        if (strcmp(opt, "-MD") == 0 || strcmp(opt, "-MMD")) {
-+        if (strcmp(opt, "-MD") == 0 || strcmp(opt, "-MMD") == 0) {
-             char *filename;
-             if (!comma) {
-                 rs_log_warning("'-Wp,-MD' or '-Wp,-MMD' option is missing "
diff --git a/sys-devel/distcc/files/distcc-3.0-uninitialized.patch b/sys-devel/distcc/files/distcc-3.0-uninitialized.patch
deleted file mode 100644
index 28b226b..0000000
--- a/sys-devel/distcc/files/distcc-3.0-uninitialized.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/where.c
-===================================================================
---- src/where.c	(revision 622)
-+++ src/where.c	(working copy)
-@@ -190,7 +190,7 @@
- int dcc_lock_local_cpp(int *cpu_lock_fd)
- {
-     int ret;
--    struct dcc_hostdef *chosen;
-+    struct dcc_hostdef *chosen = NULL;
-     ret = dcc_lock_one(dcc_hostdef_local_cpp, &chosen, cpu_lock_fd);
-     dcc_note_state(DCC_PHASE_CPP, NULL, chosen->hostname);
-     return ret;
diff --git a/sys-devel/distcc/files/distcc-as-needed.patch b/sys-devel/distcc/files/distcc-as-needed.patch
deleted file mode 100644
index 6678e4d..0000000
--- a/sys-devel/distcc/files/distcc-as-needed.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: distcc-2.18.3/Makefile.in
-===================================================================
---- distcc-2.18.3.orig/Makefile.in
-+++ distcc-2.18.3/Makefile.in
-@@ -377,9 +377,9 @@ src/renderer.o: src/renderer.c
- 		$(srcdir)/src/renderer.c
- 
- distccmon-gnome@EXEEXT@: $(mon_obj) $(gnome_obj)
--	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LIBS)	\
--		$(GNOME_CFLAGS) $(GNOME_LIBS)			\
--		$(mon_obj) $(gnome_obj)
-+	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
-+		$(mon_obj) $(gnome_obj) \
-+		$(LIBS) $(GNOME_CFLAGS) $(GNOME_LIBS)
- 
- 
- ## Dist targets
diff --git a/sys-devel/distcc/files/distcc-avahi-configure.patch b/sys-devel/distcc/files/distcc-avahi-configure.patch
deleted file mode 100644
index cc1097d..0000000
--- a/sys-devel/distcc/files/distcc-avahi-configure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur distcc-2.18.3.old/configure.ac distcc-2.18.3/configure.ac
---- distcc-2.18.3.old/configure.ac	2008-01-01 21:08:02.000000000 +0200
-+++ distcc-2.18.3/configure.ac	2008-01-01 21:09:56.000000000 +0200
-@@ -387,14 +387,18 @@
-     [#include <sys/socket.h>])
- 
- dnl check for avahi
-+AC_ARG_ENABLE(avahi, AC_HELP_STRING([--enable-avahi], [enable avahi support]), [], [enable_avahi=auto])
-+ZEROCONF_DISTCC_OBJS=""
-+ZEROCONF_DISTCCD_OBJS=""
- PKG_CHECK_MODULES(AVAHI, [avahi-client >= 0.6.5],
--[AC_DEFINE(HAVE_AVAHI, 1, [defined if Avahi is available])
--CFLAGS="$CFLAGS $AVAHI_CFLAGS"
--LIBS="$LIBS $AVAHI_LIBS"
--ZEROCONF_DISTCC_OBJS="src/zeroconf.o src/gcc-id.o"
--ZEROCONF_DISTCCD_OBJS="src/zeroconf-reg.o src/gcc-id.o"],
--[ZEROCONF_DISTCC_OBJS=""
--ZEROCONF_DISTCCD_OBJS=""])
-+[if test x"${enable_avahi}" = x"yes" || test x"${enable_avahi}" = x"auto"; then
-+ AC_DEFINE(HAVE_AVAHI, 1, [defined if Avahi is available])
-+ CFLAGS="$CFLAGS $AVAHI_CFLAGS"
-+ LIBS="$LIBS $AVAHI_LIBS"
-+ ZEROCONF_DISTCC_OBJS="src/zeroconf.o src/gcc-id.o"
-+ ZEROCONF_DISTCCD_OBJS="src/zeroconf-reg.o src/gcc-id.o"
-+fi],
-+[test x"${enable_avahi}" = x"yes" && AC_MSG_ERROR(avahi support needs avahi-client >= 0.6.5 installed)])
- AC_SUBST(ZEROCONF_DISTCC_OBJS)
- AC_SUBST(ZEROCONF_DISTCCD_OBJS)
- 
diff --git a/sys-devel/distcc/files/distcc-create-dir.patch b/sys-devel/distcc/files/distcc-create-dir.patch
deleted file mode 100644
index 8c818e1..0000000
--- a/sys-devel/distcc/files/distcc-create-dir.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-* local directory is at mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
-* comparing to mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
-M  ./src/tempfile.c
-
-* modified files
-
---- orig/src/tempfile.c
-+++ mod/src/tempfile.c
-@@ -145,7 +145,7 @@
- int dcc_get_top_dir(char **path_ret)
- {
-     char *env;
--    static char *cached;
-+    static char *cached = NULL;
-     int ret;
- 
-     if (cached) {
-@@ -154,22 +154,23 @@
-     }
- 
-     if ((env = getenv("DISTCC_DIR"))) {
--        if ((cached = strdup(env)) == NULL) {
-+
-+        if ((cached = strdup(env)) == NULL)
-             return EXIT_OUT_OF_MEMORY;
--        } else {
-+        else
-             *path_ret = cached;
--            return 0;
--        }
--    }
- 
--    if ((env = getenv("HOME")) == NULL) {
--        rs_log_warning("HOME is not set; can't find distcc directory");
--        return EXIT_BAD_ARGUMENTS;
--    }
-+    } else {
- 
--    if (asprintf(path_ret, "%s/.distcc", env) == -1) {
--        rs_log_error("asprintf failed");
--        return EXIT_OUT_OF_MEMORY;
-+        if ((env = getenv("HOME")) == NULL) {
-+            rs_log_warning("HOME is not set; can't find distcc directory");
-+            return EXIT_BAD_ARGUMENTS;
-+        }
-+
-+        if (asprintf(path_ret, "%s/.distcc", env) == -1) {
-+            rs_log_error("asprintf failed");
-+            return EXIT_OUT_OF_MEMORY;
-+        }
-     }
- 
-     ret = dcc_mkdir(*path_ret);
-
-
-
diff --git a/sys-devel/distcc/files/distcc-freedesktop.patch b/sys-devel/distcc/files/distcc-freedesktop.patch
deleted file mode 100644
index 2698109..0000000
--- a/sys-devel/distcc/files/distcc-freedesktop.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-* local directory is at mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
-* comparing to mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
-M  src/mon-gnome.c
-M  Makefile.in
-M  gnome/distccmon-gnome.desktop
-
-* modified files
-
---- orig/Makefile.in
-+++ mod/Makefile.in
-@@ -45,11 +45,12 @@
- includedir = @includedir@
- oldincludedir = /usr/include
- docdir = @docdir@
--pkgdatadir = $(datadir)/@PACKAGE_NAME@
-+icondir = $(datadir)/pixmaps
-+desktopdir = $(datadir)/applications
- 
- # 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@
-@@ -508,7 +509,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
-@@ -541,8 +543,8 @@
- 	done
- 
- install-gnome-data: $(gnome_data)
--	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
--	for p in $^; do				\
--	$(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir) || exit 1;	\
--	done
-+	$(mkinstalldirs) $(DESTDIR)$(icondir)
-+	$(mkinstalldirs) $(DESTDIR)$(desktopdir)
-+	$(INSTALL_DATA) gnome/distccmon-gnome-icon.png $(DESTDIR)$(icondir)
-+	$(INSTALL_DATA) gnome/distccmon-gnome.desktop $(DESTDIR)$(desktopdir)
- 
-
-
---- orig/gnome/distccmon-gnome.desktop
-+++ mod/gnome/distccmon-gnome.desktop
-@@ -1,13 +1,11 @@
- [Desktop Entry]
--Version=0.9.4
--Encoding=UTF-8
- Exec=distccmon-gnome
- Name=distcc monitor
- GenericName=Distributed Compile Monitor
- Comment=Graphical view of distributed compile tasks
--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
-
-
---- orig/src/mon-gnome.c
-+++ mod/src/mon-gnome.c
-@@ -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-gentoo-multilib-r1.patch b/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch
deleted file mode 100644
index 8a7b37e..0000000
--- a/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff -Naurp distcc-2.18.3.orig/src/distcc.c distcc-2.18.3/src/distcc.c
---- distcc-2.18.3.orig/src/distcc.c	2004-10-01 17:47:07.000000000 -0700
-+++ distcc-2.18.3/src/distcc.c	2005-01-30 22:15:43.883870942 -0800
-@@ -135,7 +135,106 @@ static void dcc_client_catch_signals(voi
-     signal(SIGHUP, &dcc_client_signalled);
- }
- 
-+#define MAXNEWFLAGS 32
-+#define MAXFLAGLEN  127
- 
-+static char **getNewArgv(char **argv, const char *newflagsStr) {
-+	char **newargv;
-+	char newflags[MAXNEWFLAGS][MAXFLAGLEN + 1];
-+	unsigned newflagsCount = 0;
-+	unsigned argc;
-+	unsigned i;
-+	char **p;
-+
-+	unsigned s, f; /* start/finish of each flag. f points to
-+	                * the char AFTER the end (ie the space/\0
-+	                */
-+
-+	/* Tokenize the flag list */
-+	for(s=0; s < strlen(newflagsStr); s=f+1) {
-+		/* Put s at the start of the next flag */
-+		while(newflagsStr[s] == ' ' || 
-+		      newflagsStr[s] == '\t')
-+			s++;
-+		if(s == strlen(newflagsStr))
-+			break;
-+
-+		f = s + 1;
-+		while(newflagsStr[f] != ' ' && 
-+		      newflagsStr[f] != '\t' &&
-+		      newflagsStr[f] != '\0')
-+			f++;
-+
-+		/* Detect overrun */
-+		if(MAXFLAGLEN < f - s || MAXNEWFLAGS == newflagsCount)
-+			return NULL;
-+
-+		strncpy(newflags[newflagsCount], newflagsStr + s, f - s);
-+		newflags[newflagsCount][f - s]='\0';
-+		newflagsCount++;
-+	}
-+
-+	/* Calculate original argc and see if it contains -m{abi,32,64} */
-+	for(argc=0, p=argv; *p; p++, argc++) {
-+		if(newflagsCount && (strncmp(*p, "-m32", 4) == 0 ||
-+		                     strncmp(*p, "-m64", 4) == 0 ||
-+		                     strncmp(*p, "-mabi", 5) == 0)) {
-+			/* Our command line sets the ABI, warn the user about this and ignore 
-+		     newArgs by setting newflagsCount to 0.
-+			 */
-+			newflagsCount = 0;
-+			fprintf(stderr, "%s: %s detected on the command line overrides implicit %s added by the wrapper.\n", argv[0], *p, newflagsStr);
-+		}
-+	}
-+
-+	/* Allocate our array */
-+	newargv = (char **)malloc(sizeof(char *) * (argc + newflagsCount + 1));
-+
-+	/* Make room for the original, new ones, and the NULL terminator */
-+	if(!newargv)
-+		return NULL;
-+
-+	/* Build argv */
-+	newargv[0] = argv[0];
-+
-+	/* The newFlags come first since we want the environment to override them. */
-+	for(i=1; i - 1 < newflagsCount; i++) {
-+		newargv[i] = newflags[i - 1];
-+	}
-+
-+	/* We just use the existing argv[i] as the start. */
-+	for(; i - newflagsCount < argc; i++) {
-+		newargv[i] = argv[i - newflagsCount];
-+	}
-+
-+	/* And now cap it off... */
-+	newargv[i] = NULL;
-+
-+	return newargv;
-+}
-+
-+static char **getNewArgvFromEnv(char **argv) {
-+	char **newargv = argv;
-+
-+	if(getenv("ABI")) {
-+		char *envar = (char *)malloc(sizeof(char) * (strlen("CFLAGS_") + strlen(getenv("ABI")) + 1 ));
-+
-+		if(!envar)
-+			return NULL;
-+
-+		/* We use CFLAGS_${ABI} for gcc, g++, g77, etc as they are
-+		 * the same no matter which compiler we are using.
-+		 */
-+		sprintf(envar, "CFLAGS_%s", getenv("ABI"));
-+
-+		if(getenv(envar))
-+			newargv = getNewArgv(argv, getenv(envar));
-+
-+		free(envar);
-+	}
-+
-+	return newargv;
-+}
- 
- /**
-  * distcc client entry point.
-@@ -150,6 +249,7 @@ int main(int argc, char **argv)
-     int status, sg_level, tweaked_path = 0;
-     char **compiler_args;
-     char *compiler_name;
-+    char **newargv;
-     int ret;
- 
-     dcc_client_catch_signals();
-@@ -183,7 +283,12 @@ int main(int argc, char **argv)
-             goto out;
-         }
-         
--        dcc_find_compiler(argv, &compiler_args);
-+        if(!(newargv = getNewArgvFromEnv(argv))) {
-+            ret = EXIT_OUT_OF_MEMORY;
-+            goto out;
-+        }
-+        dcc_find_compiler(newargv, &compiler_args);
-+        if (newargv != argv) free(newargv);
-         /* compiler_args is now respectively either "cc -c hello.c" or
-          * "gcc -c hello.c" */
- 
-@@ -200,7 +305,12 @@ int main(int argc, char **argv)
-                                           &tweaked_path)) != 0)
-             goto out;
-         
--        dcc_copy_argv(argv, &compiler_args, 0);
-+        if(!(newargv = getNewArgvFromEnv(argv))) {
-+            ret = EXIT_OUT_OF_MEMORY;
-+            goto out;
-+        }
-+        dcc_copy_argv(newargv, &compiler_args, 0);
-+        if (newargv != argv) free(newargv);
-         compiler_args[0] = compiler_name;
-     }
- 
diff --git a/sys-devel/distcc/files/distcc-gentoo-multilib.patch b/sys-devel/distcc/files/distcc-gentoo-multilib.patch
deleted file mode 100644
index 02e0486..0000000
--- a/sys-devel/distcc/files/distcc-gentoo-multilib.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -Naur distcc-2.18.3-vanilla/src/distcc.c distcc-2.18.3/src/distcc.c
---- distcc-2.18.3-vanilla/src/distcc.c	2004-10-01 17:47:07.000000000 -0700
-+++ distcc-2.18.3/src/distcc.c	2004-12-28 01:04:51.017574246 -0800
-@@ -135,7 +135,86 @@
-     signal(SIGHUP, &dcc_client_signalled);
- }
- 
-+#define MAXNEWFLAGS 32
-+#define MAXFLAGLEN  127
- 
-+static char **getNewArgv(char **argv) {
-+    char **newargv;
-+    char newflags[MAXNEWFLAGS][MAXFLAGLEN + 1];
-+    unsigned newflagsCount = 0;
-+    unsigned argc;
-+    unsigned i;
-+    char **p;
-+
-+    if(getenv("ABI")) {
-+        char *envar = (char *)malloc(sizeof(char) * 
-+                                     (strlen("CFLAGS_") + strlen(getenv("ABI")) + 1 ));
-+        if(!envar)
-+            return NULL;
-+
-+        /* We use CFLAGS_${ABI} for gcc, g++, g77, etc as they are
-+         * the same no matter which compiler we are using.
-+         */
-+        sprintf(envar, "CFLAGS_%s", getenv("ABI"));
-+
-+        if(getenv(envar)) {
-+            const char *newflagsStr = getenv(envar);
-+            unsigned s, f; /* start/finish of each flag. f points to
-+                            * the char AFTER the end (ie the space/\0
-+                            */
-+
-+            /* Tokenize the flag list */
-+            for(s=0; s < strlen(newflagsStr); s=f+1) {
-+                /* Put s at the start of the next flag */
-+                while(newflagsStr[s] == ' ' || 
-+                      newflagsStr[s] == '\t')
-+                    s++;
-+                if(s == strlen(newflagsStr))
-+                    break;
-+
-+                f = s + 1;
-+                while(newflagsStr[f] != ' ' && 
-+                      newflagsStr[f] != '\t' &&
-+                      newflagsStr[f] != '\0')
-+                    f++;
-+
-+                /* Detect overrun */
-+                if(MAXFLAGLEN < f - s || MAXNEWFLAGS == newflagsCount)
-+                    return NULL;
-+
-+                strncpy(newflags[newflagsCount], newflagsStr + s, f - s);
-+                newflagsCount++;
-+            }
-+        }
-+
-+        free(envar);
-+    }
-+
-+    /* Calculate argc */
-+    for(argc=0, p=argv; *p; p++, argc++);
-+
-+    /* Allocate our array */
-+    newargv = (char **)malloc(sizeof(char *) * (argc + newflagsCount + 1));
-+
-+    /* Make room for the original, new ones, and the NULL terminator */
-+    if(!newargv)
-+        return NULL;
-+
-+    /* We just use the existing argv[i] as the start. */
-+    for(i=0; i < argc; i++) {
-+        newargv[i] = argv[i];
-+    }
-+
-+    /* Now we want to append our newflags list. */
-+    for(; i < argc + newflagsCount; i++) {
-+        newargv[i] = newflags[i - argc];
-+    }
-+
-+    /* And now cap it off... */
-+    newargv[i] = NULL;
-+
-+    return newargv;
-+}
- 
- /**
-  * distcc client entry point.
-@@ -150,6 +229,7 @@
-     int status, sg_level, tweaked_path = 0;
-     char **compiler_args;
-     char *compiler_name;
-+    char **newargv;
-     int ret;
- 
-     dcc_client_catch_signals();
-@@ -183,7 +263,12 @@
-             goto out;
-         }
-         
--        dcc_find_compiler(argv, &compiler_args);
-+        if(!(newargv = getNewArgv(argv))) {
-+            ret = EXIT_OUT_OF_MEMORY;
-+            goto out;
-+        }
-+        dcc_find_compiler(newargv, &compiler_args);
-+        free(newargv);
-         /* compiler_args is now respectively either "cc -c hello.c" or
-          * "gcc -c hello.c" */
- 
-@@ -200,7 +285,12 @@
-                                           &tweaked_path)) != 0)
-             goto out;
-         
--        dcc_copy_argv(argv, &compiler_args, 0);
-+        if(!(newargv = getNewArgv(argv))) {
-+            ret = EXIT_OUT_OF_MEMORY;
-+            goto out;
-+        }
-+        dcc_copy_argv(newargv, &compiler_args, 0);
-+        free(newargv);
-         compiler_args[0] = compiler_name;
-     }
- 
diff --git a/sys-devel/distcc/files/distcc-march-native.patch b/sys-devel/distcc/files/distcc-march-native.patch
deleted file mode 100644
index a5c9bb2..0000000
--- a/sys-devel/distcc/files/distcc-march-native.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur distcc-2.18.3/src/arg.c distcc-modified/src/arg.c
---- distcc-2.18.3/src/arg.c	2004-11-30 13:13:53.000000000 +0100
-+++ distcc-modified/src/arg.c	2008-02-05 17:56:58.000000000 +0100
-@@ -171,6 +171,12 @@
-                     to distribute it even if we could. */
-                 rs_trace("%s implies -E (maybe) and must be local", a);
-                 return EXIT_DISTCC_FAILED;
-+            } else if (!strcmp(a, "-march=native")) {
-+                rs_trace("-march=native generates code for local machine; must be local");
-+                return EXIT_DISTCC_FAILED;
-+            } else if (!strcmp(a, "-mtune=native")) {
-+                rs_trace("-mtune=native optimizes for local machine; must be local");
-+                return EXIT_DISTCC_FAILED;
-             } else if (str_startswith("-Wa,", a)) {
-                 /* Look for assembler options that would produce output
-                  * files and must be local.