version bump and fix RDEPEND.badindev errors

6 files changed, 184 insertions, 25 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index b2f2db49e419..5f13a6c9dbe4 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.109 2004/07/26 23:40:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.110 2004/08/20 20:08:49 lisa Exp $
+
+*distcc-2.17 (20 Aug 2004)
+
+  20 Aug 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.14.ebuild,
+  distcc-2.16.ebuild, +distcc-2.17.ebuild:
+  version bump and fix RDEPEND.badindev errors
 
   26 Jul 2004; Mike Frysinger <vapier@gentoo.org> distcc-2.16.ebuild:
   gnuconfig loving for us non-mainstream users.
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 0a381c16c23f..f7876d022a58 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5e61b6a68fa72102aa258bd22b481441 ChangeLog 19915
-MD5 3850c660443ed40379f646ea33715ffa distcc-2.14.ebuild 4805
+MD5 7df5c99716a1ad30457c4b111ad20ec6 ChangeLog 20097
 MD5 e410d067ffa3099f48c975b64dc98ec8 distcc-2.12.1-r1.ebuild 4627
 MD5 26994a05c40e35fed4942021cceb6e98 distcc-2.13-r1.ebuild 4695
-MD5 d85b8d2eb584a2a1b9ce6c315b5bd339 distcc-2.16.ebuild 4877
+MD5 1e3e87d6fe39c6d6bd8e6002b9b0ec27 distcc-2.14.ebuild 4816
+MD5 a78c111d15e1063661ef79429404490d distcc-2.16.ebuild 4886
 MD5 70619e7eb5fa4fd0aa4f3588579cd50d metadata.xml 443
-MD5 47a8df000e00ce5f8bff08c9342bdae4 files/digest-distcc-2.14 64
+MD5 8d2d5059dd92b10013eb0cb28d0cb57a distcc-2.17.ebuild 5071
 MD5 9ca407ce154707a1f27485523adf943c files/digest-distcc-2.12.1-r1 66
 MD5 6ab90bfeafe27c0d276eb8b6f1257560 files/digest-distcc-2.13-r1 64
+MD5 47a8df000e00ce5f8bff08c9342bdae4 files/digest-distcc-2.14 64
 MD5 c462167d99c154e9f8b9f94022ed2a71 files/digest-distcc-2.16 64
+MD5 af5f3983a736bd552e83d92ac9955a03 files/digest-distcc-2.17 64
 MD5 0c66fbdfd3c7ad0ae07bc17bbce9b5e1 files/2.11.1p/conf 551
 MD5 0f86be5afa04088831e049957f87582a files/2.11.1p/init 642
 MD5 d4ca35b391ec7d05f6bc040e333370d2 files/2.11.1p/distcc-config 4877
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFBBZZ/HTu7gpaalycRAqyXAJ46JKjeaNxLG6mzXUH3p1LBq8GczgCgryUv
-sJGhLqD4FMcy7xk8FTd6wqY=
-=ouyt
------END PGP SIGNATURE-----
diff --git a/sys-devel/distcc/distcc-2.14.ebuild b/sys-devel/distcc/distcc-2.14.ebuild
index fc4a3323a51f..fbb3d5c5b4c0 100644
--- a/sys-devel/distcc/distcc-2.14.ebuild
+++ b/sys-devel/distcc/distcc-2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.14.ebuild,v 1.6 2004/07/09 02:18:51 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.14.ebuild,v 1.7 2004/08/20 20:08:49 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
@@ -24,8 +24,7 @@ DEPEND=">=sys-apps/portage-2.0.49-r6
 	sys-apps/shadow
 	dev-util/pkgconfig"
 RDEPEND="
-	!mips? (
-	!arm? (
+	!mips? ( !arm? ( !s390? (
 	gnome? (
 		>=x11-libs/gtk+-2.0.0
 		>=gnome-base/libgnome-2.0.0
@@ -33,13 +32,12 @@ RDEPEND="
 		>=gnome-base/libglade-2.0.0
 		x11-libs/pango
 		>=gnome-base/gconf-2.0.0
-	)
-	)
+		)
 	gtk? (
 		>=x11-libs/gtk+-2.0.0
 		x11-libs/pango
-	)
-	)
+		)
+	) ) )
 	selinux? ( sec-policy/selinux-distcc )"
 
 src_compile() {
diff --git a/sys-devel/distcc/distcc-2.16.ebuild b/sys-devel/distcc/distcc-2.16.ebuild
index c6243bf6b857..3b5758c5803d 100644
--- a/sys-devel/distcc/distcc-2.16.ebuild
+++ b/sys-devel/distcc/distcc-2.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.16.ebuild,v 1.2 2004/07/26 23:40:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.16.ebuild,v 1.3 2004/08/20 20:08:49 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
@@ -27,7 +27,7 @@ DEPEND=">=sys-apps/portage-2.0.49-r6
 	sys-apps/shadow
 	dev-util/pkgconfig"
 RDEPEND="
-	!arm? ( !mips? (
+	!arm? ( !mips? ( !s390? (
 	gnome? (
 		>=x11-libs/gtk+-2.0.0
 		>=gnome-base/libgnome-2.0.0
@@ -40,7 +40,7 @@ RDEPEND="
 		>=x11-libs/gtk+-2.0.0
 		x11-libs/pango
 	)
-	) )
+	) ) )
 	selinux? ( sec-policy/selinux-distcc )"
 
 src_unpack() {
diff --git a/sys-devel/distcc/distcc-2.17.ebuild b/sys-devel/distcc/distcc-2.17.ebuild
new file mode 100644
index 000000000000..71357cebae7d
--- /dev/null
+++ b/sys-devel/distcc/distcc-2.17.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.17.ebuild,v 1.1 2004/08/20 20:08:49 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 gnuconfig
+
+PATCHLEVEL="2.11.1p"
+
+DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
+HOMEPAGE="http://distcc.samba.org/"
+SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~ia64 ~amd64 ~s390"
+# ATTN s390 MAINTANER: if you bump this stable on s390 please remove 2.14 from cvs -lisa
+# 2004-07-08
+
+
+IUSE="gnome gtk selinux ipv6"
+
+DEPEND=">=sys-apps/portage-2.0.49-r6
+	>=sys-devel/gcc-config-1.3.1
+	sys-apps/shadow
+	dev-util/pkgconfig"
+RDEPEND="
+	!arm? ( !mips? ( !s390? (
+	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
+		>=gnome-base/gconf-2.0.0
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.0.0
+		x11-libs/pango
+	)
+	) )
+	)
+	selinux? ( sec-policy/selinux-distcc )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
+}
+
+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
+
+	[ `gcc-major-version` -eq 2 ] && filter-lfs-flags
+
+	if use ipv6; then
+		ewarn "To use IPV6 you must have IPV6 compiled into your kernel"
+		ewarn "either via a module or compiled code"
+		ewarn "WARNING:  ipv6 DOES NOT WORK with distcc-2.17! Aborting"
+		ewarn "You can recompile without ipv6 with: USE='-ipv6' emerge distcc"
+		myconf=" ${myconf} --enable-rfc2553 "
+		sleep 4s
+		die "ipv6 DOES NOT WORK with distcc-2.17!"
+	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.17 b/sys-devel/distcc/files/digest-distcc-2.17
new file mode 100644
index 000000000000..26143c9d7cf5
--- /dev/null
+++ b/sys-devel/distcc/files/digest-distcc-2.17
@@ -0,0 +1 @@
+MD5 8ac5c032cde68c525afe9f53eae5cbf7 distcc-2.17.tar.bz2 339527