new version; fixes to init script as proposed by agriffis

5 files changed, 106 insertions, 249 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 5a8a840e67dd..2c111247c9c3 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,240 +1,10 @@
 # ChangeLog for sys-devel/distcc
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.43 2003/05/23 20:00:16 hanno Exp $
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.44 2003/05/27 23:07:38 zwelch Exp $
 
-*distcc-2.4.2 (23 May 2003)
+*distcc-2.5 (27 May 2003)
 
-  23 May 2003; Hanno Boeck <hanno@gentoo.org> distcc-2.4.2.ebuild:
-  New version.
+  27 May 2003; Zach Welch <zwelch@gentoo.org distcc-2.5.ebuild,
+  files/1.2/init:
+  new version; fixes to init script as proposed by agriffis@gentoo.org
 
-*distcc-2.4 (21 May 2003)
-
-  21 May 2003; Zach Welch <zwelch@gentoo.org distcc-2.3.ebuild,
-  files/2.3/distcc-config, distcc-2.4.ebuild:
-  Update to latest versions; updates to distcc-config to use new
-  DISTCC_HOSTS configuration.  May require some cleaning of previous
-  settings, notably DISTCC_HOSTS in /etc/env.d/02distcc
-
-*distcc-2.0.1 (31 Mar 2003)
-
-  28 Apr 2003; Zach Welch <zwelch@gentoo.org> distcc-0.12.ebuild,
-  distcc-0.12.ebuild, distcc-0.15.ebuild, distcc-0.15.ebuild,
-  distcc-1.0.ebuild, distcc-1.0.ebuild, distcc-1.1-r11.ebuild,
-  distcc-1.1-r11.ebuild, distcc-1.1-r8.ebuild, distcc-1.1-r8.ebuild,
-  distcc-1.1.ebuild, distcc-1.1.ebuild, distcc-1.2.1.ebuild,
-  distcc-1.2.1.ebuild, distcc-1.2.3.ebuild, distcc-1.2.3.ebuild,
-  distcc-1.2.ebuild, distcc-1.2.ebuild, files/distccd, files/distccd.1,
-  files/distccd.2, files/distccd.4, files/wrapper-1.1.patch,
-  files/1.2/distcc-config, files/1.2/wrapper.patch, files/1.2.1/distcc-config,
-  files/1.2.1/wrapper.patch, files/1.2.3/distcc-config:
-  Bump distcc-2.0.1 revision and add new --set-j option for setting MAKEOPTS.
-  Remove old versions that are no longer needed or desired.
-
-  17 Apr 2003; Zach Welch <zwelch@gentoo.org> files/1.2.3/distcc-config:
-  fix distcc-config to add DCCC_QUIET
-
-  31 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-2.0.1.ebuild,
-  files/1.2.3/distcc-config:
-  bump version to close bug 18566; masquerade patch now mainlined
-  info file removed upstream; add --help to distcc-config
-
-*distcc-1.2.3-r3 (17 Mar 2003)
-
-  17 Apr 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3-r3.ebuild:
-  bump to stable for all arches
-
-  19 Mar 2003; Aron Griffis <agriffis@gentoo.org> distcc-1.2.3-r3.ebuild:
-  Mark stable on alpha
-
-  17 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3-r1.ebuild,
-  files/1.2.3/distcc-config:
-  set ROOTPATH, refactor env-update code, rename env file
-
-*distcc-1.2.3-r2 (17 Mar 2003)
-
-  17 Mar 2003; Zach Welch <zwelch@gentoo.org> files/1.2.3/distcc-config:
-  usability additions, see online docs for info
-
-  17 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3-r1.ebuild,
-  distcc-1.2.3-r1.ebuild, distcc-1.2.3-r2.ebuild, files/1.2.3/distcc-config:
-  fix einfo issue in new config function
-
-*distcc-1.2.3-r1 (17 Mar 2003)
-
-  17 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3-r1.ebuild,
-  files/1.2.3/distcc-config, files/1.2.3/info.patch:
-  Add distcc environment file and options to distcc-config to manage it
-  Fix ebuild to address defects reported in but 17716
-
-*distcc-1.2.3 (03 Mar 2003)
-
-  11 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3.ebuild,
-  files/1.2.1/distcc-config:
-  add shadow as DEPEND (for now), fix distcc-config if shadow tools not
-  installed (for later)
-
-  07 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3.ebuild:
-  mark distcc-1.2.3 as stable on x86 and ppc
-
-  03 Mar 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.3.ebuild,
-  files/1.2.3/wrapper.patch:
-  Bump to latest bug release version
-
-*distcc-1.2.1 (26 Feb 2003)
-
-  26 Feb 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.1.ebuild,
-  files/1.2.1/distcc-config, files/1.2.1/wrapper.patch:
-  New version, with fixes for installs under strange ROOTs
-  Moved user creation, directory fixups into distcc-config script
-  Fix typo in conf script; fixes bug 16432
-
-*distcc-1.2 (21 Feb 2003)
-
-  21 Feb 2003; Zach Welch <zwelch@gentoo.org> distcc-1.2.ebuild :
-  Add new version, cleanup patch from 1.1-r11
-  Add initial distcc-config script
-
-*distcc-1.1-r11 (17 Feb 2003)
-
-  21 Feb 2003; Zach Welch <zwelch@gentoo.org> distcc-1.1-r11.ebuild :
-  Remove extra cp of $S
-
-  19 Feb 2003; Zach Welch <zwelch@gentoo.org> distcc-1.1-r11.ebuild :
-  Added arm to keywords.
-
-  19 Feb 2003; Guy Martin <gmsoft@gentoo.org> distcc-1.1-r11.ebuild :
-  Added ~hppa to keywords.
-
-  18 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Updated to fix minor bugs in -r11
-
-*distcc-1.1-r10 (17 Feb 2003)
-  
-  17 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Add /var/run/distccd for pid and distcc user... (bugs 15048 and 15769)
-  Updated to fix minor bugs in original -r10
-
-*distcc-1.1-r9 (17 Feb 2003)
-  
-  17 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Fix location of pid file... (bug 15769)
-  Fix einfo Portage version reference
-  (THIS VERSION IS BROKEN - ztw)
-
-*distcc-1.1-r8 (10 Feb 2003)
-  
-  17 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Fix einfo Portage version reference
-
-  15 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Extended einfo and added link to configuration page
-  
-  10 Feb 2003; Zach Welch <zwelch@gentoo.org> :
-  Includes wrapper-1.1.patch from bug 13897; now installs symlinks
-  in /usr/lib/distcc/bin to gcc, g++, and others.  Users should no 
-  longer set CC or CXX to distcc; instead, for non-portage builds,
-  set PATH="/usr/lib/distcc/bin:$PATH".  See the follow for more info:
-  http://gentoo.superlucidity.net/www/distcc.html
-  
-*distcc-1.1 (26 Jan 2003)
-
-  26 Jan 2003; Brad Cowan <bcowan@gentoo.org> distcc-1.1.ebuild,
-  files/digest-distcc-1.1:
-  
-  Bumped version.
-
-*distcc-1.0 (15 Jan 2003)
-
-  15 Jan 2003; Brad Cowan <bcowan@gentoo.org> distcc-1.0.ebuild,
-  files/digest-distcc-1.0:
-  
-  Bumped version. Added new init script thanks to Eric Andreson (Ndiin).
-
-  16 Dec 2002; Aron Griffis <agriffis@gentoo.org> distcc-0.15.ebuild:
-  Added ~alpha to KEYWORDS
-
-*distcc-0.15 (12 Dec 2002)
-
-  12 Dec 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.15.ebuild,
-  files/digest-distcc-0.15:
-  
-  Bumped version.
-
-*distcc-0.14-r1 (11 Dec 2002)
-
-  11 Dec 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.14-r1.ebuild,
-  files/digest-distcc-0.14-r1:
-  
-  Removed bad info file.
-
-*distcc-0.14 (16 Nov 2002)
-
-  16 Nov 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.14.ebuild,
-  files/digest-distcc-0.14 :
-  
-  Version bump.
-
-*distcc-0.13 (12 Nov 2002)
-
-  12 Nov 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.13.ebuild,
-  files/digest-distcc-0.13 :
-  
-  Version bump, with many major bugfixes.
-
-*distcc-0.12 (07 Oct 2002)
-
-  12 Nov 2002; Mark Guertin <gerk@gentoo.org> distcc-0.12.ebuild :
-  Added ppc to keywords again.
-
-  13 Oct 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.12.ebuild,
-  files/distccd :
-  
-  Added distccd init script.
-
-  22 Sep 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.12.ebuild :
-  
-  Version bump.
-
-*distcc-0.11 (25 Sep 2002)
-
-  22 Sep 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.11.ebuild : 
-  
-  Version bump.
-
-*distcc-0.10.1 (17 Sep 2002)
-
-  17 Sep 2002; Brad Cowan <bcowan@gentoo.org> distcc-0.10.1.ebuild : 
-  
-  Version bump, updated docs.
-
-*distcc-0.8 (20 Aug 2002)
-
-  20 Aug 2002; Maik Schreiber <blizzy@gentoo.org> : New release.
-
-*distcc-0.7 (06 Aug 2002)
-
-  06 Aug 2002; Maik Schreiber <blizzy@gentoo.org> : New release.
-
-*distcc-0.6 (12 Jul 2002)
-
-  25 Jul 2002; Mark Guertin <gerk@gentoo.org> : Added ppc to
-  keywords
-
-  12 Jul 2002; Maik Schreiber <blizzy@gentoo.org> : New release.
-
-*distcc-0.5 (05 Jul 2002)
-
-  05 Jul 2002; Daniel Robbins <drobbins@gentoo.org> : new release
-  that includes missing KEYWORDS, SLOT, LICENSE and new man pages,
-  closes bug #4506.
-
-*distcc-0.4 (21 Jun 2002)
-
-  07 Jun 2002; Ryan Phillips <rphillips@gentoo.org> : Added popt
-  dep. Fixes # 4466. Thanks to Michael Grigoriev
-
-  21 Jun 2002; Ryan Phillips <rphillips@gentoo.org> : New release
-
-*distcc-0.3 (21 Jun 2002)
-
-  21 Jun 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog 
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 0cbeff82ff5d..d381979f17c1 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,10 +1,10 @@
-MD5 353c2990fe50f7d7a4f21d4d9dc9c79f ChangeLog 7651
+MD5 39c61763d090239991c94e6f5a3a6b7c ChangeLog 396
 MD5 960b9f9b17b8f9dd99094d162362dd1b distcc-2.0.1-r1.ebuild 2892
 MD5 da890f4d3d7a6c3cb65ad47f80feff6a distcc-2.0.1.ebuild 2895
 MD5 8df905f30d3f4bce8c31534396b66ec8 distcc-2.3.ebuild 2691
 MD5 c242a8c0ff4035a2c6a3ee0545691aed distcc-2.4.ebuild 2702
 MD5 3bc5a82158ff39298b4b80134999ddde distcc-2.4.2.ebuild 2703
