Version bump.

Package-Manager: portage-2.1.3.19

5 files changed, 238 insertions, 8 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 2dfd63134dc0..71489fba8ad3 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.131 2007/11/19 22:19:58 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.132 2007/12/18 13:38:33 swegener Exp $
+
+*avahi-0.6.22 (18 Dec 2007)
+
+  18 Dec 2007; Sven Wegener <swegener@gentoo.org>
+  +files/avahi-0.6.22-vncviewer.patch, +avahi-0.6.22.ebuild:
+  Version bump.
 
   19 Nov 2007; Sven Wegener <swegener@gentoo.org>
   +files/avahi-vncviewer.patch, avahi-0.6.19-r2.ebuild,
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 758e8461289e..a9f4b727ae27 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -57,6 +57,10 @@ AUX avahi-0.6.21-service_name_chosen.patch 862 RMD160 aac77d26037346e25a021f262d
 MD5 9910cd069e996cec53226e11054a2987 files/avahi-0.6.21-service_name_chosen.patch 862
 RMD160 aac77d26037346e25a021f262d05a6083553266d files/avahi-0.6.21-service_name_chosen.patch 862
 SHA256 4d71cd2534a3cda8990e4b5a8e859daab026112089f419924e8f1b5ce4c24091 files/avahi-0.6.21-service_name_chosen.patch 862
+AUX avahi-0.6.22-vncviewer.patch 520 RMD160 b1493f0898ccd1e62427261f627582f345af4dea SHA1 e301bd4ef29edce5292a51353e4f24329b7f0179 SHA256 587f38457196111a631f6aad8d43aeca43bf929fae0b2584d01968950ede0e75
+MD5 9a9c6ca981c98e6c88d94d0487f22f85 files/avahi-0.6.22-vncviewer.patch 520
+RMD160 b1493f0898ccd1e62427261f627582f345af4dea files/avahi-0.6.22-vncviewer.patch 520
+SHA256 587f38457196111a631f6aad8d43aeca43bf929fae0b2584d01968950ede0e75 files/avahi-0.6.22-vncviewer.patch 520
 AUX avahi-start-after-netmount.patch 998 RMD160 865a837ad85f6569405ab8d69bd08aebafbb9342 SHA1 a5b084504f70ceaf99bcfd75ddad846bda294166 SHA256 03ec271640c86405297cdd2292bcb3745fac517ed050e777a3dfc4188f06b5fb
 MD5 3d9147891d07cf4418d27fff7edab1b7 files/avahi-start-after-netmount.patch 998
 RMD160 865a837ad85f6569405ab8d69bd08aebafbb9342 files/avahi-start-after-netmount.patch 998
@@ -68,6 +72,7 @@ SHA256 3175b1febd682681a38536e1a8f65891b8d8467495b73ce40c4dcac0b2003d3b files/av
 DIST avahi-0.6.19.tar.gz 973381 RMD160 15ae4baaa55f0020422552994a8d1ef33935b065 SHA1 367322064a5dd66a0e69c75df9407ab3518aebdc SHA256 a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a
 DIST avahi-0.6.20.tar.gz 974209 RMD160 da413b25675184d1514953bfd308d544ca5f0556 SHA1 451a095440fba9bec2effa0730bb4ec29593d1b1 SHA256 89ae5fd08018679b80cee201e1c1350d86db73bdcf6718aabb4bd3ea86f93ec9
 DIST avahi-0.6.21.tar.gz 976841 RMD160 0f33afed44112a57c5353bf373a307c9c551abdb SHA1 3675f83b294b87a5cfa947d2f68518f0da8ed7b9 SHA256 d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561
+DIST avahi-0.6.22.tar.gz 1199901 RMD160 fad35f473a9109c8648e43b0f6f547c32b18e32f SHA1 2863bae55a991facc93138ca4660d5b55c846bd1 SHA256 9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52
 EBUILD avahi-0.6.19-r2.ebuild 4609 RMD160 6f58bada613e9ea6077f275015d34208ca5e50a1 SHA1 69baaebf0453ca17f25748f8eb7cb0236c1d8116 SHA256 441070c2a462f3635ba3c5f10ab2e2d228b0daaa7896c21012e4ae73870206c8
 MD5 51fbd023132e5b1eb7155dfc3c230957 avahi-0.6.19-r2.ebuild 4609
 RMD160 6f58bada613e9ea6077f275015d34208ca5e50a1 avahi-0.6.19-r2.ebuild 4609
@@ -80,10 +85,14 @@ EBUILD avahi-0.6.21.ebuild 4803 RMD160 bc4d2f5956a5d18ddfbd83bb9b2b9be20d8d2fee
 MD5 e297d2587e15564ecac5d39ad24815cc avahi-0.6.21.ebuild 4803
 RMD160 bc4d2f5956a5d18ddfbd83bb9b2b9be20d8d2fee avahi-0.6.21.ebuild 4803
 SHA256 0fa9ec0586ed29bcfddcd4cf5c6ce7792399a3f386cc8b9132717a4c5b6b7578 avahi-0.6.21.ebuild 4803
