doing cleanup

5 files changed, 17 insertions, 255 deletions

diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 0183903f2fb0..91305b40e159 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,37 +1,33 @@
-MD5 639aa80097f3e1fb102f25de8cd5ae89 distcc-2.11.1-r1.ebuild 3824
-MD5 730d7f375b2a94bce7d91191789c4dc5 distcc-2.9.ebuild 3455
-MD5 50800c649c3587e5f0dfef810410abb6 distcc-2.8-r2.ebuild 3365
-MD5 ba434fcebbfbd2db6cdbd7527edd2080 distcc-2.11.2.ebuild 4052
-MD5 6d0efb7bb3a7e30546d91844510da07d distcc-2.5-r1.ebuild 3215
+MD5 b1dc1cd0dcbdb0a30d7984c82e9dd6d0 ChangeLog 14434
 MD5 f60f1ae96942815da07b233a83d59779 distcc-2.11-r1.ebuild 3561
+MD5 21b90403b1d7003e347ae1b7b8acdcc0 distcc-2.11-r2.ebuild 3563
 MD5 d073d15137675e4c5b65cb6aa4ddb66e distcc-2.11.1.ebuild 3932
-MD5 b1dc1cd0dcbdb0a30d7984c82e9dd6d0 ChangeLog 14434
+MD5 6d0efb7bb3a7e30546d91844510da07d distcc-2.5-r1.ebuild 3215
+MD5 50800c649c3587e5f0dfef810410abb6 distcc-2.8-r2.ebuild 3365
+MD5 730d7f375b2a94bce7d91191789c4dc5 distcc-2.9.ebuild 3455
 MD5 70619e7eb5fa4fd0aa4f3588579cd50d metadata.xml 443
-MD5 21b90403b1d7003e347ae1b7b8acdcc0 distcc-2.11-r2.ebuild 3563
-MD5 77ef7b670664b25ad7a5a289eecee733 distcc-2.10-r3.ebuild 3391
-MD5 c09d755beeab4ae675a8352f4ee04c63 files/digest-distcc-2.11.2 66
-MD5 86e7b8c5c35c5e34e2adfe2c55369f7a files/digest-distcc-2.11.1-r1 66
-MD5 e1ecfcc1aad7c385cf3c41966277cda7 files/digest-distcc-2.5-r1 63
+MD5 ba434fcebbfbd2db6cdbd7527edd2080 distcc-2.11.2.ebuild 4052
 MD5 8d8b631e78e00fe0e948b53145e0e47a files/digest-distcc-2.11-r1 64
-MD5 56fd1ac60c1b8402e1632da62f32a890 files/digest-distcc-2.8-r2 63
+MD5 8d8b631e78e00fe0e948b53145e0e47a files/digest-distcc-2.11-r2 64
 MD5 86e7b8c5c35c5e34e2adfe2c55369f7a files/digest-distcc-2.11.1 66
+MD5 e1ecfcc1aad7c385cf3c41966277cda7 files/digest-distcc-2.5-r1 63
+MD5 56fd1ac60c1b8402e1632da62f32a890 files/digest-distcc-2.8-r2 63
 MD5 ade4e8cda892045944e204fc2c3df8bd files/digest-distcc-2.9 63
-MD5 996b45704fdf266745dfc2e6038a1f76 files/digest-distcc-2.10-r3 64
-MD5 8d8b631e78e00fe0e948b53145e0e47a files/digest-distcc-2.11-r2 64
+MD5 c09d755beeab4ae675a8352f4ee04c63 files/digest-distcc-2.11.2 66
+MD5 d69d2e510421afc34c73a9cb50c5fb0d files/2.10/conf 655
+MD5 813a6a43167076da271ef55188a77826 files/2.10/init 630
+MD5 3375d451fca8db4a3280b16679bc5858 files/2.10/distcc-config 7560
 MD5 e40dfa1f21a9a2301faaff21cf76e7d8 files/2.11/conf 655
-MD5 272d85cd71c7dd7eaf3772f895371a41 files/2.11/distcc-config 7560
 MD5 c8ff220b60c105fcede2c72f274995db files/2.11/init 630
+MD5 272d85cd71c7dd7eaf3772f895371a41 files/2.11/distcc-config 7560
 MD5 66c4af6f8dd87d270e5da50341ca6e14 files/2.11.1p/conf 658
-MD5 e57b256f4198a7d489a372f2eff6802d files/2.11.1p/distcc-config 4792
 MD5 606dd55609a04a0f21b9875259148332 files/2.11.1p/init 633
-MD5 41f782125d594b7249fcd1fc6c306b02 files/2.8/conf 592
+MD5 e57b256f4198a7d489a372f2eff6802d files/2.11.1p/distcc-config 4792
 MD5 ee4f0fde9d5e6fe88bf7f513cf12920c files/2.8/001_fix_tempfile.patch.gz 251
