chown /var/run/distccd for distcc:daemon after install since in some cases its being reset to root:root. this addresses /msgs on irc and some bugs on the zilla

6 files changed, 308 insertions, 1 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 6427ae405646..adf47ef46e66 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.97 2004/03/02 17:23:01 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.98 2004/03/06 19:51:58 lisa Exp $
+
+*distcc-2.13-r1 (06 Mar 2004)
+
+  06 Mar 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1-r1.ebuild,
+  distcc-2.13-r1.ebuild:
+  chown /var/run/distccd for distcc:daemon after install since in some cases its
+  being reset to root:root
 
 *distcc-2.13 (02 Mar 2004)
 
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index de7efafdd269..c8723fa200d9 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,7 +1,11 @@
+MD5 b6ed9d7845548811a1dc77de753c1eb3 distcc-2.13-r1.ebuild 4583
 MD5 317546115d46166425afcec981af34c3 distcc-2.13.ebuild 4450
 MD5 70619e7eb5fa4fd0aa4f3588579cd50d metadata.xml 443
 MD5 9ab60745b9c2683e4f0db1d456ef39c1 ChangeLog 17858
+MD5 10875eb8d1786b4485ef867152c699c8 distcc-2.12.1-r1.ebuild 4682
 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 0d27e364d11fcecd8fdd7eb1c4be732a files/2.11.1p/distcc-config 4839
diff --git a/sys-devel/distcc/distcc-2.12.1-r1.ebuild b/sys-devel/distcc/distcc-2.12.1-r1.ebuild
new file mode 100644
index 000000000000..45d5981f397f
--- /dev/null
+++ b/sys-devel/distcc/distcc-2.12.1-r1.ebuild
@@ -0,0 +1,148 @@
+# 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-r1.ebuild,v 1.1 2004/03/06 19:51:58 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 "Setting permissions on ${ROOT}var/run/distccd"
+	chown -R distcc:daemon ${ROOT}var/run/distccd
+	echo ""
+
+	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
new file mode 100644
index 000000000000..b4fb9195587b
--- /dev/null
+++ b/sys-devel/distcc/distcc-2.13-r1.ebuild
@@ -0,0 +1,146 @@
+# 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.1 2004/03/06 19:51:58 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 "Setting permissions on ${ROOT}var/run/distccd"
+	chown -R distcc:daemon ${ROOT}var/run/distccd
+	echo ""
+
+	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-r1 b/sys-devel/distcc/files/digest-distcc-2.12.1-r1
new file mode 100644
index 000000000000..e10ef67c7d44
--- /dev/null
+++ b/sys-devel/distcc/files/digest-distcc-2.12.1-r1
@@ -0,0 +1 @@
+MD5 34c465416f261b980db46a9df6d66c75 distcc-2.12.1.tar.bz2 325428
diff --git a/sys-devel/distcc/files/digest-distcc-2.13-r1 b/sys-devel/distcc/files/digest-distcc-2.13-r1
new file mode 100644
index 000000000000..9d066b5a3a22
--- /dev/null
+++ b/sys-devel/distcc/files/digest-distcc-2.13-r1
@@ -0,0 +1 @@
+MD5 98cfd19a0329c9c3fdaee14098b2a9a5 distcc-2.13.tar.bz2 330805