-MD5 3bc5a82158ff39298b4b80134999ddde distcc-2.5.ebuild 2703
+MD5 c958bfeb956960d4b15ebab2df7a6d86 distcc-2.5.ebuild 2702
 MD5 372827ac4fc6b9dae1d585934369ce8e distcc-1.2.3-r3.ebuild 2882
 MD5 9a3a39b4f229559e6a855d777c6fe807 files/digest-distcc-2.0.1-r1 65
 MD5 8aa55227d128b8ff22a8caf5d47db89c files/digest-distcc-2.3 63
diff --git a/sys-devel/distcc/distcc-2.5.ebuild b/sys-devel/distcc/distcc-2.5.ebuild
new file mode 100644
index 000000000000..7fc2d303df71
--- /dev/null
+++ b/sys-devel/distcc/distcc-2.5.ebuild
@@ -0,0 +1,95 @@
+# 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.5.ebuild,v 1.1 2003/05/27 23:07:38 zwelch Exp $
+
+inherit eutils
+
+IUSE=""
+
+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"
+
+OPV="1.2"
+LPV="2.3"
+
+DEPEND=">=sys-apps/portage-2.0.46-r11
+	>=sys-devel/gcc-config-1.3.1
+	sys-apps/shadow
+	dev-libs/popt"
+
+src_compile() {
+	econf || die "econf 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}/${LPV}/distcc-config"
+
+	insinto /etc/conf.d
+	newins "${FILESDIR}/${OPV}/conf" distccd
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/${OPV}/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() {
+	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}"
+	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 "To use distcc with **non-Portage** C compiling, add"
+	einfo "/usr/lib/distcc/bin to your path before /usr/bin.  If you're"
+	einfo "combining this with ccache, put the distcc dir AFTER ccache."
+	einfo "Portage 2.0.46-r11+ will take advantage of distcc if you put"
+	einfo "distcc into the FEATURES setting in make.conf (and define"
+	einfo "DISTCC_HOSTS as well). Do NOT set CC=distcc or similar."
+	ewarn "See http://cvs.gentoo.org/~zwelch/distcc.html for information."
+}
+
+#pkg_prerm() {
+#   # ztw - not sure if this is the right place
+#	distcc-config --remove-links "${CHOST}"
+#	distcc-config --remove-links
+#}
+
diff --git a/sys-devel/distcc/files/1.2/init b/sys-devel/distcc/files/1.2/init
index 98408aec5278..c183d62648ab 100644
--- a/sys-devel/distcc/files/1.2/init
+++ b/sys-devel/distcc/files/1.2/init
@@ -1,8 +1,5 @@
 #!/sbin/runscript
 
-# get our configuration options
-source /etc/conf.d/distccd
-
 depend() {
 	need net
 }
@@ -15,19 +12,13 @@ start() {
 	        --startas ${DISTCCD_EXEC} \
 		-c distcc --pidfile ${DISTCCD_PIDFILE} \
 		-- --pid-file ${DISTCCD_PIDFILE} ${DISTCCD_OPTS}
-	eend $? "Failed to Start distccd"
+	eend $?
 }
 
 stop() {
 	ebegin "Stopping distccd"
 	start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}"
 	rm -f "${DISTCCD_PIDFILE}"
-	eend $? "Failed to Stop distccd"
+	eend $?
 }
 
-restart() {
-	ebegin "Restarting distccd"
-	svc_stop
-	svc_start
-	eend $? "Failed to Restart distccd"
-}
diff --git a/sys-devel/distcc/files/digest-distcc-2.5 b/sys-devel/distcc/files/digest-distcc-2.5
new file mode 100644
index 000000000000..b14915b69443
--- /dev/null
+++ b/sys-devel/distcc/files/digest-distcc-2.5
@@ -0,0 +1 @@
+MD5 b0b6a34fa5a30bfa7f6853f477f7772f distcc-2.5.tar.bz2 220088