Cleaning up a little. These two ebuilds (2.11-r1,r2) are obsolete

6 files changed, 6 insertions, 238 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 8c0b2f15c0f4..57b69326efe2 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.81 2003/10/24 16:24:07 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.82 2003/11/01 19:01:47 lisa Exp $
+
+  01 Nov 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11-r1.ebuild,
+  distcc-2.11-r2.ebuild:
+  Cleaning up a little. These two ebuilds (2.11-r1,r2) are obsolete
 
   24 Oct 2003; Chris PeBenito <pebenito@gentoo.org> distcc-2.10-r3.ebuild,
   distcc-2.11-r1.ebuild, distcc-2.11-r2.ebuild, distcc-2.11.1-r1.ebuild,
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 91305b40e159..4be27f018eb2 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,14 +1,10 @@
-MD5 b1dc1cd0dcbdb0a30d7984c82e9dd6d0 ChangeLog 14434
-MD5 f60f1ae96942815da07b233a83d59779 distcc-2.11-r1.ebuild 3561
-MD5 21b90403b1d7003e347ae1b7b8acdcc0 distcc-2.11-r2.ebuild 3563
+MD5 bd2f36a6faf5e6a64f2cee0a1d451a43 ChangeLog 14592
 MD5 d073d15137675e4c5b65cb6aa4ddb66e distcc-2.11.1.ebuild 3932
 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 ba434fcebbfbd2db6cdbd7527edd2080 distcc-2.11.2.ebuild 4052
-MD5 8d8b631e78e00fe0e948b53145e0e47a files/digest-distcc-2.11-r1 64
-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
diff --git a/sys-devel/distcc/distcc-2.11-r1.ebuild b/sys-devel/distcc/distcc-2.11-r1.ebuild
deleted file mode 100644
index 05f25dadae4d..000000000000
--- a/sys-devel/distcc/distcc-2.11-r1.ebuild
+++ /dev/null
@@ -1,115 +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-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"
-
-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 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
-		 )
-	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="${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}" ${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"
-	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/distcc-2.11-r2.ebuild b/sys-devel/distcc/distcc-2.11-r2.ebuild
deleted file mode 100644
index 6244a53467ff..000000000000
--- a/sys-devel/distcc/distcc-2.11-r2.ebuild
+++ /dev/null
@@ -1,115 +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-r2.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"
-
-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 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
-		 )
-	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 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}" ${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"
-	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.11-r1 b/sys-devel/distcc/files/digest-distcc-2.11-r1
deleted file mode 100644
index dadd02017bde..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f3458779c13255d88ee89ea7ccddda29 distcc-2.11.tar.bz2 249365
diff --git a/sys-devel/distcc/files/digest-distcc-2.11-r2 b/sys-devel/distcc/files/digest-distcc-2.11-r2
deleted file mode 100644
index dadd02017bde..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.11-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f3458779c13255d88ee89ea7ccddda29 distcc-2.11.tar.bz2 249365