Cleaning the repository. non x86 will go from 2.5-r1 to 2.8-r2 or 2.9. There is no need to keep the old ones around.

16 files changed, 11 insertions, 944 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 0478f4325a78..dbc2fe19349e 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.63 2003/08/06 23:32:20 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.64 2003/08/08 13:20:29 lisa Exp $
+
+*distcc-2.8-r1 (08 Aug 2003)
+
+  08 Aug 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.5.ebuild, distcc-2.7.1.ebuild,
+  distcc-2.7.ebuild, distcc-2.8-r1.ebuild, distcc-2.8.ebuild,
+  files/2.7.1/001_fix_tmpdir.patch.gz, files/2.7.1/conf,
+  files/2.7.1/distcc-config, files/2.7.1/init:
+  Cleaning the repository. non x86 will go from 2.5-r1 to 2.8-r2 or 2.9. There
+  is no need to keep the old ones around.
 
   04 Aug 2003; Aron Griffis <agriffis@gentoo.org> distcc-2.8-r2.ebuild:
   Mark stable on alpha.  Fix formatting and some errors in ChangeLog
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index a12af25feda7..4a6d3054fc25 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,20 +1,10 @@
 MD5 078bad953d09e1d7e64e2f3b7770ad9e distcc-2.8-r2.ebuild 3320
-MD5 433082661e66dcd83cd0630ae2108503 distcc-2.8.ebuild 3623
 MD5 7b08a44d08561a7ff5ddb161bc661419 distcc-2.5-r1.ebuild 3176
-MD5 c958bfeb956960d4b15ebab2df7a6d86 distcc-2.5.ebuild 2702
-MD5 b1dfe93f71045eb226d74ceb93959c65 distcc-2.8-r1.ebuild 3613
-MD5 0b8da22979cd451f59bd17baabd4a121 distcc-2.7.ebuild 3451
-MD5 b00b909199c8f4b6b6bfd28b74aa4bfb distcc-2.7.1.ebuild 3846
 MD5 d4f02bde82f28c1a2551cb5c7c036046 distcc-2.9.ebuild 3819
-MD5 9eabfa3bd5ef9b5331a59003f1a3a84f ChangeLog 10776
+MD5 5742d5dca090c6f790591be4bcf38f10 ChangeLog 11179
 MD5 70619e7eb5fa4fd0aa4f3588579cd50d metadata.xml 443
-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 ade4e8cda892045944e204fc2c3df8bd files/digest-distcc-2.9 63
-MD5 2c4c5f6d6980e4b17d7daea1399292d8 files/digest-distcc-2.7.1 65
 MD5 e1ecfcc1aad7c385cf3c41966277cda7 files/digest-distcc-2.5-r1 63
-MD5 56fd1ac60c1b8402e1632da62f32a890 files/digest-distcc-2.8-r1 63
 MD5 56fd1ac60c1b8402e1632da62f32a890 files/digest-distcc-2.8-r2 63
 MD5 ee7751409b90e538899a2d8030f779e6 files/2.8/conf 388
 MD5 3783a1abcbd33bc1d24e14012edeb696 files/2.8/init 484
@@ -24,7 +14,3 @@ MD5 ee7751409b90e538899a2d8030f779e6 files/2.9/conf 388
 MD5 3783a1abcbd33bc1d24e14012edeb696 files/2.9/init 484
 MD5 63dd07135a46fcef934e3fa4c926d5f7 files/2.9/distcc-config 7559
 MD5 ced4e94d8c61a8f175d62a39478e7afc files/2.9/001_fix_tmpdir.patch.gz 248
