diff options
| -rw-r--r-- | sys-devel/distcc/ChangeLog | 4 | ||||
| -rw-r--r-- | sys-devel/distcc/Manifest | 5 | ||||
| -rw-r--r-- | sys-devel/distcc/distcc-2.18.3-r11.ebuild | 8 | ||||
| -rw-r--r-- | sys-devel/distcc/files/distcc-avahi-configure.patch | 29 |
4 files changed, 41 insertions, 5 deletions
diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog index a37c0ab..1f446d9 100644 --- a/sys-devel/distcc/ChangeLog +++ b/sys-devel/distcc/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.166 2007/12/25 14:22:22 phreak Exp $ + 01 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> + +files/distcc-avahi-configure.patch, distcc-2.18.3-r11.ebuild: + Add ./configure switches for avahi. + 01 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> +files/2.18/conf, +files/2.18/distcc-config.patch, +files/2.18/init, +files/distcc-as-needed.patch, +files/distcc-avahi.patch, diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest index 0bdcf74..6ff3784 100644 --- a/sys-devel/distcc/Manifest +++ b/sys-devel/distcc/Manifest @@ -2,11 +2,12 @@ AUX 2.18/conf 1267 RMD160 a12045786088255c9bc8f4ad826928c00efac567 SHA1 828f62be AUX 2.18/distcc-config.patch 1200 RMD160 46adf137db41c3278463125caeb132b9626ead54 SHA1 080ba28e0cc2eab5cdcb9c860dd255460926cadd SHA256 0abca6ee532de72ef19f1b210a09bd661ea7110cf36654c8c8ac016ee6573e55 AUX 2.18/init 733 RMD160 935e52d2ddfc6363f26a916666bbbc28b6fdb79b SHA1 737e969b122c70df6d54c7a98bfdc872af278ff6 SHA256 1477ab79b8be398b6acb7d44e0f0a66bb75d1918365b350b824e16b8b02af22b AUX distcc-as-needed.patch 558 RMD160 faebf24490e3dd2a5247cfb6914dc88fb7b98e35 SHA1 5e5547032b6492f9f8b0511fd621a005dbd455a2 SHA256 9e87d3b0487ffc52ccf6362866e967dff9c2a85681175096ece11413f8c91e54 +AUX distcc-avahi-configure.patch 1263 RMD160 6da8e07acda9ccdcee796d87546d548d1489c4a4 SHA1 eafd2b64f8b0608cdf6ea157759745ff878dd973 SHA256 f468f98bfdb86614ffba98d3ce991209fc765a435040a99163b449ea9caf5713 AUX distcc-avahi.patch 41523 RMD160 215bbf31ba2a7a42ee1e9bcea4d04a1df91d75b1 SHA1 b9a52359933e0254ae7063e1e462975e0fd464c1 SHA256 8d36eaf551b9d46b97d68f2ba6d6d5baff77273fb6c0ec53be797402129912d4 AUX distcc-config 4874 RMD160 07bd612fc11c785691bd56e4e7bb7994a2e4dbb8 SHA1 85b5f38d6024e4f454bfa07d96c13b4749ce3e2a SHA256 c6a7bb74eb235fd7896ca101c033a2e9faf80afeb7232bff3afe22f8a6268a5c AUX distcc-gentoo-multilib-r1.patch 4245 RMD160 175cb4c2ce0e8ecb2262165b3fd9a0d89ddc7beb SHA1 f617965969e7b4afd1b6467a56fe0f7f748c7717 SHA256 78839f7392769ab41509e84f07c36d07315d0220f7aacbb174ed1aba80b9c28d AUX distcc-gentoo-multilib.patch 3784 RMD160 f48a3f2f8c82379c30c9da0e49aa66ba34681882 SHA1 5a3ba956caaab2d5c6ef44ee3ded10a33ac870dc SHA256 d3af7a7592d0a11a35d294022b36feca2fb625e4799513bf56a79e0656278403 DIST distcc-2.18.3.tar.bz2 341601 RMD160 c7ac6f3e161dccf39b841b57a3328b4208d28c2d SHA1 88e4c15826bdbc5a3de0f7c1bcb429e558c6976d SHA256 6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434 -EBUILD distcc-2.18.3-r11.ebuild 5108 RMD160 7d41e18446c7b03c866e1a04df4aa144951e0cd5 SHA1 85c7695d1c5b4965783ab93493b1c8d2a8bac2c0 SHA256 7398c7f468ee68f4ec79469074f10be6c75ca667467392b972b0bdac390cdb5d -MISC ChangeLog 30529 RMD160 29b804f71c4b981287e48ac6493e9c270ff4aa30 SHA1 50d893924a21356f2db64e3cbf77cfa0f59b7513 SHA256 332282eed3bb5bc228220f568b565e87688d4087640f741e6c3993d9e7005369 +EBUILD distcc-2.18.3-r11.ebuild 5219 RMD160 bdabbda60ac1a2c72dc979cb2c0427ea53b6f39d SHA1 b5445d0f881d36c0b91710a290d5b78b22dd2909 SHA256 547824f1c120a54a2345c1a12a1246ca2fd064881eb9494968e77fd7dd355745 +MISC ChangeLog 30686 RMD160 62d594374c0f5b918d4264b716c0e9d4188459a7 SHA1 6c544fb678c01fd0c72dfc694caa4d68873ef197 SHA256 795b732c569b697f951deca424631383805ea5cce4763f9bf0b3a4c68e249545 MISC metadata.xml 311 RMD160 1a480ace832e20a2640e7546965d54974058df1c SHA1 29a13cdea1b2f7e4f2edaf1182658647616f34ab SHA256 15a24b4d03798665cf9af1619e2aefb8db4ed4e3b057467620afdf48af395f09 diff --git a/sys-devel/distcc/distcc-2.18.3-r11.ebuild b/sys-devel/distcc/distcc-2.18.3-r11.ebuild index e258ef2..54f5a39 100644 --- a/sys-devel/distcc/distcc-2.18.3-r11.ebuild +++ b/sys-devel/distcc/distcc-2.18.3-r11.ebuild @@ -16,9 +16,10 @@ SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="gnome gtk selinux ipv6" +IUSE="avahi gnome gtk selinux ipv6" -COMMON_DEP="dev-libs/popt" +COMMON_DEP="dev-libs/popt + avahi? ( >=net-dns/avahi-0.6.5 )" DEPEND="|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler ) userland_GNU? ( sys-apps/shadow ) gnome? ( dev-util/pkgconfig ) @@ -52,6 +53,7 @@ src_unpack() { einfo "Please report to bug #75420 success or failure of this patch." epatch "${FILESDIR}/${PN}-avahi.patch" + epatch "${FILESDIR}/${PN}-avahi-configure.patch" rm -v popt/*.c || die eautoreconf } @@ -76,7 +78,7 @@ src_compile() { myconf=" ${myconf} --enable-rfc2553 " epause 5 fi - econf ${myconf} || die "econf ${myconf} failed" + econf ${myconf} $(use_enable avahi) || die "econf ${myconf} failed" emake || die "emake failed" } diff --git a/sys-devel/distcc/files/distcc-avahi-configure.patch b/sys-devel/distcc/files/distcc-avahi-configure.patch new file mode 100644 index 0000000..9f42764 --- /dev/null +++ b/sys-devel/distcc/files/distcc-avahi-configure.patch @@ -0,0 +1,29 @@ +diff -ur distcc-2.18.3.old/configure.ac distcc-2.18.3/configure.ac +--- distcc-2.18.3.old/configure.ac 2008-01-01 21:08:02.000000000 +0200 ++++ distcc-2.18.3/configure.ac 2008-01-01 21:09:56.000000000 +0200 +@@ -387,14 +387,18 @@ + [#include <sys/socket.h>]) + + dnl check for avahi ++AC_ARG_ENABLE(avahi, AC_HELP_STRING([--enable-avahi], [enable avahi support], [], [enable_avahi=auto])) ++ZEROCONF_DISTCC_OBJS="" ++ZEROCONF_DISTCCD_OBJS="" + PKG_CHECK_MODULES(AVAHI, [avahi-client >= 0.6.5], +-[AC_DEFINE(HAVE_AVAHI, 1, [defined if Avahi is available]) +-CFLAGS="$CFLAGS $AVAHI_CFLAGS" +-LIBS="$LIBS $AVAHI_LIBS" +-ZEROCONF_DISTCC_OBJS="src/zeroconf.o src/gcc-id.o" +-ZEROCONF_DISTCCD_OBJS="src/zeroconf-reg.o src/gcc-id.o"], +-[ZEROCONF_DISTCC_OBJS="" +-ZEROCONF_DISTCCD_OBJS=""]) ++[if test x"${enable_avahi}" = x"yes" || test x"${enable_avahi}" = x"auto"; then ++ AC_DEFINE(HAVE_AVAHI, 1, [defined if Avahi is available]) ++ CFLAGS="$CFLAGS $AVAHI_CFLAGS" ++ LIBS="$LIBS $AVAHI_LIBS" ++ ZEROCONF_DISTCC_OBJS="src/zeroconf.o src/gcc-id.o" ++ ZEROCONF_DISTCCD_OBJS="src/zeroconf-reg.o src/gcc-id.o" ++fi], ++[test x"${enable_avahi}" = x"yes" && AC_MSG_ERROR(avahi support needs avahi-client >= 0.6.5 installed)]) + AC_SUBST(ZEROCONF_DISTCC_OBJS) + AC_SUBST(ZEROCONF_DISTCCD_OBJS) + |