[net-dns/avahi] Update from main portage tree.

Wrote an import_avahi helper script, based on the import_poppler script.

5 files changed, 224 insertions, 11 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 5f2fddf0..5f14e652 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-dns/avahi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.170 2009/10/06 17:19:57 ayoy Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.173 2010/02/09 14:02:58 flameeyes Exp $
+
+*avahi-0.6.25-r1 (09 Feb 2010)
+
+  09 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +avahi-0.6.25-r1.ebuild:
+  Port avahi to EAPI=2 to avoid built_with_use calls, restrict dbus
+  dependency to something definitely more modern.
+
+  03 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  avahi-0.6.24-r2.ebuild, avahi-0.6.25.ebuild:
+  Raise intltool depend to >= 0.40.5 wrt #265542.
+
+  03 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  avahi-0.6.24-r2.ebuild, avahi-0.6.25.ebuild:
+  Remove unused USE="qt3" support wrt bug #283429.
 
   06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> avahi-0.6.24-r2.ebuild,
   avahi-0.6.25.ebuild:
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index f94aba26..608c86c6 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -5,7 +5,8 @@ AUX avahi-0.6.24-cmsg_space.patch 449 RMD160 9593ee893daf908e35f36a7396ae5d52a76
 AUX avahi-0.6.24-libintl.patch 542 RMD160 918aa11cdbce6f38d9a9446c798db2bc43a957b5 SHA1 c9f8ef5d0047b591e6e88153731ae380d64a2431 SHA256 fb8e37d6071a990184a7ad3c20a7709554103fb2c4f02450c338b9fbcf358215
 DIST avahi-0.6.24.tar.gz 1115626 RMD160 94f59ccbd14d99e91e259b27dd7f03404c6691e6 SHA1 a187af361fefc8bda026936bb07ccdeb41dc74bc SHA256 260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950
 DIST avahi-0.6.25.tar.gz 1103653 RMD160 3025f774360a8ea3b9de87e2df0b00387569aaf2 SHA1 7ce8ed5a494d72401dd81f64594fda59d2ec91fd SHA256 9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59
-EBUILD avahi-0.6.24-r2.ebuild 5284 RMD160 c995a0dff6ccdee03beeac1c5d1af93c7605541e SHA1 edee2c91918ce8536244b3abca7c33be354fa18f SHA256 f30ed1db9356190806974520bd40f22926f4d574c92aba611fc09853afb42fac
-EBUILD avahi-0.6.25.ebuild 5236 RMD160 59dd46c002eae157cd056f7b570e349deef8c3a1 SHA1 3817d296b4189f69268a9e386b3c666323f0d788 SHA256 88b99009547c5de5ab6763809f30c902e9478f318017d7a3b2d2b9ca4b48820b
-MISC ChangeLog 25430 RMD160 fd16b2a1b50ce4d5245397c6b618a64bb03610a6 SHA1 7e3d0337035a4800bbbc59750e080811a35a4891 SHA256 166bf1e046f74ff286fd191a8b703260634b48a2ffe5542ddee0768a5a4db35c
+EBUILD avahi-0.6.24-r2.ebuild 5291 RMD160 6025eb3ee902ac67fcd114461eaffe4c6fbf77c8 SHA1 f0e8f33d626f44a66f8d016cf66dfbff9c213c4b SHA256 39f244d90ab318750317289646445416a5a1e1b0f8fa733fbf827a1c01560761
+EBUILD avahi-0.6.25-r1.ebuild 4785 RMD160 c4fbcbebdb5b245f420c15242654d2a023adcfaf SHA1 770181b3b34a2678e7e4a29daaef700367b79005 SHA256 a17ad4abad9ec639583b5bfa86f875eccd965a3cf4cb3b9173b10e76ca52e46d
+EBUILD avahi-0.6.25.ebuild 5243 RMD160 f95574bfc1a13b8fb68b2a0eeca9eb252ab4375d SHA1 a9f5f139fa8706698021cd109ea80dc81cb539b3 SHA256 70022764b371c9fbc3bf8116a8f0f0817436deb1aa9e6bfaf61ada6859d0b930
+MISC ChangeLog 25974 RMD160 7419cd66251b64bc394ed264c2032c54c6c28c85 SHA1 3e6646ec447e7914ee8763e29f6365b145d151c1 SHA256 8e30677ba74c203d0e427c9a97fe55b685499a360428055ed7584a7b428af684
 MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa
diff --git a/net-dns/avahi/avahi-0.6.24-r2.ebuild b/net-dns/avahi/avahi-0.6.24-r2.ebuild
index 3e2708fd..cef07b54 100644
--- a/net-dns/avahi/avahi-0.6.24-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.24-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.24-r2.ebuild,v 1.11 2009/10/06 17:19:57 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.24-r2.ebuild,v 1.13 2010/01/03 15:23:37 ssuominen Exp $
 
 EAPI="1"
 
