bumping 2.13-r1 to stable

7 files changed, 18 insertions, 298 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index e462b6d2a5d4..60a3a1ef90e4 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.100 2004/03/21 21:44:24 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.101 2004/04/12 00:33:42 lisa Exp $
+
+  11 Apr 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1.ebuild,
+  distcc-2.13-r1.ebuild, distcc-2.13.ebuild:
+  bump to stable. yell at me if your arch breaks
+
+  11 Apr 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1.ebuild,
+  distcc-2.13.ebuild:
+  General cleanup of old ebuilds & digests.
 
   21 Mar 2004; Lisa Seelye <lisa@gentoo.org> files/2.11.1p/init:
   Change the init script to do TMPDIR=TMPDIR basically so that the user can
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index befd1d1cd690..a93cf76782f2 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,13 +1,9 @@
-MD5 a13e5728a2febdc771932b0115e56066 distcc-2.13-r1.ebuild 4586
-MD5 317546115d46166425afcec981af34c3 distcc-2.13.ebuild 4450
+MD5 828d8d4539d77c4e4e53af382770f3a3 distcc-2.13-r1.ebuild 4749
 MD5 70619e7eb5fa4fd0aa4f3588579cd50d metadata.xml 443
-MD5 f25d8ecc6a8b73b283ee96cc779d617b ChangeLog 18319
+MD5 4ca65deb16b139c753c18c43ab7f9a22 ChangeLog 18615
 MD5 ac0591c7b5fd0b3acf24215a7b010c33 distcc-2.12.1-r1.ebuild 4671
-MD5 5d5758311cdd7fd437eca2ce9fc078ca distcc-2.12.1.ebuild 4556
 MD5 9ca407ce154707a1f27485523adf943c files/digest-distcc-2.12.1-r1 66
 MD5 6ab90bfeafe27c0d276eb8b6f1257560 files/digest-distcc-2.13-r1 64
-MD5 9ca407ce154707a1f27485523adf943c files/digest-distcc-2.12.1 66
-MD5 6ab90bfeafe27c0d276eb8b6f1257560 files/digest-distcc-2.13 64
 MD5 25fc12feb724b6c68a0d4a46b6cd0033 files/2.11.1p/distcc-config 4884
 MD5 5f509189d5beee2fbafadafc8ecc62d6 files/2.11.1p/init 625
 MD5 93a6aabdbddfa7f9ac19c9c4f4b584b5 files/2.11.1p/conf 545