+MD5 41f782125d594b7249fcd1fc6c306b02 files/2.8/conf 592
 MD5 9e01d7b626696716500bbf56c68a5680 files/2.8/distcc-config 7559
 MD5 a985e7680ba7958cb9a170c8e2019e8e files/2.8/init 625
+MD5 ced4e94d8c61a8f175d62a39478e7afc files/2.9/001_fix_tmpdir.patch.gz 248
 MD5 05483b8174e619ee439b905cca85c7ad files/2.9/conf 592
 MD5 63dd07135a46fcef934e3fa4c926d5f7 files/2.9/distcc-config 7559
 MD5 c400119892789344a9702d466476ddbd files/2.9/init 625
-MD5 ced4e94d8c61a8f175d62a39478e7afc files/2.9/001_fix_tmpdir.patch.gz 248
-MD5 d69d2e510421afc34c73a9cb50c5fb0d files/2.10/conf 655
-MD5 3375d451fca8db4a3280b16679bc5858 files/2.10/distcc-config 7560
-MD5 813a6a43167076da271ef55188a77826 files/2.10/init 630
diff --git a/sys-devel/distcc/distcc-2.10-r3.ebuild b/sys-devel/distcc/distcc-2.10-r3.ebuild
deleted file mode 100644
index f304ffef56ac..000000000000
--- a/sys-devel/distcc/distcc-2.10-r3.ebuild
+++ /dev/null
@@ -1,109 +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.10-r3.ebuild,v 1.4 2003/10/24 16:24:07 pebenito 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 selinux"
-
-DEPEND=">=sys-apps/portage-2.0.46-r11
-	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow"
-
-RDEPEND="gtk? ( >=x11-libs/gtk+-2.2.1 )
-	selinux? ( sec-policy/selinux-distcc )"
-
-
-src_compile() {
-	local myconf="--with-included-popt "
-	#Here we use the built in parse-options package.  It saves a dependancy
-
-	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}"
-		/usr/bin/distcc-config --set-env DISTCC_DIR ""
-	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 "Tips on using distcc with Gentoo can be found at"
-	einfo "http://www.gentoo.org/doc/en/distcc.xml"
-	echo ""
-	ewarn "As of 2.10-r3, DISTCC_DIR has been moved into /etc/make.conf."
-	ewarn 'A setting of: DISTCC_DIR=${PORTAGE_TMPDIR}/.distcc at the end of'
-	ewarn "/etc/make.conf is sufficient."
-	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.11.1-r1.ebuild b/sys-devel/distcc/distcc-2.11.1-r1.ebuild
deleted file mode 100644
index 3fcacf2b0377..000000000000
--- a/sys-devel/distcc/distcc-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,123 +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.11.1-r1.ebuild,v 1.2 2003/10/24 16:24:07 pebenito Exp $
-
-inherit eutils gcc flag-o-matic
-[ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-
-PATCHLEVEL="2.11.1p"
-
-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 gtk selinux"
-
-DEPEND=">=sys-apps/portage-2.0.49-r6
-	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow"
-
-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
-		 )
-	gtk?	(
-		>=x11-libs/gtk+-2.0.0
-		>=gnome-base/libglade-2.0.0
-		x11-libs/pango
-		)
-	selinux? ( sec-policy/selinux-distcc )"
-
-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"
-
-	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}/${PATCHLEVEL}/distcc-config"
-
-	insinto /etc/conf.d
-	newins "${FILESDIR}/${PATCHLEVEL}/conf" distccd
-
-	exeinto /etc/init.d
-	newexe "${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
-}
-
-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}"
-		HOSTS=$(egrep '^DISTCC_HOSTS' "${ENVFILE}" | sed 's,[^=]*=,,')
-		[ ${HOSTS} ] && ${ROOT}usr/bin/distcc-config --set-hosts ${HOSTS}
-		# 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
-	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 "Tips on using distcc with Gentoo can be found at"
-	einfo "http://www.gentoo.org/doc/en/distcc.xml"
-	ewarn "As of distcc-2.11, the only thing you have to do to configure distcc"
-	ewarn "is to set your hosts (see the Guide, above) and to add distcc to"
-	ewarn "the FEATURES line in /etc/make.conf"
-	echo ""
-	einfo "To use the distccmon programs with Gentoo you should use this command:"
-	einfo "   DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N"
-}
diff --git a/sys-devel/distcc/files/digest-distcc-2.10-r3 b/sys-devel/distcc/files/digest-distcc-2.10-r3
deleted file mode 100644
index 0dbf80357d04..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.10-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 044474020e864123b01aaa1c06fc831a distcc-2.10.tar.bz2 239769
diff --git a/sys-devel/distcc/files/digest-distcc-2.11.1-r1 b/sys-devel/distcc/files/digest-distcc-2.11.1-r1
deleted file mode 100644
index 078e2ae837ea..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.11.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b096504d7ef4805d30b0638224c7f46 distcc-2.11.1.tar.bz2 251577