-MD5 34d20e7bf223ac2f2ec61c5a7a9b2e3c files/2.7.1/conf 314
-MD5 3783a1abcbd33bc1d24e14012edeb696 files/2.7.1/init 484
-MD5 ec03480eba3fa397dc6de1f01178b519 files/2.7.1/distcc-config 7561
-MD5 d64446b61d189643742251cdfd0bee2e files/2.7.1/001_fix_tmpdir.patch.gz 249
diff --git a/sys-devel/distcc/distcc-2.5.ebuild b/sys-devel/distcc/distcc-2.5.ebuild
deleted file mode 100644
index 7fc2d303df71..000000000000
--- a/sys-devel/distcc/distcc-2.5.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.5.ebuild,v 1.1 2003/05/27 23:07:38 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
deleted file mode 100644
index f9a67637b0b7..000000000000
--- a/sys-devel/distcc/distcc-2.7.1.ebuild
+++ /dev/null
@@ -1,124 +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.7.1.ebuild,v 1.4 2003/07/17 22:12:20 lisa Exp $
-
-inherit eutils gcc flag-o-matic
-[ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-
-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"
-IUSE="gtk"
-
-DEPEND=">=sys-apps/portage-2.0.46-r11
-	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow
-	dev-libs/popt"
-
-RDEPEND="gtk? ( >=x11-libs/gtk+-2.2.1 )"
-
-src_unpack() {
-	unpack ${A}
-
-	#this patch fixes the problem with portage reassigning $TMPDIR
-	#and rendering the monitor programs useless, unless a rather
-	#icky hack is used. now sudo -u portage distccmon-{gnome,text}
-	#will work.  - Lisa
-	cd ${S}/src
-	epatch ${FILESDIR}/${PV}/001_fix_tmpdir.patch.gz
-}
-
-src_compile() {
-	local myconf
-	use gtk && myconf="--enable-gnome"
-
-	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}/${PV}/distcc-config"
-
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${PV}/conf" distccd
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/${PV}/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() {
-	# handle DISTCC_HOSTS upgrade better
-	local ENVFILE
-	ENVFILE="${ROOT}etc/env.d/02distcc"
-	[ ! -f "${ENVFILE}" ] && \
-		ENVFILE="${ROOT}etc/env.d/04distcc"
-	if [ -f "${ENVFILE}" ]
-	then
-		# save hosts to new file
-		ROOT="${ROOT}" ${ROOT}usr/bin/distcc-config --set-hosts \
-			$(egrep '^DISTCC_HOSTS' "${ENVFILE}" | sed 's,[^=]*=,,')
-		# now remove from the file
-		grep -v 'DISTCC_HOSTS' "${ENVFILE}" > "${ENVFILE}.new"
-		mv "${ENVFILE}.new" "${ENVFILE}"
-	fi
-
-	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 ccache path BEFORE distcc."
-	einfo "Portage 2.0.46-r11+ will take advantage of distcc if you put"
-	einfo "distcc into the FEATURES setting in make.conf and use" 
-	einfo "distcc-config --set-hosts. Do NOT set CC=distcc or similar."
-	echo ""
-	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"
-	ewarn "See \"http://dev.gentoo.org/~lisa/distcc/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.ebuild b/sys-devel/distcc/distcc-2.7.ebuild
deleted file mode 100644
index eabe1293d0a2..000000000000
--- a/sys-devel/distcc/distcc-2.7.ebuild
+++ /dev/null
@@ -1,112 +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.7.ebuild,v 1.2 2003/06/18 13:52:59 vapier Exp $
-
-inherit eutils gcc flag-o-matic
-[ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-
-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"
-IUSE="gnome"
-
-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"
-RDEPEND="gnome? ( >=gnome-base/libgnomeui-2.2.0.1 )"
-
-src_compile() {
-	local myconf
-	use gnome && myconf="--enable-gnome"
-	echo "Running econf with ${myconf}"
-	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}/${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() {
-	# handle DISTCC_HOSTS upgrade better
-	local ENVFILE
-	ENVFILE="${ROOT}etc/env.d/02distcc"
-	[ ! -f "${ENVFILE}" ] && \
-		ENVFILE="${ROOT}etc/env.d/04distcc"
-	if [ -f "${ENVFILE}" ]
-	then
-		# save hosts to new file
-		ROOT="${ROOT}" ${ROOT}usr/bin/distcc-config --set-hosts \
-			$(egrep '^DISTCC_HOSTS' "${ENVFILE}" | sed 's,[^=]*=,,')
-		# now remove from the file
-		grep -v 'DISTCC_HOSTS' "${ENVFILE}" > "${ENVFILE}.new"
-		mv "${ENVFILE}.new" "${ENVFILE}"
-	fi
-
-	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 ccache path BEFORE distcc."
-	einfo "Portage 2.0.46-r11+ will take advantage of distcc if you put"
-	einfo "distcc into the FEATURES setting in make.conf and use" 
-	einfo "distcc-config --set-hosts. Do NOT set CC=distcc or similar."
-	ewarn "See \"http://wiki.dev.gentoo.org/gentoo/moin.cgi/UsingDistcc\" 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.8-r1.ebuild b/sys-devel/distcc/distcc-2.8-r1.ebuild
deleted file mode 100644
index aae9e8ccd23e..000000000000
--- a/sys-devel/distcc/distcc-2.8-r1.ebuild
+++ /dev/null
@@ -1,116 +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.8-r1.ebuild,v 1.1 2003/07/12 19:57:46 lisa Exp $
-
-inherit eutils gcc flag-o-matic
-[ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-
-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"
-IUSE="gtk2"
-
-DEPEND=">=sys-apps/portage-2.0.46-r11
-	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow
-	dev-libs/popt"
-
-RDEPEND="gtk2? ( >=x11-libs/gtk+-2.2.1 )"
-
-src_unpack() {
-	unpack ${A}
-
-	#this patch fixes the problem with portage reassigning $TMPDIR
-	#and rendering the monitor programs useless, unless a rather
-	#icky hack is used. now sudo -u portage distccmon-{gnome,text}
-	#will work.  - Lisa
-	cd ${S}/src
-	epatch ${FILESDIR}/${PV}/001*.gz
-}
-
-src_compile() {
-	local myconf
-	use gtk2 && myconf="--enable-gnome"
-	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}/${PV}/distcc-config"
-
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${PV}/conf" distccd
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/${PV}/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() {
-	# handle DISTCC_HOSTS upgrade better
-	local ENVFILE
-	ENVFILE="${ROOT}etc/env.d/02distcc"
-	[ ! -f "${ENVFILE}" ] && \
-		ENVFILE="${ROOT}etc/env.d/04distcc"
-	if [ -f "${ENVFILE}" ]
-	then
-		# save hosts to new file
-		ROOT="${ROOT}" ${ROOT}usr/bin/distcc-config --set-hosts \
-			$(egrep '^DISTCC_HOSTS' "${ENVFILE}" | sed 's,[^=]*=,,')
-		# now remove from the file
-		grep -v 'DISTCC_HOSTS' "${ENVFILE}" > "${ENVFILE}.new"
-		mv "${ENVFILE}.new" "${ENVFILE}"
-	fi
-
-	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 ccache path BEFORE distcc."
-	einfo "Portage 2.0.46-r11+ will take advantage of distcc if you put"
-	einfo "distcc into the FEATURES setting in make.conf and use" 
-	einfo "distcc-config --set-hosts. Do NOT set CC=distcc or similar."
-	echo ""
-	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/distcc-2.8.ebuild b/sys-devel/distcc/distcc-2.8.ebuild
deleted file mode 100644
index c061509cc9c6..000000000000
--- a/sys-devel/distcc/distcc-2.8.ebuild
+++ /dev/null
@@ -1,116 +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.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
-
-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"
-IUSE="gnome"
-
-DEPEND=">=sys-apps/portage-2.0.46-r11
-	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow
-	dev-libs/popt"
-
-RDEPEND="gnome? ( >=gnome-base/libgnomeui-2.2.0.1 )"
-
-src_unpack() {
-	unpack ${A}
-
-	#this patch fixes the problem with portage reassigning $TMPDIR
-	#and rendering the monitor programs useless, unless a rather
-	#icky hack is used. now sudo -u portage distccmon-{gnome,text}
-	#will work.  - Lisa
-	cd ${S}/src
-	epatch ${FILESDIR}/${PV}/001*.gz
-}
-
-src_compile() {
-	local myconf
-	use gnome && myconf="--enable-gnome"
-	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}/${PV}/distcc-config"
-
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${PV}/conf" distccd
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/${PV}/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() {
-	# handle DISTCC_HOSTS upgrade better
-	local ENVFILE
-	ENVFILE="${ROOT}etc/env.d/02distcc"
-	[ ! -f "${ENVFILE}" ] && \
-		ENVFILE="${ROOT}etc/env.d/04distcc"
-	if [ -f "${ENVFILE}" ]
-	then
-		# save hosts to new file
-		ROOT="${ROOT}" ${ROOT}usr/bin/distcc-config --set-hosts \
-			$(egrep '^DISTCC_HOSTS' "${ENVFILE}" | sed 's,[^=]*=,,')
-		# now remove from the file
-		grep -v 'DISTCC_HOSTS' "${ENVFILE}" > "${ENVFILE}.new"
-		mv "${ENVFILE}.new" "${ENVFILE}"
-	fi
-
-	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 ccache path BEFORE distcc."
-	einfo "Portage 2.0.46-r11+ will take advantage of distcc if you put"
-	einfo "distcc into the FEATURES setting in make.conf and use" 
-	einfo "distcc-config --set-hosts. Do NOT set CC=distcc or similar."
-	echo ""
-	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/2.7.1/001_fix_tmpdir.patch.gz b/sys-devel/distcc/files/2.7.1/001_fix_tmpdir.patch.gz
deleted file mode 100644
index b166eb1e9c1c..000000000000
--- a/sys-devel/distcc/files/2.7.1/001_fix_tmpdir.patch.gz
+++ /dev/null
diff --git a/sys-devel/distcc/files/2.7.1/conf b/sys-devel/distcc/files/2.7.1/conf
deleted file mode 100644
index b775d7d09940..000000000000
--- a/sys-devel/distcc/files/2.7.1/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/2.7.1/distcc-config b/sys-devel/distcc/files/2.7.1/distcc-config
deleted file mode 100644
index f4c378e9fba8..000000000000
--- a/sys-devel/distcc/files/2.7.1/distcc-config
+++ /dev/null
@@ -1,324 +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.7.1/distcc-config,v 1.2 2003/07/21 18:58:27 lisa Exp $
-# Changelog
-# 
-# 21 Jul 2003 - Changed install environment to EXCLUDE DISTCC_HOSTS from /etc/env.d/02distcc.
-#               The hosts are stored by default to /etc/distcc/hosts.  <lisa@gentoo.org>
-
-[ -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_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/2.7.1/init b/sys-devel/distcc/files/2.7.1/init
deleted file mode 100644
index c183d62648ab..000000000000
--- a/sys-devel/distcc/files/2.7.1/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/digest-distcc-2.5 b/sys-devel/distcc/files/digest-distcc-2.5
deleted file mode 100644
index b14915b69443..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0b6a34fa5a30bfa7f6853f477f7772f distcc-2.5.tar.bz2 220088
diff --git a/sys-devel/distcc/files/digest-distcc-2.7 b/sys-devel/distcc/files/digest-distcc-2.7
deleted file mode 100644
index 5e952f0656b2..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f367102fb645b769368b901ec57e159 distcc-2.7.tar.bz2 232371
diff --git a/sys-devel/distcc/files/digest-distcc-2.7.1 b/sys-devel/distcc/files/digest-distcc-2.7.1
deleted file mode 100644
index 808cda1c9a3c..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 31c2547c9c5c042abd112d8ced5e3313 distcc-2.7.1.tar.bz2 234747
diff --git a/sys-devel/distcc/files/digest-distcc-2.8 b/sys-devel/distcc/files/digest-distcc-2.8
deleted file mode 100644
index 9943b1256d40..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da86497ab23f34a8630a2758d3c1b8cc distcc-2.8.tar.bz2 235859
diff --git a/sys-devel/distcc/files/digest-distcc-2.8-r1 b/sys-devel/distcc/files/digest-distcc-2.8-r1
deleted file mode 100644
index 9943b1256d40..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da86497ab23f34a8630a2758d3c1b8cc distcc-2.8.tar.bz2 235859