diff --git a/sys-devel/distcc/distcc-2.12.1.ebuild b/sys-devel/distcc/distcc-2.12.1.ebuild
deleted file mode 100644
index 224e783336ca..000000000000
--- a/sys-devel/distcc/distcc-2.12.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.12.1.ebuild,v 1.5 2004/02/23 01:20:01 lisa 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 ia64 amd64"
-#Blame drobbins if the ia64 or amd64 break things going into stable before 
-# ~testing. ;-)  -Lisa (2004-02-20)
-
-IUSE="gnome gtk selinux ipv6"
-
-
-DEPEND=">=sys-apps/portage-2.0.49-r6
-	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow"
-
-RDEPEND="!mips? ( 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
-		 )
-	       )
-	!mips? (
-		gtk?	(
-		>=x11-libs/gtk+-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 && ! use mips && myconf="${myconf} --with-gtk"
-	use gtk && use gnome && ! use mips && myconf="${myconf} --with-gnome"
-	use mips && use gtk || use gnome && ewarn "X support for Mips has been disabled."
-
-	#Above, mips is excluded due to version issues. 2004-02-20
-
-
-	if use ipv6; then
-		ewarn "To use IPV6 you must have IPV6 compiled into your kernel"
-		ewarn "either via a module or compiled code"
-		myconf=" ${myconf} --enable-rfc2553 "
-		sleep 2s
-	fi
-
-	econf ${myconf} || die "econf ${myconf} failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D%/}" install
-
-	insinto /usr/share/doc/${PN}
-	doins "${S}/survey.txt"
-
-	exeinto /usr/bin
-	doexe "${FILESDIR}/${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"
-	ewarn "This version includes a new distcc-config. If you encounter problems with it,"
-	ewarn "please report them to our Bugzilla at bugs.gentoo.org"
-	echo ""
-	einfo "To use the distccmon programs with Gentoo you should use this command:"
-	einfo "      DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N"
-	use gnome || use gtk && einfo "Or:   DISTCC_DIR=/var/tmp/portage/.distcc distccmon-gnome"
-	sleep 3s
-}
diff --git a/sys-devel/distcc/distcc-2.13-r1.ebuild b/sys-devel/distcc/distcc-2.13-r1.ebuild
index 614e01f10b08..8b7e14e54998 100644
--- a/sys-devel/distcc/distcc-2.13-r1.ebuild
+++ b/sys-devel/distcc/distcc-2.13-r1.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.13-r1.ebuild,v 1.2 2004/03/12 11:20:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.13-r1.ebuild,v 1.3 2004/04/12 00:33:42 lisa Exp $
+
+# If you change this in any way please email lisa@gentoo.org and make an
+# entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye
 
 inherit eutils gcc flag-o-matic
 
@@ -12,12 +15,13 @@ SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa ~mips ~ia64 ~amd64"
+KEYWORDS="x86 ppc sparc alpha hppa mips ia64 amd64"
 IUSE="gnome gtk selinux ipv6"
 
 DEPEND=">=sys-apps/portage-2.0.49-r6
 	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow"
+	sys-apps/shadow
+	dev-util/pkgconfig"
 
 RDEPEND="!mips? ( gnome? ( >=x11-libs/gtk+-2.0.0
 		  >=gnome-base/libgnome-2.0.0
diff --git a/sys-devel/distcc/distcc-2.13.ebuild b/sys-devel/distcc/distcc-2.13.ebuild
deleted file mode 100644
index 216f531f216f..000000000000
--- a/sys-devel/distcc/distcc-2.13.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.13.ebuild,v 1.1 2004/03/02 17:23:01 lisa 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 ~ia64 ~amd64"
-
-IUSE="gnome gtk selinux ipv6"
-
-
-DEPEND=">=sys-apps/portage-2.0.49-r6
-	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow"
-
-RDEPEND="!mips? ( 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
-		 )
-	       )
-	!mips? (
-		gtk?	(
-		>=x11-libs/gtk+-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 && ! use mips && myconf="${myconf} --with-gtk"
-	use gtk && use gnome && ! use mips && myconf="${myconf} --with-gnome"
-	use mips && use gtk || use gnome && ewarn "X support for Mips has been disabled."
-
-	#Above, mips is excluded due to version issues. 2004-02-20
-
-
-	if use ipv6; then
-		ewarn "To use IPV6 you must have IPV6 compiled into your kernel"
-		ewarn "either via a module or compiled code"
-		myconf=" ${myconf} --enable-rfc2553 "
-		sleep 4s
-	fi
-
-	econf ${myconf} || die "econf ${myconf} failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D%/}" install
-
-	insinto /usr/share/doc/${PN}
-	doins "${S}/survey.txt"
-
-	exeinto /usr/bin
-	doexe "${FILESDIR}/${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"
-	ewarn "This version includes a new distcc-config. If you encounter problems with it,"
-	ewarn "please report them to our Bugzilla at bugs.gentoo.org"
-	echo ""
-	einfo "To use the distccmon programs with Gentoo you should use this command:"
-	einfo "      DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N"
-	use gnome || use gtk && einfo "Or:   DISTCC_DIR=/var/tmp/portage/.distcc distccmon-gnome"
-	sleep 3s
-}
diff --git a/sys-devel/distcc/files/digest-distcc-2.12.1 b/sys-devel/distcc/files/digest-distcc-2.12.1
deleted file mode 100644
index e10ef67c7d44..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.12.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 34c465416f261b980db46a9df6d66c75 distcc-2.12.1.tar.bz2 325428
diff --git a/sys-devel/distcc/files/digest-distcc-2.13 b/sys-devel/distcc/files/digest-distcc-2.13
deleted file mode 100644
index 9d066b5a3a22..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98cfd19a0329c9c3fdaee14098b2a9a5 distcc-2.13.tar.bz2 330805