Marked 2.7.1 as x86

21 files changed, 6 insertions, 1492 deletions

diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index df9ecfdb78a5..0aa8f6f89f56 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,36 +1,18 @@
-MD5 da890f4d3d7a6c3cb65ad47f80feff6a distcc-2.0.1.ebuild 2895
-MD5 960b9f9b17b8f9dd99094d162362dd1b distcc-2.0.1-r1.ebuild 2892
-MD5 372827ac4fc6b9dae1d585934369ce8e distcc-1.2.3-r3.ebuild 2882
-MD5 7fe299a9b4f45f39f6b209aa3711effd distcc-2.8.ebuild 3623
-MD5 8df905f30d3f4bce8c31534396b66ec8 distcc-2.3.ebuild 2691
+MD5 433082661e66dcd83cd0630ae2108503 distcc-2.8.ebuild 3623
 MD5 7b08a44d08561a7ff5ddb161bc661419 distcc-2.5-r1.ebuild 3176
 MD5 c958bfeb956960d4b15ebab2df7a6d86 distcc-2.5.ebuild 2702
 MD5 0b8da22979cd451f59bd17baabd4a121 distcc-2.7.ebuild 3451
-MD5 3bc5a82158ff39298b4b80134999ddde distcc-2.4.2.ebuild 2703
-MD5 336a273c0f0a8e36ee2d919d468fc95e distcc-2.7.1.ebuild 3873
-MD5 c242a8c0ff4035a2c6a3ee0545691aed distcc-2.4.ebuild 2702
-MD5 2546400cd984dcc7a336728c48d859e6 ChangeLog 9092
-MD5 8aa55227d128b8ff22a8caf5d47db89c files/digest-distcc-2.3 63
-MD5 ad45ec1dfb325e1a1fc90d3148669030 files/digest-distcc-2.4 63
+MD5 ddb22cb3df08802286ef0139263ff899 distcc-2.7.1.ebuild 3870
+MD5 c1f8d7b2d4c298a3979fd8114b3df713 ChangeLog 9173
 MD5 e1ecfcc1aad7c385cf3c41966277cda7 files/digest-distcc-2.5 63
 MD5 5826ae3f83bd02bda94fa0e9343ef3fe files/digest-distcc-2.7 63
 MD5 56fd1ac60c1b8402e1632da62f32a890 files/digest-distcc-2.8 63
-MD5 9a3a39b4f229559e6a855d777c6fe807 files/digest-distcc-2.0.1-r1 65
-MD5 9a3a39b4f229559e6a855d777c6fe807 files/digest-distcc-2.0.1 65
-MD5 7419afd18da5cfb1bf62c16c2d20ca6e files/digest-distcc-2.4.2 65
 MD5 2c4c5f6d6980e4b17d7daea1399292d8 files/digest-distcc-2.7.1 65
 MD5 e1ecfcc1aad7c385cf3c41966277cda7 files/digest-distcc-2.5-r1 63
-MD5 9bad5d7dc8c33d22ff42efcc299f1067 files/digest-distcc-1.2.3-r3 65
-MD5 34d20e7bf223ac2f2ec61c5a7a9b2e3c files/1.2/conf 314
-MD5 3783a1abcbd33bc1d24e14012edeb696 files/1.2/init 484
-MD5 785e2966bd49522fd593e9f92e926c46 files/2.3/distcc-config 7389
 MD5 34d20e7bf223ac2f2ec61c5a7a9b2e3c files/2.8/conf 314
 MD5 3783a1abcbd33bc1d24e14012edeb696 files/2.8/init 484
 MD5 ee4f0fde9d5e6fe88bf7f513cf12920c files/2.8/001_fix_tempfile.patch.gz 251
 MD5 26e10491f8255c781cc0e33aa1ebe628 files/2.8/distcc-config 7387
-MD5 d4fd07d7d3d3e3952baef8c654d2715f files/1.2.3/info.patch 545
-MD5 22c6ce6c5fde53bc04590015d9d82e50 files/1.2.3/distcc-config 6858
-MD5 6bc82bf32667e5398497b2dae88f1033 files/1.2.3/wrapper.patch 5242
 MD5 34d20e7bf223ac2f2ec61c5a7a9b2e3c files/2.7.1/conf 314
 MD5 3783a1abcbd33bc1d24e14012edeb696 files/2.7.1/init 484
 MD5 e20ae373aa396d16c03ca33d11247183 files/2.7.1/distcc-config 7391