-MISC ChangeLog 19123 RMD160 760ca9504c4bd2c1d9c33492c9cce54cf2016cdc SHA1 2c986bcb188dcbaa2705efe08a0f638b9da0975a SHA256 c3d7aac235bd8435974d4d7a073954d13b25b7697f8dde305073bf8275e3cdff
-MD5 3e0315f8b3302d77acebdcaf835d499c ChangeLog 19123
-RMD160 760ca9504c4bd2c1d9c33492c9cce54cf2016cdc ChangeLog 19123
-SHA256 c3d7aac235bd8435974d4d7a073954d13b25b7697f8dde305073bf8275e3cdff ChangeLog 19123
+EBUILD avahi-0.6.22.ebuild 4756 RMD160 c485c03e3b41b42366f874b0b2fe6e81d6398571 SHA1 8fd2528934bf50799618b161a0471e8e045666b7 SHA256 145628ab147217cf4968a70cf773cc1de40b2b9de7399bee25607d525add72a4
+MD5 61b54bd4675391a6125c1b1e2f54a8a7 avahi-0.6.22.ebuild 4756
+RMD160 c485c03e3b41b42366f874b0b2fe6e81d6398571 avahi-0.6.22.ebuild 4756
+SHA256 145628ab147217cf4968a70cf773cc1de40b2b9de7399bee25607d525add72a4 avahi-0.6.22.ebuild 4756
+MISC ChangeLog 19280 RMD160 a2f18a904057a54f9622766822e9c6934c1f39d8 SHA1 0831e4efe472aae2730c5620c3d927f19ca1c90f SHA256 4ac632661431396e05177192ee336b18485560aa7a1574eea630d1cf9d1cd439
+MD5 f02f00c0dd0320d6ef4f0e50b6c91339 ChangeLog 19280
+RMD160 a2f18a904057a54f9622766822e9c6934c1f39d8 ChangeLog 19280
+SHA256 4ac632661431396e05177192ee336b18485560aa7a1574eea630d1cf9d1cd439 ChangeLog 19280
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -97,10 +106,13 @@ SHA256 9dd3a566162032a532c8a8ce934135a8c99fd7abc07dfe010bfe606fa687785c files/di
 MD5 87d3e0560a399c32aeabd184957fc10d files/digest-avahi-0.6.21 238
 RMD160 55763a7d1642a46b05622141a93b327a5cca4e77 files/digest-avahi-0.6.21 238
 SHA256 959d8a48b6cc82ee56ba4c373c11569935ae21adb9ee13d0fe6bcbfb18669d35 files/digest-avahi-0.6.21 238
+MD5 adaa110b206a179be747bb238c25f70b files/digest-avahi-0.6.22 241
+RMD160 7dd7f8ff8ef6843eec10e63b1e6af403bad620bc files/digest-avahi-0.6.22 241
+SHA256 589bfa1ec571b68da443cdd457dc4b24cb3bad8e0f7327cc9d8539bd243acf3c files/digest-avahi-0.6.22 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHQgwYI1lqEGTUzyQRAgNBAJ9oQR5XCUluZWacJzHb6AOIk4zhzQCfXIai
-k5/vdXG7pCR/+otCmP71NAs=
-=YyaM
+iD8DBQFHZ81iI1lqEGTUzyQRAk7YAJ9tVt6aqIVIWqs7FzR4iGgRvfGr3wCg305c
+oaFFkMSQIvfX8FDB5c+PMLU=
+=3+R2
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.22.ebuild b/net-dns/avahi/avahi-0.6.22.ebuild
new file mode 100644
index 000000000000..0c903b10435c
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.22.ebuild
@@ -0,0 +1,195 @@
+# Copyright 2000-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.22.ebuild,v 1.1 2007/12/18 13:38:33 swegener Exp $
+
+inherit eutils mono python qt3 qt4
+
+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? ( $(qt_min_version 3.3.6-r2) )
+	qt4? ( $(qt4_min_version 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 )
+	)
+	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/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
+}
+
+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}"
+
+	epatch "${FILESDIR}"/${P}-vncviewer.patch
+
+	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 /lib/rcscripts/net
+		doins "${FILESDIR}"/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() {
+	use python && python_mod_optimize "${ROOT}"/usr/lib*/python*/site-packages/avahi
+
+	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/files/avahi-0.6.22-vncviewer.patch b/net-dns/avahi/files/avahi-0.6.22-vncviewer.patch
new file mode 100644
index 000000000000..f20e22f4225c
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.22-vncviewer.patch
@@ -0,0 +1,14 @@
+diff -Nur avahi-0.6.22.orig/avahi-ui/bssh.c avahi-0.6.22/avahi-ui/bssh.c
+--- avahi-0.6.22.orig/avahi-ui/bssh.c	2007-12-17 15:12:57.000000000 +0000
++++ avahi-0.6.22/avahi-ui/bssh.c	2007-12-17 16:07:54.021586488 +0000
+@@ -86,8 +86,8 @@
+ 
+             gtk_widget_destroy(d);
+ 
+-            g_print("xvncviewer %s\n", p);
+-            execlp("xvncviewer", "xvncviewer", p, NULL);
++            g_print("vncviewer %s\n", p);
++            execlp("vncviewer", "vncviewer", p, NULL);
+ 
+         } else {
+             char p[16];
diff --git a/net-dns/avahi/files/digest-avahi-0.6.22 b/net-dns/avahi/files/digest-avahi-0.6.22
new file mode 100644
index 000000000000..197f80d3c14b
--- /dev/null
+++ b/net-dns/avahi/files/digest-avahi-0.6.22
@@ -0,0 +1,3 @@
+MD5 c84b1a8a23126e188426728710414dc8 avahi-0.6.22.tar.gz 1199901
+RMD160 fad35f473a9109c8648e43b0f6f547c32b18e32f avahi-0.6.22.tar.gz 1199901
+SHA256 9dc6f870b6ce050059054a26bfc15d6e7a836fa299edd1b89c63c1089bfedd52 avahi-0.6.22.tar.gz 1199901