Version bump on ~arch, and push 2.11.1 to stable on x86 and a couple others. Still waiting to hear from other port leads. After I hear back I will clean up this dir.

5 files changed, 142 insertions, 6 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 886361365d7c..197f682ec79a 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.79 2003/10/23 18:45:41 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.80 2003/10/23 20:17:21 lisa Exp $
+
+*distcc-2.11.2 (23 Oct 2003)
+
+  23 Oct 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild,
+  distcc-2.11.2.ebuild:
+  Version bump, using the new distcc-config
 
   23 Oct 2003; Jason Wever <weeve@gentoo.org> distcc-2.10-r3.ebuild:
   Marked stable on sparc.
@@ -29,6 +35,9 @@
 
 *distcc-2.11 (23 Sep 2003)
 
+  23 Oct 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild:
+  Move 2.11.1 to stable on a few arches, going to move the rest ASAP.
+
   23 Sep 2003; Lisa Seelye <lisa@gentoo.org> distcc-2.11.ebuild,
   files/2.11/conf, files/2.11/distcc-config, files/2.11/init:
   Version bump, and it now requires Portage-2.0.49-r6 or greater.
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 03796935f64e..b714f80223d7 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,14 +1,14 @@
-MD5 9ecb3fc293313ec494d07a6989530ea1 ChangeLog 13786
+MD5 d4f796f1ebd192f7f72e6f056f467a8e ChangeLog 14089
 MD5 f75ab95c28c06ea22569fa1fbb79e6c5 distcc-2.10-r3.ebuild 3380
 MD5 2feb5ef608b6a01791939a04b33548a3 distcc-2.11-r1.ebuild 3549
 MD5 e4e4e2dca5c232ba88219df0097f734b distcc-2.11-r2.ebuild 3551
 MD5 3ff4da6034987831999fa16e10d2abcd distcc-2.11.1-r1.ebuild 3812
-MD5 032b9dad4bcddad0d9b4fb74a817c43e distcc-2.11.1.ebuild 3920
+MD5 1be5115de18d406915895d2a4a5420b0 distcc-2.11.1.ebuild 3920
 MD5 3f24933f751d9ba7a6c90c2751a3e083 distcc-2.5-r1.ebuild 3208
 MD5 c68dd76338384f0a996204db7364f8f7 distcc-2.8-r2.ebuild 3357
 MD5 f7332ba9718f262c2f3efb2f7f8945c7 distcc-2.9.ebuild 3445
 MD5 70619e7eb5fa4fd0aa4f3588579cd50d metadata.xml 443
-MD5 135e3685c607dd910fbfdf9f0f4dfec2 distcc-2.11.2.ebuild 4043
+MD5 0070c289a15863ee8d752c2d92b24537 distcc-2.11.2.ebuild 4040
 MD5 996b45704fdf266745dfc2e6038a1f76 files/digest-distcc-2.10-r3 64
 MD5 8d8b631e78e00fe0e948b53145e0e47a files/digest-distcc-2.11-r1 64
 MD5 8d8b631e78e00fe0e948b53145e0e47a files/digest-distcc-2.11-r2 64
diff --git a/sys-devel/distcc/distcc-2.11.1.ebuild b/sys-devel/distcc/distcc-2.11.1.ebuild
index 29fb8b2699dd..5c0ae39ded18 100644
--- a/sys-devel/distcc/distcc-2.11.1.ebuild
+++ b/sys-devel/distcc/distcc-2.11.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.11.1.ebuild,v 1.1 2003/10/08 06:54:48 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.11.1.ebuild,v 1.2 2003/10/23 20:17:21 lisa Exp $
 
 inherit eutils gcc flag-o-matic
 [ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -13,7 +13,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 gtk"
 
 DEPEND=">=sys-apps/portage-2.0.49-r6
diff --git a/sys-devel/distcc/distcc-2.11.2.ebuild b/sys-devel/distcc/distcc-2.11.2.ebuild
new file mode 100644
index 000000000000..89c4991ab826
--- /dev/null
+++ b/sys-devel/distcc/distcc-2.11.2.ebuild
@@ -0,0 +1,126 @@
+# 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.2.ebuild,v 1.1 2003/10/23 20:17:21 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 ~arm"
+IUSE="gnome gtk"
+
+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
+		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"
+	ewarn "This version is using a new distcc-config. If you encounter problems with it"
+	ewarn "Please report errors to bug 27432 on the bugs.gentoo.org site"
+	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 10
+}
diff --git a/sys-devel/distcc/files/digest-distcc-2.11.2 b/sys-devel/distcc/files/digest-distcc-2.11.2
new file mode 100644
index 000000000000..d210bdc6c35d
--- /dev/null
+++ b/sys-devel/distcc/files/digest-distcc-2.11.2
@@ -0,0 +1 @@
+MD5 034bc9c36bd5c3d9c26241600510927b distcc-2.11.2.tar.bz2 253066