summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-devel/distcc/distcc-2.18.3-r11.ebuild8
-rw-r--r--sys-devel/distcc/files/2.18-r1/conf (renamed from sys-devel/distcc/files/2.18/conf)0
-rw-r--r--sys-devel/distcc/files/2.18-r1/distcc-config.patch (renamed from sys-devel/distcc/files/2.18/distcc-config.patch)0
-rw-r--r--sys-devel/distcc/files/2.18-r1/init (renamed from sys-devel/distcc/files/2.18/init)10
4 files changed, 15 insertions, 3 deletions
diff --git a/sys-devel/distcc/distcc-2.18.3-r11.ebuild b/sys-devel/distcc/distcc-2.18.3-r11.ebuild
index 7e2acf3..96bec11 100644
--- a/sys-devel/distcc/distcc-2.18.3-r11.ebuild
+++ b/sys-devel/distcc/distcc-2.18.3-r11.ebuild
@@ -7,7 +7,7 @@
inherit autotools eutils flag-o-matic toolchain-funcs
-PATCHLEVEL="2.18"
+PATCHLEVEL="2.18-r1"
DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
HOMEPAGE="http://distcc.samba.org/"
@@ -24,6 +24,7 @@ DEPEND="|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
userland_GNU? ( sys-apps/shadow )
gnome? ( dev-util/pkgconfig )
gtk? ( dev-util/pkgconfig )
+ dev-util/unifdef
${COMMON_DEP}"
RDEPEND="
gnome? (
@@ -101,7 +102,10 @@ src_install() {
newconfd "${FILESDIR}/${PATCHLEVEL}/conf" distccd
- newinitd "${FILESDIR}/${PATCHLEVEL}/init" distccd
+ local avahi="-UAVAHI"
+ use avahi && avahi="-DAVAHI"
+ unifdef ${avahi} "${FILESDIR}/${PATCHLEVEL}/init" > "${T}/init"
+ newinitd "${T}/init" distccd
# create and keep the symlink dir
dodir /usr/lib/distcc/bin
diff --git a/sys-devel/distcc/files/2.18/conf b/sys-devel/distcc/files/2.18-r1/conf
index 3f6c3f0..3f6c3f0 100644
--- a/sys-devel/distcc/files/2.18/conf
+++ b/sys-devel/distcc/files/2.18-r1/conf
diff --git a/sys-devel/distcc/files/2.18/distcc-config.patch b/sys-devel/distcc/files/2.18-r1/distcc-config.patch
index d06a784..d06a784 100644
--- a/sys-devel/distcc/files/2.18/distcc-config.patch
+++ b/sys-devel/distcc/files/2.18-r1/distcc-config.patch
diff --git a/sys-devel/distcc/files/2.18/init b/sys-devel/distcc/files/2.18-r1/init
index 1abe4a9..bc19cf2 100644
--- a/sys-devel/distcc/files/2.18/init
+++ b/sys-devel/distcc/files/2.18-r1/init
@@ -2,13 +2,21 @@
# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.18/init,v 1.1 2004/10/12 17:21:43 lisa Exp $
depend() {
+#ifdef AVAHI
+ need net avahi-daemon
+#else
need net
+#endif
use ypbind
}
start() {
[ -e "${DISTCCD_PIDFILE}" ] && rm -f ${DISTCCD_PIDFILE} &>/dev/null
+ local args=""
+#ifdef AVAHI
+ args="--zeroconf"
+#endif
ebegin "Starting distccd"
chown distcc `dirname ${DISTCCD_PIDFILE}` &>/dev/null
TMPDIR="${TMPDIR}" \
@@ -16,7 +24,7 @@ start() {
/sbin/start-stop-daemon --start --quiet --startas ${DISTCCD_EXEC} \
--pidfile ${DISTCCD_PIDFILE} -- \
--pid-file ${DISTCCD_PIDFILE} -N ${DISTCCD_NICE} --user distcc \
- ${DISTCCD_OPTS}
+ ${args} ${DISTCCD_OPTS}
eend $?
}