@@ -53,7 +53,7 @@ RDEPEND=">=dev-libs/libdaemon-0.11-r1
 	)
 	kernel_linux? ( sys-libs/libcap )"
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
+	>=dev-util/intltool-0.40.5
 	>=dev-util/pkgconfig-0.9.0
 	doc? (
 		app-doc/doxygen
diff --git a/net-dns/avahi/avahi-0.6.25-r1.ebuild b/net-dns/avahi/avahi-0.6.25-r1.ebuild
new file mode 100644
index 00000000..9bdc71ca
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.25-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25-r1.ebuild,v 1.1 2010/02/09 14:02:58 flameeyes Exp $
+
+EAPI=2
+
+inherit eutils mono python multilib autotools flag-o-matic
+
+DESCRIPTION="System which facilitates service discovery on a local network"
+HOMEPAGE="http://avahi.org/"
+SRC_URI="http://avahi.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test ipv6"
+
+RDEPEND=">=dev-libs/libdaemon-0.11-r1
+	dev-libs/expat
+	>=dev-libs/glib-2
+	gdbm? ( sys-libs/gdbm )
+	qt3? ( x11-libs/qt:3 )
+	qt4? ( x11-libs/qt-core:4 )
+	gtk? (
+		>=x11-libs/gtk+-2.4.0
+		>=gnome-base/libglade-2.4.0
+	)
+	dbus? (
+		>=sys-apps/dbus-0.30
+		python? ( dev-python/dbus-python )
+	)
+	mono? (
+		>=dev-lang/mono-1.1.10
+		gtk? ( >=dev-dotnet/gtk-sharp-2 )
+	)
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )
+	python? (
+		>=dev-lang/python-2.4[gdbm]
+		gtk? ( >=dev-python/pygtk-2 )
+	)
+	bookmarks? (
+		dev-python/twisted
+		dev-python/twisted-web
+	)
+	kernel_linux? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40.5
+	>=dev-util/pkgconfig-0.9.0
+	doc? (
+		app-doc/doxygen
+		mono? ( >=virtual/monodoc-1.1.8 )
+	)"
+
+pkg_setup() {
+	if ( use mdnsresponder-compat || use howl-compat || use mono ) && ! use dbus
+	then
+		die "For *-compat or mono support you also need to enable the dbus USE flag!"
+	fi
+
+	if use bookmarks && ! ( use python && use dbus && use gtk )
+	then
+		die "For bookmarks support you also need to enable the python, dbus and gtk USE flags!"
+	fi
+
+	if use python && ! use dbus && ! use gtk
+	then
+		die "For proper python support you also need the dbus and gtk USE flags!"
+	fi
+}
+
+pkg_preinst() {
+	enewgroup netdev
+	enewgroup avahi
+	enewuser avahi -1 -1 -1 avahi
+
+	if use autoipd
+	then
+		enewgroup avahi-autoipd
+		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
+	fi
+}
+
+src_prepare() {
+	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
+
+	sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl
+
+	rm -f common/libtool.m4 common/lt*.m4 || die "Removing libtool macros failed"
+
+	epatch "${FILESDIR}"/avahi-0.6.24-cmsg_space.patch
+	epatch "${FILESDIR}"/avahi-0.6.24-libintl.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	use sh && replace-flags -O? -O0
+
+	local myconf=""
+
+	if use python
+	then
+		use dbus && myconf="${myconf} --enable-python-dbus"
+		use gtk && myconf="${myconf} --enable-pygtk"
+	fi
+
+	if use mono && use doc
+	then
+		myconf="${myconf} --enable-monodoc"
+	fi
+
+	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
+	unset DISPLAY
+
+	econf \
+		--localstatedir=/var \
+		--with-distro=gentoo \
+		--disable-python-dbus \
+		--disable-pygtk \
+		--disable-xmltoman \
+		--disable-monodoc \
+		--enable-glib \
+		$(use_enable test tests) \
+		$(use_enable autoipd) \
+		$(use_enable mdnsresponder-compat compat-libdns_sd) \
+		$(use_enable howl-compat compat-howl) \
+		$(use_enable doc doxygen-doc) \
+		$(use_enable mono) \
+		$(use_enable dbus) \
+		$(use_enable python) \
+		$(use_enable gtk) \
+		$(use_enable qt3) \
+		$(use_enable qt4) \
+		$(use_enable gdbm) \
+		${myconf} \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	use doc && emake avahi.devhelp
+}
+
+src_install() {
+	emake install py_compile=true DESTDIR="${D}" || die "make install failed"
+	use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks
+
+	use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc
+	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h
+
+	if use autoipd
+	then
+		insinto /$(get_libdir)/rcscripts/net
+		doins "${FILESDIR}"/autoipd.sh
+
+		insinto /$(get_libdir)/rc/net
+		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
+	fi
+
+	dodoc docs/{AUTHORS,NEWS,README,TODO}
+
+	if use doc
+	then
+		dohtml -r doxygen/html/.
+		insinto /usr/share/devhelp/books/avahi
+		doins avahi.devhelp
+	fi
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup
+}
+
+pkg_postinst() {
+	if use python; then
+		python_version
+		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/avahi
+	fi
+
+	if use autoipd
+	then
+		elog
+		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
+		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
+		elog
+	fi
+
+	if use dbus
+	then
+		elog
+		elog "If this is your first install of avahi please reload your dbus config"
+		elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
+		elog
+	fi
+}
diff --git a/net-dns/avahi/avahi-0.6.25.ebuild b/net-dns/avahi/avahi-0.6.25.ebuild
index e1153f66..1596060a 100644
--- a/net-dns/avahi/avahi-0.6.25.ebuild
+++ b/net-dns/avahi/avahi-0.6.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25.ebuild,v 1.3 2009/10/06 17:19:57 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25.ebuild,v 1.5 2010/01/03 15:23:37 ssuominen Exp $
 
 EAPI="1"
 
@@ -53,7 +53,7 @@ RDEPEND=">=dev-libs/libdaemon-0.11-r1
 	)
 	kernel_linux? ( sys-libs/libcap )"
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
+	>=dev-util/intltool-0.40.5
 	>=dev-util/pkgconfig-0.9.0
 	doc? (
 		app-doc/doxygen