diff --git a/sys-devel/distcc/distcc-1.2.3-r3.ebuild b/sys-devel/distcc/distcc-1.2.3-r3.ebuild
deleted file mode 100644
index 24f31649c6e0..000000000000
--- a/sys-devel/distcc/distcc-1.2.3-r3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-1.2.3-r3.ebuild,v 1.3 2003/04/17 18:48:27 zwelch Exp $
-
-inherit eutils
-
-IUSE=""
-
-HOMEPAGE="http://distcc.samba.org/"
-SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2"
-DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa mips arm"
-
-OPV="1.2"
-LPV="1.2.1"
-
-DEPEND=">=sys-apps/portage-2.0.46-r11
-	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow
-	dev-libs/popt"
-
-src_unpack() {
-	unpack distcc-${PV}.tar.bz2
-#	cp -a distcc-${PV} distcc-${PV}.orig
-	epatch "${FILESDIR}/${PV}/wrapper.patch" || die
-	epatch "${FILESDIR}/${PV}/info.patch" || die
-}
-
-src_compile() {
-	econf || die "econf 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}/${PV}/distcc-config"
-
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${OPV}/conf" distccd
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/${OPV}/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
-}
-
-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
-
-	# moved user creation and permissions to distcc-config script
-	#  because of ROOT install requirements
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]; then
-		einfo "Installing links to native compilers..."
-		/usr/bin/distcc-config --install-user
-		/usr/bin/distcc-config --install-links
-		/usr/bin/distcc-config --install-links "${CHOST}"
-	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 "To use distcc with **non-Portage** C compiling, add"
-	einfo "/usr/lib/distcc/bin to your path before /usr/bin.  If you're"
-	einfo "combining this with ccache, put the distcc dir AFTER ccache."
-	einfo "Portage 2.0.46-r11+ will take advantage of distcc if you put"
-	einfo "distcc into the FEATURES setting in make.conf (and define"
-	einfo "DISTCC_HOSTS as well). Do NOT set CC=distcc or similar."
-	ewarn "See http://cvs.gentoo.org/~zwelch/distcc.html for information."
-}
-
-#pkg_prerm() {
-#   # ztw - not sure if this is the right place
-#	distcc-config --remove-links "${CHOST}"
-#	distcc-config --remove-links
-#}
-
diff --git a/sys-devel/distcc/distcc-2.0.1-r1.ebuild b/sys-devel/distcc/distcc-2.0.1-r1.ebuild
deleted file mode 100644
index c63b57454ab3..000000000000
--- a/sys-devel/distcc/distcc-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.0.1-r1.ebuild,v 1.1 2003/04/28 20:27:33 zwelch Exp $
-
-inherit eutils
-
-IUSE=""
-
-HOMEPAGE="http://distcc.samba.org/"
-SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2"
-DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa mips arm"
-
-OPV="1.2"
-LPV="1.2.3"
-
-DEPEND=">=sys-apps/portage-2.0.46-r11
-	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow
-	dev-libs/popt"
-
-src_unpack() {
-	unpack distcc-${PV}.tar.bz2
-#	cp -a distcc-${PV} distcc-${PV}.orig
-#	epatch "${FILESDIR}/${LPV}/wrapper.patch" || die
-#	patch -p1 < "${FILESDIR}/${LPV}/info.patch" || die
-}
-
-src_compile() {
-	econf || die "econf 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}/${LPV}/distcc-config"
-
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${OPV}/conf" distccd
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/${OPV}/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
-}
-
-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
-
-	# moved user creation and permissions to distcc-config script
-	#  because of ROOT install requirements
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]; then
-		einfo "Installing links to native compilers..."
-		/usr/bin/distcc-config --install-user
-		/usr/bin/distcc-config --install-links
-		/usr/bin/distcc-config --install-links "${CHOST}"
-	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 "To use distcc with **non-Portage** C compiling, add"
-	einfo "/usr/lib/distcc/bin to your path before /usr/bin.  If you're"
-	einfo "combining this with ccache, put the distcc dir AFTER ccache."
-	einfo "Portage 2.0.46-r11+ will take advantage of distcc if you put"
-	einfo "distcc into the FEATURES setting in make.conf (and define"
-	einfo "DISTCC_HOSTS as well). Do NOT set CC=distcc or similar."
-	ewarn "See http://cvs.gentoo.org/~zwelch/distcc.html for information."
-}
-
-#pkg_prerm() {
-#   # ztw - not sure if this is the right place
-#	distcc-config --remove-links "${CHOST}"
-#	distcc-config --remove-links
-#}
-
diff --git a/sys-devel/distcc/distcc-2.0.1.ebuild b/sys-devel/distcc/distcc-2.0.1.ebuild
deleted file mode 100644
index 122aceecb9c3..000000000000
--- a/sys-devel/distcc/distcc-2.0.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.0.1.ebuild,v 1.1 2003/04/01 22:16:26 zwelch Exp $
-
-inherit eutils
-
-IUSE=""
-
-HOMEPAGE="http://distcc.samba.org/"
-SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2"
-DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc alpha ~hppa ~mips ~arm"
-
-OPV="1.2"
-LPV="1.2.3"
-
-DEPEND=">=sys-apps/portage-2.0.46-r11
-	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow
-	dev-libs/popt"
-
-src_unpack() {
-	unpack distcc-${PV}.tar.bz2
-#	cp -a distcc-${PV} distcc-${PV}.orig
-#	epatch "${FILESDIR}/${LPV}/wrapper.patch" || die
-#	patch -p1 < "${FILESDIR}/${LPV}/info.patch" || die
-}
-
-src_compile() {
-	econf || die "econf 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}/${LPV}/distcc-config"
-
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${OPV}/conf" distccd
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/${OPV}/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
-}
-
-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
-
-	# moved user creation and permissions to distcc-config script
-	#  because of ROOT install requirements
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]; then
-		einfo "Installing links to native compilers..."
-		/usr/bin/distcc-config --install-user
-		/usr/bin/distcc-config --install-links
-		/usr/bin/distcc-config --install-links "${CHOST}"
-	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 "To use distcc with **non-Portage** C compiling, add"
-	einfo "/usr/lib/distcc/bin to your path before /usr/bin.  If you're"
-	einfo "combining this with ccache, put the distcc dir AFTER ccache."
-	einfo "Portage 2.0.46-r11+ will take advantage of distcc if you put"
-	einfo "distcc into the FEATURES setting in make.conf (and define"
-	einfo "DISTCC_HOSTS as well). Do NOT set CC=distcc or similar."
-	ewarn "See http://cvs.gentoo.org/~zwelch/distcc.html for information."
-}
-
-#pkg_prerm() {
-#   # ztw - not sure if this is the right place
-#	distcc-config --remove-links "${CHOST}"
-#	distcc-config --remove-links
-#}
-
diff --git a/sys-devel/distcc/distcc-2.3.ebuild b/sys-devel/distcc/distcc-2.3.ebuild
deleted file mode 100644
index ad44b655b85b..000000000000
--- a/sys-devel/distcc/distcc-2.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.3.ebuild,v 1.1 2003/05/21 10:15:09 zwelch Exp $
-
-inherit eutils
-
-IUSE=""
-
-HOMEPAGE="http://distcc.samba.org/"
-SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2"
-DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
-
-OPV="1.2"
-
-DEPEND=">=sys-apps/portage-2.0.46-r11
-	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow
-	dev-libs/popt"
-
-src_compile() {
-	econf || die "econf 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}/${PV}/distcc-config"
-
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${OPV}/conf" distccd
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/${OPV}/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
-}
-
-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
-
-	# moved user creation and permissions to distcc-config script
-	#  because of ROOT install requirements
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]; then
-		einfo "Installing links to native compilers..."
-		/usr/bin/distcc-config --install-user
-		/usr/bin/distcc-config --install-links
-		/usr/bin/distcc-config --install-links "${CHOST}"
-	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 "To use distcc with **non-Portage** C compiling, add"
-	einfo "/usr/lib/distcc/bin to your path before /usr/bin.  If you're"
-	einfo "combining this with ccache, put the distcc dir AFTER ccache."
-	einfo "Portage 2.0.46-r11+ will take advantage of distcc if you put"
-	einfo "distcc into the FEATURES setting in make.conf (and define"
-	einfo "DISTCC_HOSTS as well). Do NOT set CC=distcc or similar."
-	ewarn "See http://cvs.gentoo.org/~zwelch/distcc.html for information."
-}
-
-#pkg_prerm() {
-#   # ztw - not sure if this is the right place
-#	distcc-config --remove-links "${CHOST}"
-#	distcc-config --remove-links
-#}
-
diff --git a/sys-devel/distcc/distcc-2.4.2.ebuild b/sys-devel/distcc/distcc-2.4.2.ebuild
deleted file mode 100644
index 445e65f0ea89..000000000000
--- a/sys-devel/distcc/distcc-2.4.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.4.2.ebuild,v 1.1 2003/05/23 20:00:16 hanno Exp $
-
-inherit eutils
-
-IUSE=""
-
-HOMEPAGE="http://distcc.samba.org/"
-SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2"
-DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
-
-OPV="1.2"
-LPV="2.3"
-
-DEPEND=">=sys-apps/portage-2.0.46-r11
-	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow
-	dev-libs/popt"
-
-src_compile() {
-	econf || die "econf 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}/${LPV}/distcc-config"
-
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${OPV}/conf" distccd
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/${OPV}/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
-}
-
-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
-
-	# moved user creation and permissions to distcc-config script
-	#  because of ROOT install requirements
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]; then
-		einfo "Installing links to native compilers..."
-		/usr/bin/distcc-config --install-user
-		/usr/bin/distcc-config --install-links
-		/usr/bin/distcc-config --install-links "${CHOST}"
-	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 "To use distcc with **non-Portage** C compiling, add"
-	einfo "/usr/lib/distcc/bin to your path before /usr/bin.  If you're"
-	einfo "combining this with ccache, put the distcc dir AFTER ccache."
-	einfo "Portage 2.0.46-r11+ will take advantage of distcc if you put"
-	einfo "distcc into the FEATURES setting in make.conf (and define"
-	einfo "DISTCC_HOSTS as well). Do NOT set CC=distcc or similar."
-	ewarn "See http://cvs.gentoo.org/~zwelch/distcc.html for information."
-}
-
-#pkg_prerm() {
-#   # ztw - not sure if this is the right place
-#	distcc-config --remove-links "${CHOST}"
-#	distcc-config --remove-links
-#}
-
diff --git a/sys-devel/distcc/distcc-2.4.ebuild b/sys-devel/distcc/distcc-2.4.ebuild
deleted file mode 100644
index e006be2b7b69..000000000000
--- a/sys-devel/distcc/distcc-2.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.4.ebuild,v 1.1 2003/05/21 10:15:09 zwelch Exp $
-
-inherit eutils
-
-IUSE=""
-
-HOMEPAGE="http://distcc.samba.org/"
-SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2"
-DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
-
-OPV="1.2"
-LPV="2.3"
-
-DEPEND=">=sys-apps/portage-2.0.46-r11
-	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow
-	dev-libs/popt"
-
-src_compile() {
-	econf || die "econf 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}/${LPV}/distcc-config"
-
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${OPV}/conf" distccd
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/${OPV}/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
-}
-
-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
-
-	# moved user creation and permissions to distcc-config script
-	#  because of ROOT install requirements
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]; then
-		einfo "Installing links to native compilers..."
-		/usr/bin/distcc-config --install-user
-		/usr/bin/distcc-config --install-links
-		/usr/bin/distcc-config --install-links "${CHOST}"
-	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 "To use distcc with **non-Portage** C compiling, add"
-	einfo "/usr/lib/distcc/bin to your path before /usr/bin.  If you're"
-	einfo "combining this with ccache, put the distcc dir AFTER ccache."
-	einfo "Portage 2.0.46-r11+ will take advantage of distcc if you put"
-	einfo "distcc into the FEATURES setting in make.conf (and define"
-	einfo "DISTCC_HOSTS as well). Do NOT set CC=distcc or similar."
-	ewarn "See http://cvs.gentoo.org/~zwelch/distcc.html for information."
-}
-
-#pkg_prerm() {
-#   # ztw - not sure if this is the right place
-#	distcc-config --remove-links "${CHOST}"
-#	distcc-config --remove-links
-#}
-
diff --git a/sys-devel/distcc/distcc-2.7.1.ebuild b/sys-devel/distcc/distcc-2.7.1.ebuild
index 9a6ffce67ac8..684487d49aa4 100644
--- a/sys-devel/distcc/distcc-2.7.1.ebuild
+++ b/sys-devel/distcc/distcc-2.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.7.1.ebuild,v 1.1 2003/07/01 12:06:13 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.7.1.ebuild,v 1.2 2003/07/11 02:07:15 lisa Exp $
 
 inherit eutils gcc flag-o-matic
 [ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -11,7 +11,7 @@ DESCRIPTION="a program to distribute compilation of C code across several machin
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
 IUSE="gnome"
 
 DEPEND=">=sys-apps/portage-2.0.46-r11
diff --git a/sys-devel/distcc/distcc-2.8.ebuild b/sys-devel/distcc/distcc-2.8.ebuild
index 078a0d4d1483..c061509cc9c6 100644
--- a/sys-devel/distcc/distcc-2.8.ebuild
+++ b/sys-devel/distcc/distcc-2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.8.ebuild,v 1.1 2003/07/10 16:04:43 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.8.ebuild,v 1.2 2003/07/11 02:07:16 lisa Exp $
 
 inherit eutils gcc flag-o-matic
 [ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -114,4 +114,3 @@ pkg_postinst() {
 	einfo "To use the distccmon programs with Gentoo you should use this command:"
 	einfo "   sudo -H -u portage distccmon-text OR sudo -H -u portage distccmon-gnome"
 }
-
diff --git a/sys-devel/distcc/files/1.2.3/distcc-config b/sys-devel/distcc/files/1.2.3/distcc-config
deleted file mode 100644
index d5ea03a20554..000000000000
--- a/sys-devel/distcc/files/1.2.3/distcc-config
+++ /dev/null
@@ -1,296 +0,0 @@
-#!/bin/bash
-#
-# distcc-config - helper script for distcc and distccd
-#
-# Copyright 2003 Superlucidity Services, LLC 
-# This program licensed under the GNU GPL version 2.
-#
-# This script developed by Zachary T Welch at Superlucidity Services, LLC
-#  based on ideas from irc discussion and the clear need for this support
-# 
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/1.2.3/distcc-config,v 1.7 2003/04/28 20:27:33 zwelch Exp $
-
-
-[ -z "${ROOT}" ] && ROOT=/
-
-# distcc-config manges the DISTCC_{HOSTS,LOG,VERBOSE} settings here
-# moved to accomodate 02ccache and leave 0[14]* free
-DCCC_ENV_FILE="${ROOT}etc/env.d/02distcc"
-DCCC_OLD_ENV="${ROOT}etc/env.d/04distcc"
-
-# this should be getopt'd someday (override with DCCC_QUIET)
-DCCC_VERBOSE=1
-
-source /sbin/functions.sh
-
-dccc_echo() {
-	[ -z "${DCCC_QUIET}" -a -n "${DCCC_VERBOSE}" ] && echo "$*"
-}
-dccc_exit() {
-	dccc_echo "$*"
-	exit 1
-}
-
-[ "$(id -u)" != 0 ] && dccc_exit "$0 must be run by root"
-
-###
-# the following functions manage the distcc symlinks
-#  they allow the user or other scripts (namely gcc-config) to
-#  automatically update distcc's links when upgrading toolchains
-#
-dccc_remove_link() {
-	local t="${ROOT}usr/lib/distcc/bin/${1}"
-	if [ -L ${t} ]; then
-		dccc_echo "Removing ${t}..."
-		rm -f "${t}"
-	fi
-}
-dccc_install_link() {
-	# Search the PATH for the specified compiler
-	#  then create shadow link in ${ROOT}usr/lib/distcc/bin to distcc
-	#  note: this `type' doesn't do the right thing if ROOT != /
-	if [ -n "$(type -p ${1})" ]; then 
-		# first be sure any old link is removed
-		DCCC_QUIET=1 dccc_remove_link "${1}"
-
-		# then create the new link
-		local t="${ROOT}usr/lib/distcc/bin/${1}"
-		dccc_echo "Creating distcc shadow link: ${t}..."
-		ln -s /usr/bin/distcc "${t}"
-	fi
-}
-dccc_links() {
-	local a
-	for a in gcc cc c++ g++ ; do
-		[ -n "${2}" ] && a="${2}-${a}"
-		eval "dccc_${1}_link" "${a}"
-	done
-}
-
-dccc_install_user() {
-	# update or create, depending on whether user already exists
-	einfo "Updating or creating distcc user..."
-	local USERFIX
-	id distcc >/dev/null 2>&1 && USERFIX=usermod || USERFIX=useradd
-	USERFIX="/usr/sbin/${USERFIX}"
-	if [ -x "${USERFIX}" ]
-	then
-		if ! ${USERFIX} -g daemon -s /bin/false -d /dev/null \
-				-c "distccd" distcc 
-		then
-			dccc_exit "unable to create or modify user"
-		fi
-	elif [ "${USERFIX}" = "/usr/sbin/useradd" ]
-	then
-		ewarn "${USERFIX} not found: You need to add the distcc user"
-		ewarn "to /etc/passwd by hand.  Add the following line:\n"
-		ewarn "  distcc:x:240:2:distccd:/dev/null:/bin/false\n"
-		ewarn "and then run 'distcc-config --install' again root."
-		dccc_exit "Unable to create distcc user!"
-	fi
-
-	for d in ${ROOT}usr/lib/distcc/bin ${ROOT}var/run/distccd ; do
-		einfo "Configuring $d..."
-		chown distcc:daemon $d && chmod 0755 $d || \
-			dccc_exit "Unable to configure ${d}!"
-	done
-}
-
-dccc_guess_chost() {
-	echo "$(grep CHOST /etc/make.conf | \
-		grep -v '^#' | sed 's,^.*=\"\(.*\)\",\1,')"
-
-}
-
-######
-# routines for manipulating ${DCCC_ENV_FILE}
-
-dccc_install_env() {
-	[ -f ${DCCC_OLD_ENV} ] && mv ${DCCC_OLD_ENV} ${DCCC_ENV_FILE}
-	[ -f ${DCCC_ENV_FILE} ] && return
-	einfo "Creating ${DCCC_ENV_FILE}..."
-	cat <<_EOF_ > ${DCCC_ENV_FILE} || \
-		dccc_exit "Unable to create ${DCCC_ENV_FILE}..."
-# This file is managed by distcc-config; use it to change these settings.
-DISTCC_HOSTS="localhost"
-# DISTCC_VERBOSE is not set
-# DISTCC_LOG is not set
-# DCCC_PATH is not set
-_EOF_
-}
-
-dccc_show_env() {
-	grep -v '^#' ${DCCC_ENV_FILE} | sed -e 's,^,export ,'
-}
-
-dccc_test_env() {
-	dccc_show_env | grep "$1" | tail -1 | sed -e "s,${1}=,,"
-}
-
-dccc_load_defaults() {
-	rm -f ${DCCC_ENV_FILE}
-	dccc_install_env
-}
-
-dccc_set_env() {
-	local xxENV="${1}"
-	shift
-	dccc_install_env
-	mv -f ${DCCC_ENV_FILE} ${DCCC_ENV_FILE}.tmp
-	if [ -n "${*}" ]; then
-		einfo "Setting ${xxENV}=\"${*}\""
-	else
-		einfo "Clearing ${xxENV}"
-	fi
-	# redirect the following block to create new file
-	{
-		egrep -v "${xxENV}[= ]" ${DCCC_ENV_FILE}.tmp
-		if [ -n "${*}" ]; then
-			echo "${xxENV}=\"${*}\""
-		else
-			echo "# ${xxENV} is not set" 
-		fi 
-	} >> ${DCCC_ENV_FILE}
-	rm -f ${DCCC_ENV_FILE}.tmp
-}
-dccc_regen_env() {
-	env-update
-	if [ -z "${DCCC_NO_WARN}" ]; then
-	  einfo "If you want to use these new settings in an existing shell,"
-	  einfo "you need to 'source /etc/profile' to get the changes."
-	fi
-}
-
-dccc_get_env() {
-	if [ -f ${DCCC_ENV_FILE} ]; then
-		local xxENV="$(grep ${1} ${DCCC_ENV_FILE} | \
-			grep -v '^#' | tail -1)"
-		echo ${xxENV#*=} | sed -e 's,^",,;s,"$,,'
-	elif [ -n "${2}" ]; then
-		echo "${2}"
-	fi
-}
-
-dccc_set_hosts() {
-	dccc_set_env DISTCC_HOSTS "${@}"
-	dccc_regen_env
-}
-dccc_get_hosts() {
-	dccc_get_env DISTCC_HOSTS localhost
-}
-
-dccc_set_verbose() {
-	dccc_set_env DISTCC_VERBOSE ${1}
-	dccc_regen_env
-}
-dccc_get_verbose() {
-	dccc_get_env DISTCC_VERBOSE
-}
-
-dccc_set_log() {
-	dccc_set_env DISTCC_LOG ${1}
-	dccc_regen_env
-}
-dccc_get_log() {
-	dccc_get_env DISTCC_LOG
-}
-
-dccc_set_j() {
-	local j="$(echo ${1} | sed -e 's,[^0-9],,g')"
-	[ -z "${j}" ] && \
-		dccc_exit "$0: invalid -j option (must be a number)"
-	dccc_set_env MAKEOPTS "-j${j}"
-	dccc_regen_env
-}
-dccc_get_j() {
-	dccc_get_env MAKEOPTS
-}
-
-####
-# main install routine
-
-dccc_install() {
-	local xxCHOST
-	dccc_install_user
-	dccc_links install ""
-	for f in make.conf make.globals make.profile/make.defaults
-	do
-		xxCHOST="$(dccc_guess_chost /etc/${f})"
-		if [ -n "${xxCHOST}" ]; then
-			dccc_links install "${xxCHOST}"
-			break
-		fi
-	done
-
-	dccc_install_env
-}
-
-
-###
-# main routine
-
-# The --no-profile-warning option is meant to be used with
-#   the following helper function (add to ~/.bashrc)
-#
-# distcc-config() {
-#   command distcc-config --no-profile-warning "$@" && \
-#	source /etc/profile
-# }
-
-if [ "${1}" = "--no-profile-warning" ]; then
-	DCCC_NO_WARN=1
-	shift
-fi
-
-case "${1}" in
-	--get-* )
-		eval "dccc_$(echo ${1} | sed -e 's/^--//;s/-/_/g')"
-		;;
-	--set-* )
-		SET_FUNC="$(echo ${1} | sed -e 's/^--//;s/-/_/g')"
-		shift
-		[ "${#}" -eq 0 ] && dccc_exit "argument required"
-		eval "dccc_${SET_FUNC} ${*}"
-		;;
-	--has-path )
-		dccc_test_env DCCC_PATH
-		;;
-	--add-path )
-		dccc_set_env DCCC_PATH "/usr/lib/distcc/bin"
-		dccc_regen_env
-		if [ -z "${DCCC_NO_WARN}" ]; then
-			einfo "You must then set PATH=\"${DCCC_PATH}/\${PATH}\""
-		fi
-		;;
-	--no-path )
-		dccc_set_env DCCC_PATH ""
-		dccc_regen_env
-		;;
-	--show-env )
-		dccc_show_env
-		;;
-	--load-defaults )
-		dccc_load_defaults
-		;;
-	--install )
-		dccc_install
-		;;
-	--install-user )
-		dccc_install_user
-		;;
-	--install-links )
-		dccc_links install "${2}"
-		;;
-	--remove-links )
-		dccc_links remove "${2}"
-		;;
-	* )
-		echo "usage: ${0} --set-hosts DISTCC_HOSTS | --get-hosts"
-		echo "       ${0} --set-verbose { 0 | 1 }   | --get-verbose"
-		echo "       ${0} --set-log FILE  | --get-log" 
-		echo "       ${0} --add-path      | --no-path"
-#		echo "       ${0} --install-links | --remove-links } [ CHOST ]"
-		exit 1
-		;;
-esac
-
diff --git a/sys-devel/distcc/files/1.2.3/info.patch b/sys-devel/distcc/files/1.2.3/info.patch
deleted file mode 100644
index aac642a67f48..000000000000
--- a/sys-devel/distcc/files/1.2.3/info.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -auNr distcc-1.2.3.orig/linuxdoc/distcc.info distcc-1.2.3/linuxdoc/distcc.info
---- distcc-1.2.3.orig/linuxdoc/distcc.info	2003-03-01 15:29:15.000000000 -0800
-+++ distcc-1.2.3/linuxdoc/distcc.info	2003-03-17 15:19:05.000000000 -0800
-@@ -1,6 +1,10 @@
- This is distcc.info, produced by makeinfo version 4.2 from
- /tmp/linuxdoc-dir-17600/sgmltmp.distcc.info.2.
- 
-+START-INFO-DIR-ENTRY
-+* distcc: (distcc).             distributed C and C++ compiler utility
-+END-INFO-DIR-ENTRY
-+
- 
- File: distcc.info,  Node: Top,  Next: Overview,  Up: (dir)
- 
diff --git a/sys-devel/distcc/files/1.2.3/wrapper.patch b/sys-devel/distcc/files/1.2.3/wrapper.patch
deleted file mode 100644
index d9b95f631232..000000000000
--- a/sys-devel/distcc/files/1.2.3/wrapper.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-diff -aur distcc-1.2.3.orig/src/distcc.c distcc-1.2.3/src/distcc.c
---- distcc-1.2.3.orig/src/distcc.c	2003-02-23 14:33:19.000000000 -0800
-+++ distcc-1.2.3/src/distcc.c	2003-02-26 16:36:57.000000000 -0800
-@@ -481,6 +481,156 @@
-     }
- }
- 
-+static char *dcc_safe_getcwd(void) 
-+{
-+	char *cwdstr;
-+	size_t len = 200;
-+
-+	do {
-+		cwdstr = malloc(len);
-+		if (NULL == cwdstr) break;
-+
-+		if (NULL == getcwd(cwdstr, len)) {
-+			free(cwdstr);
-+			cwdstr = NULL;
-+			if (ERANGE == errno) {
-+				len += 200;
-+				continue;
-+			}
-+		}
-+	} while(0);
-+
-+	if (NULL == cwdstr) {
-+		rs_log_error("can't get working directory");
-+		exit(1);
-+	}
-+
-+	return cwdstr;
-+}
-+
-+/**
-+ * Filter PATH past point that wrapper was called
-+ */
-+static void dcc_wrapper_trunc_path(char *progname, char *path, char *argv[]) 
-+{
-+    static const char *envpath = "PATH=";
-+    const char *p;
-+    char *n, *str;
-+    char *ppath = NULL;
-+    int len, maxlen, plen = 0;
-+
-+    maxlen = strlen(path) + strlen(envpath) + 1;
-+    str = malloc(maxlen);
-+    if (NULL == str) exit(1);
-+
-+    /* if we were called explicitly, find the (partial) path */
-+    if (progname != argv[0]) {
-+    	/* eliminate this explicit path from PATH */ 
-+        char *cwdstr = NULL;
-+	size_t cwdlen = 0;
-+
-+	if ('/' != argv[0][0]) {
-+		cwdstr = dcc_safe_getcwd();
-+		cwdlen = strlen(cwdstr);
-+		/* or we could just error out and exit??? */
-+	}
-+
-+	plen = progname - argv[0] - 1;
-+	len = cwdlen + plen;
-+        ppath = malloc(len);
-+	if (NULL == ppath) exit(1);
-+
-+	ppath[0] = 0;
-+	if (NULL != cwdstr) {
-+		strncpy(ppath, cwdstr, len);
-+		ppath[cwdlen++] = '/';
-+		ppath[cwdlen] = 0;
-+		free(cwdstr);
-+	}
-+	strncat(ppath, argv[0], cwdlen + plen);
-+	rs_trace("looking for explicit path: %s\n", ppath);
-+    }
-+    else
-+        ppath = NULL;
-+	    
-+    for (p = n = path; NULL != n; p = n ? n + 1 : NULL) {
-+        n = strchr(p, ':');
-+        if (NULL != n)	
-+            len = n - p;
-+	else
-+            len = strlen(p);
-+
-+        if (NULL != ppath) {
-+	    /* check for partial path name match,
-+	        pmatch is last portion of path */
-+	    rs_trace("checking for ppath in %s\n", p);
-+            if (len != plen || 0 != strncmp(p, ppath, len))
-+                continue;
-+        }
-+	else {
-+	    strncpy(str, p, len);
-+            snprintf(str + len, maxlen - len, "/%s", progname);
-+	    rs_trace("checking %s\n", str);
-+            if (0 != access(str, X_OK))
-+                continue;
-+	    rs_trace("found %s\n", str);
-+        }
-+        /* getting here means either we found the path we ran in, or
-+           we found the target program we're trying to run;
-+           so PATH now starts at next entry */
-+	if (NULL != n)
-+	    p = n + 1;
-+	else
-+	    p = "";
-+        break;
-+    }
-+
-+    /* if temp path, p, still contains something, reset PATH;
-+       p will be NULL if relative or non-PATH invocation, so
-+       the current path is probably free from recursion */
-+    if (NULL != p) {
-+	strncpy(str, envpath, maxlen);
-+	strncat(str, p, maxlen);
-+	rs_trace("wrapper is setting %s\n", str);
-+	n = strdup(str);
-+        if ((NULL == n) || (-1 == putenv(n))) {
-+                rs_log_error("putenv PATH failed");
-+                exit(1);
-+        }
-+    }
-+    else
-+        rs_trace("wrapper not modifying PATH");
-+
-+    free(str);
-+    free(ppath);
-+}
-+
-+static char *dcc_support_wrapper(char *argv[])
-+{
-+    char *progname, *envstr;
-+
-+    /* see if program was called with a full or partial path */
-+    if ((progname = strrchr(argv[0], '/')) != NULL)
-+        progname++;
-+    else
-+        progname = argv[0];
-+
-+    if (NULL == (envstr = getenv("DISTCC_HOSTS"))) {
-+    	char localonly[] = "DISTCC_HOSTS=localhost";
-+    	if (-1 == putenv(localonly)) {
-+            rs_log_error("unable to set default DISTCC_HOSTS");
-+	    exit(1);
-+	}
-+    }
-+
-+    /* right now, we're only playing with path... but
-+       wouldn't it be interesting to look at CHOST, too? */
-+    if (NULL != (envstr = getenv("PATH")))
-+        dcc_wrapper_trunc_path(progname, envstr, argv);
-+    
-+    return progname;
-+}
-+
- 
- /**
-  * distcc client entry point.
-@@ -490,6 +640,7 @@
-  * Performs basic setup and checks for distcc arguments, and then kicks of
-  * dcc_build_somewhere().
-  **/
-+#include <libgen.h>
- int main(int argc, char **argv)
- {
-     int status;
-@@ -499,17 +650,25 @@
- 
-     dcc_set_trace_from_env();
- 
--    if (argc <= 1 || !strcmp(argv[1], "--help")) {
--        dcc_show_usage();
--        exit(0);
--    } else if (!strcmp(argv[1], "--version")) {
--        dcc_show_version("distcc");
--        exit(0);
--    }
--
-     dcc_recursion_safeguard();
- 
--    dcc_find_compiler(argv, &compiler_args);
-+    if (NULL != strstr(basename(argv[0]), "distcc")) {
-+
-+        if (argc <= 1 || !strcmp(argv[1], "--help")) {
-+            dcc_show_usage();
-+            exit(0);
-+        } else if (!strcmp(argv[1], "--version")) {
-+            dcc_show_version("distcc");
-+            exit(0);
-+        }
-+
-+        dcc_find_compiler(argv, &compiler_args);
-+    }
-+    else {
-+    	char *progname = dcc_support_wrapper(argv);
-+        dcc_shallowcopy_argv(argv, &compiler_args, 0);
-+        compiler_args[0] = progname;
-+    }
- 
-     dcc_exit(dcc_build_somewhere(compiler_args, &status));
- }
diff --git a/sys-devel/distcc/files/1.2/conf b/sys-devel/distcc/files/1.2/conf
deleted file mode 100644
index b775d7d09940..000000000000
--- a/sys-devel/distcc/files/1.2/conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2003 Gentoo Technologies, Inc
-# distccd configuration file
-
-# 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
-# DISTCCD_OPTS="--nice 20"
-
diff --git a/sys-devel/distcc/files/1.2/init b/sys-devel/distcc/files/1.2/init
deleted file mode 100644
index c183d62648ab..000000000000
--- a/sys-devel/distcc/files/1.2/init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-}
-
-start() {
-	rm -f ${DISTCCD_PIDFILE}
-	ebegin "Starting distccd"
-	PATH="$(gcc-config --get-bin-path):${PATH}" \
-	    /sbin/start-stop-daemon --start --quiet \
-	        --startas ${DISTCCD_EXEC} \
-		-c distcc --pidfile ${DISTCCD_PIDFILE} \
-		-- --pid-file ${DISTCCD_PIDFILE} ${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.3/distcc-config b/sys-devel/distcc/files/2.3/distcc-config
deleted file mode 100644
index 61230714b366..000000000000
--- a/sys-devel/distcc/files/2.3/distcc-config
+++ /dev/null
@@ -1,322 +0,0 @@
-#!/bin/bash
-#
-# distcc-config - helper script for distcc and distccd
-#
-# Copyright 2003 Superlucidity Services, LLC 
-# This program licensed under the GNU GPL version 2.
-#
-# This script developed by Zachary T Welch at Superlucidity Services, LLC
-#  based on ideas from irc discussion and the clear need for this support
-# 
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.3/distcc-config,v 1.2 2003/05/30 09:23:56 zwelch Exp $
-
-
-[ -z "${ROOT}" ] && ROOT=/
-
-# distcc-config manges the DISTCC_{HOSTS,LOG,VERBOSE} settings here
-# moved to accomodate 02ccache and leave 0[14]* free
-DCCC_ENV_FILE="${ROOT}etc/env.d/02distcc"
-DCCC_OLD_ENV="${ROOT}etc/env.d/04distcc"
-
-is_super_user() {
-	[ "$(id -u)" = 0 ]
-}
-# this should be getopt'd someday (override with DCCC_QUIET)
-DCCC_VERBOSE=1
-
-source /sbin/functions.sh
-
-dccc_echo() {
-	[ -z "${DCCC_QUIET}" -a -n "${DCCC_VERBOSE}" ] && echo "$*"
-}
-dccc_exit() {
-	dccc_echo "$*"
-	exit 1
-}
-
-# create the appropriate configuration directory 
-is_super_user && \
-	DCCC_HOSTS_FILE="${ROOT}etc/distcc/hosts" || \
-	DCCC_HOSTS_FILE="${ROOT}${HOME#/}/.distcc/hosts"
-mkdir -p $(dirname ${DCCC_HOSTS_FILE}) || \
-	dccc_exit "unable to create configuration directory"
-
-
-###
-# the following functions manage the distcc symlinks
-#  they allow the user or other scripts (namely gcc-config) to
-#  automatically update distcc's links when upgrading toolchains
-#
-dccc_remove_link() {
-	local t="${ROOT}usr/lib/distcc/bin/${1}"
-	if [ -L ${t} ]; then
-		dccc_echo "Removing ${t}..."
-		rm -f "${t}"
-	fi
-}
-dccc_install_link() {
-	# Search the PATH for the specified compiler
-	#  then create shadow link in ${ROOT}usr/lib/distcc/bin to distcc
-	#  note: this `type' doesn't do the right thing if ROOT != /
-	if [ -n "$(type -p ${1})" ]; then 
-		# first be sure any old link is removed
-		DCCC_QUIET=1 dccc_remove_link "${1}"
-
-		# then create the new link
-		local t="${ROOT}usr/lib/distcc/bin/${1}"
-		dccc_echo "Creating distcc shadow link: ${t}..."
-		ln -s /usr/bin/distcc "${t}"
-	fi
-}
-dccc_links() {
-	local a
-	for a in gcc cc c++ g++ ; do
-		[ -n "${2}" ] && a="${2}-${a}"
-		eval "dccc_${1}_link" "${a}"
-	done
-}
-
-dccc_install_user() {
-	# update or create, depending on whether user already exists
-	einfo "Updating or creating distcc user..."
-	local USERFIX
-	id distcc >/dev/null 2>&1 && USERFIX=usermod || USERFIX=useradd
-	USERFIX="/usr/sbin/${USERFIX}"
-	if [ -x "${USERFIX}" ]
-	then
-		if ! ${USERFIX} -g daemon -s /bin/false -d /dev/null \
-				-c "distccd" distcc 
-		then
-			dccc_exit "unable to create or modify user"
-		fi
-	elif [ "${USERFIX}" = "/usr/sbin/useradd" ]
-	then
-		ewarn "${USERFIX} not found: You need to add the distcc user"
-		ewarn "to /etc/passwd by hand.  Add the following line:\n"
-		ewarn "  distcc:x:240:2:distccd:/dev/null:/bin/false\n"
-		ewarn "and then run 'distcc-config --install' again root."
-		dccc_exit "Unable to create distcc user!"
-	fi
-
-	for d in ${ROOT}usr/lib/distcc/bin ${ROOT}var/run/distccd ; do
-		einfo "Configuring $d..."
-		chown distcc:daemon $d && chmod 0755 $d || \
-			dccc_exit "Unable to configure ${d}!"
-	done
-}
-
-dccc_guess_chost() {
-	echo "$(grep CHOST /etc/make.conf | \
-		grep -v '^#' | sed 's,^.*=\"\(.*\)\",\1,')"
-
-}
-
-######
-# routines for manipulating ${DCCC_ENV_FILE}
-
-dccc_install_env() {
-	[ -f ${DCCC_OLD_ENV} ] && mv ${DCCC_OLD_ENV} ${DCCC_ENV_FILE}
-	[ -f ${DCCC_ENV_FILE} ] && return
-	einfo "Creating ${DCCC_ENV_FILE}..."
-	cat <<_EOF_ > ${DCCC_ENV_FILE} || \
-		dccc_exit "Unable to create ${DCCC_ENV_FILE}..."
-# This file is managed by distcc-config; use it to change these settings.
-DISTCC_HOSTS="localhost"
-# DISTCC_VERBOSE is not set
-# DISTCC_LOG is not set
-# DCCC_PATH is not set
-_EOF_
-}
-
-dccc_show_env() {
-	grep -v '^#' ${DCCC_ENV_FILE} | sed -e 's,^,export ,'
-}
-
-dccc_test_env() {
-	dccc_show_env | grep "$1" | tail -1 | sed -e "s,${1}=,,"
-}
-
-dccc_load_defaults() {
-	rm -f ${DCCC_ENV_FILE}
-	dccc_install_env
-}
-
-dccc_set_env() {
-	local xxENV="${1}"
-	shift
-	dccc_install_env
-	mv -f ${DCCC_ENV_FILE} ${DCCC_ENV_FILE}.tmp
-	if [ -n "${*}" ]; then
-		einfo "Setting ${xxENV}=\"${*}\""
-	else
-		einfo "Clearing ${xxENV}"
-	fi
-	# redirect the following block to create new file
-	{
-		egrep -v "${xxENV}[= ]" ${DCCC_ENV_FILE}.tmp
-		if [ -n "${*}" ]; then
-			echo "${xxENV}=\"${*}\""
-		else
-			echo "# ${xxENV} is not set" 
-		fi 
-	} >> ${DCCC_ENV_FILE}
-	rm -f ${DCCC_ENV_FILE}.tmp
-}
-dccc_regen_env() {
-	env-update
-	if [ -z "${DCCC_NO_WARN}" ]; then
-	  einfo "If you want to use these new settings in an existing shell,"
-	  einfo "you need to 'source /etc/profile' to get the changes."
-	fi
-}
-
-dccc_get_env() {
-	if [ -f ${DCCC_ENV_FILE} ]; then
-		local xxENV="$(grep ${1} ${DCCC_ENV_FILE} | \
-			grep -v '^#' | tail -1)"
-		echo ${xxENV#*=} | sed -e 's,^",,;s,"$,,'
-	elif [ -n "${2}" ]; then
-		echo "${2}"
-	fi
-}
-
-dccc_set_hosts() {
-	echo "${*}" > $DCCC_HOSTS_FILE
-}
-dccc_get_hosts() {
-	cat $DCCC_HOSTS_FILE
-}
-
-dccc_set_verbose() {
-	dccc_set_env DISTCC_VERBOSE ${1}
-	dccc_regen_env
-}
-dccc_get_verbose() {
-	dccc_get_env DISTCC_VERBOSE
-}
-
-dccc_set_log() {
-	dccc_set_env DISTCC_LOG ${1}
-	dccc_regen_env
-}
-dccc_get_log() {
-	dccc_get_env DISTCC_LOG
-}
-
-dccc_set_j() {
-	local j="$(echo ${1} | sed -e 's,[^0-9],,g')"
-	[ -z "${j}" ] && \
-		dccc_exit "$0: invalid -j option (must be a number)"
-	dccc_set_env MAKEOPTS "-j${j}"
-	dccc_regen_env
-}
-dccc_get_j() {
-	dccc_get_env MAKEOPTS
-}
-
-####
-# main install routine
-
-dccc_install() {
-	local xxCHOST
-	dccc_install_user
-	dccc_links install ""
-	for f in make.conf make.globals make.profile/make.defaults
-	do
-		xxCHOST="$(dccc_guess_chost /etc/${f})"
-		if [ -n "${xxCHOST}" ]; then
-			dccc_links install "${xxCHOST}"
-			break
-		fi
-	done
-
-	dccc_install_env
-}
-
-
-###
-# main routine
-
-# helper checks that user has privs
-must_be_root() {
-	if ! is_super_user
-	then
-		[ -n "${1}" -a "${1}" = "${2}" ] && return
-		dccc_exit "$0 $1 must be run by root"
-	fi
-}
-
-
-# The --no-profile-warning option is meant to be used with
-#   the following helper function (add to ~/.bashrc)
-#
-# distcc-config() {
-#   command distcc-config --no-profile-warning "$@" && \
-#	source /etc/profile
-# }
-
-if [ "${1}" = "--no-profile-warning" ]; then
-	DCCC_NO_WARN=1
-	shift
-fi
-
-case "${1}" in
-	--get-* )
-		eval "dccc_$(echo ${1} | sed -e 's/^--//;s/-/_/g')"
-		;;
-	--set-* )
-		must_be_root "--set-hosts" "${1}"
-		SET_FUNC="$(echo ${1} | sed -e 's/^--//;s/-/_/g')"
-		shift
-		[ "${#}" -eq 0 ] && dccc_exit "argument required"
-		eval "dccc_${SET_FUNC} ${*}"
-		;;
-	--has-path )
-		dccc_test_env DCCC_PATH
-		;;
-	--add-path )
-		must_be_root
-		dccc_set_env DCCC_PATH "/usr/lib/distcc/bin"
-		dccc_regen_env
-		if [ -z "${DCCC_NO_WARN}" ]; then
-			einfo "You must then set PATH=\"${DCCC_PATH}/\${PATH}\""
-		fi
-		;;
-	--no-path )
-		must_be_root
-		dccc_set_env DCCC_PATH ""
-		dccc_regen_env
-		;;
-	--show-env )
-		dccc_show_env
-		;;
-	--load-defaults )
-		must_be_root 
-		dccc_load_defaults
-		;;
-	--install )
-		must_be_root 
-		dccc_install
-		;;
-	--install-user )
-		must_be_root 
-		dccc_install_user
-		;;
-	--install-links )
-		must_be_root 
-		dccc_links install "${2}"
-		;;
-	--remove-links )
-		must_be_root 
-		dccc_links remove "${2}"
-		;;
-	* )
-		echo "usage: ${0} --set-hosts DISTCC_HOSTS | --get-hosts"
-		echo "       ${0} --set-verbose { 0 | 1 }   | --get-verbose"
-		echo "       ${0} --set-log FILE  | --get-log" 
-		echo "       ${0} --add-path      | --no-path"
-#		echo "       ${0} --install-links | --remove-links } [ CHOST ]"
-		exit 1
-		;;
-esac
-
diff --git a/sys-devel/distcc/files/digest-distcc-1.2.3-r3 b/sys-devel/distcc/files/digest-distcc-1.2.3-r3
deleted file mode 100644
index 2064bb1d46a2..000000000000
--- a/sys-devel/distcc/files/digest-distcc-1.2.3-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e6f47493d39a87d2361f72ac94673f1 distcc-1.2.3.tar.bz2 214321
diff --git a/sys-devel/distcc/files/digest-distcc-2.0.1 b/sys-devel/distcc/files/digest-distcc-2.0.1
deleted file mode 100644
index f677f57fa249..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ffa89d1ce43b317fc67038c08200b9bc distcc-2.0.1.tar.bz2 202022
diff --git a/sys-devel/distcc/files/digest-distcc-2.0.1-r1 b/sys-devel/distcc/files/digest-distcc-2.0.1-r1
deleted file mode 100644
index f677f57fa249..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ffa89d1ce43b317fc67038c08200b9bc distcc-2.0.1.tar.bz2 202022
diff --git a/sys-devel/distcc/files/digest-distcc-2.3 b/sys-devel/distcc/files/digest-distcc-2.3
deleted file mode 100644
index 3759c5ab4330..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ead898174612b959141e56f0202afb1b distcc-2.3.tar.bz2 211626
diff --git a/sys-devel/distcc/files/digest-distcc-2.4 b/sys-devel/distcc/files/digest-distcc-2.4
deleted file mode 100644
index 3fdb1f001cdf..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e996c2dd500c3d693f507c88b3c565bb distcc-2.4.tar.bz2 216087
diff --git a/sys-devel/distcc/files/digest-distcc-2.4.2 b/sys-devel/distcc/files/digest-distcc-2.4.2
deleted file mode 100644
index 0b02b3cec74b..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c4910cb3f0402eed6d223126009cf562 distcc-2.4.2.tar.bz2 217381