Version bump.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc8 x86_64

3 files changed, 225 insertions, 6 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 0d6915180c8f..252d18dd6f52 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.144 2008/05/30 21:05:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.145 2008/06/25 19:26:13 swegener Exp $
+
+*avahi-0.6.23 (25 Jun 2008)
+
+  25 Jun 2008; Sven Wegener <swegener@gentoo.org> +avahi-0.6.23.ebuild:
+  Version bump.
 
   30 May 2008; Sven Wegener <swegener@gentoo.org>
   -files/avahi-0.6.20-cleanup-dns-compression-table.patch,
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 9d8611a25bf9..0b359d88e53c 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -14,14 +14,16 @@ AUX avahi-start-after-netmount.patch 998 RMD160 865a837ad85f6569405ab8d69bd08aeb
 AUX avahi-vncviewer.patch 474 RMD160 ca19092b5a410cefb67480f0de7f4baf8ceff1fc SHA1 1838114e7c0ed4ff15c4adaf791fb6cbfab1bb48 SHA256 3175b1febd682681a38536e1a8f65891b8d8467495b73ce40c4dcac0b2003d3b
 DIST avahi-0.6.19.tar.gz 973381 RMD160 15ae4baaa55f0020422552994a8d1ef33935b065 SHA1 367322064a5dd66a0e69c75df9407ab3518aebdc SHA256 a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a
 DIST avahi-0.6.22.tar.gz 1199901 RMD160 fad35f473a9109c8648e43b0f6f547c32b18e32f SHA1 2863bae55a991facc93138ca4660d5b55c846bd1 SHA256 9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52
+DIST avahi-0.6.23.tar.gz 1104410 RMD160 cdb24199bb9d48eba0a98097b4fe5aee94b8367c SHA1 54a0d1944e43805886aafccaf5cc3ec567f5cc9e SHA256 dedf5325105f071e5d9f898fdb7337a7fe88a3a8a1f832a6056ba00477b8cc3d
 EBUILD avahi-0.6.19-r2.ebuild 4716 RMD160 75f369b613e5aaf68eb68249a2e2776365a10313 SHA1 0249ee22a402782ba226028a6eb1c95911460c79 SHA256 1df38998b5013e1b8e91870f2f9ae9ecd2103a02b4b05b2f942148df1105f14f
 EBUILD avahi-0.6.22-r1.ebuild 5172 RMD160 47524eed8456081bb1284a5065d7c8d06f130111 SHA1 39596ce06a1e3f90e312fd696cda52e6447b9a72 SHA256 d8b98e0cd49866b50ead45da32844c7f08ff5eb1f0bcf9b14b81e65539b807aa
-MISC ChangeLog 21599 RMD160 f369d586af15d9d03484472703baeddb7b8375f4 SHA1 08ef65ab1a5dcb60085479738082b30859f22f87 SHA256 a6442ad94f48a334ee4c1eebc70ad2a673a27e2dca57f72edee7277d31578836
+EBUILD avahi-0.6.23.ebuild 5030 RMD160 2d9f5ef6ad090cc7d5c3254beb4f9b0c571f5b04 SHA1 62a5f78155fdd20f2949c2bf2d82cc0e8fa27ca3 SHA256 e4acb7e815f951e50016b732327a2757f21d890a9ce277f6b178d1d89f5ff7bd
+MISC ChangeLog 21717 RMD160 0670d96210d1778c17e494a9e424ced557a96b23 SHA1 c09d0354001260072e7922993e625d5de7ffa57a SHA256 84988e470c4846f99287430223d37f7d4755968af92bcdcf285c67a27a184735
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIQGw4I1lqEGTUzyQRAl9pAKCDWpWZEKWrt6Ih5FRutK4VNAhVUgCgh42n
-xLRnotMVzfYJuXN/VkoaDXs=
-=NbBB
+iEYEARECAAYFAkhim90ACgkQI1lqEGTUzyRmLgCgjGOcAWAs7HonHtpLw5yCEUvW
++9kAn0J9tmiQUSFtUb4UaMV9Exv8J7pX
+=kBin
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.23.ebuild b/net-dns/avahi/avahi-0.6.23.ebuild
new file mode 100644
index 000000000000..d22af93af91b
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.23.ebuild
@@ -0,0 +1,212 @@
+# Copyright 2000-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.23.ebuild,v 1.1 2008/06/25 19:26:13 swegener Exp $
+
+EAPI="1"
+
+inherit eutils mono python multilib
+
+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"
+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
+			x11-libs/qt: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
+				(
+					<sys-apps/dbus-0.90
+					>=sys-apps/dbus-0.30
+				)
+			)
+		)
+	)
+	mono? (
+		>=dev-lang/mono-1.1.10
+		gtk? ( >=dev-dotnet/gtk-sharp-2 )
+	)
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )
+	python? (
+		>=virtual/python-2.4
+		gtk? ( >=dev-python/pygtk-2 )
+	)
+	bookmarks? (
+		dev-python/twisted
+		dev-python/twisted-web
+	)
+	kernel_linux? ( sys-libs/libcap )
+	!net-misc/mDNSResponder"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9.0
+	doc? (
+		app-doc/doxygen
+		mono? ( >=dev-util/monodoc-1.1.8 )
+	)"
+
+pkg_setup() {
+	if use python && ! built_with_use dev-lang/python gdbm
+	then
+		die "For python support you need dev-lang/python compiled with gdbm support!"
+	fi
+
+	if use python && use dbus && ! has_version dev-python/dbus-python && ! built_with_use sys-apps/dbus python
+	then
+		die "For python and dbus support you need sys-apps/dbus compiled with python support or dev-python/dbus-python!"
+	fi
+
+	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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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
+}
+
+src_compile() {
+	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"
+	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,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
+}