synced net-dns/avahi with portage tree

14 files changed, 2 insertions, 1121 deletions

diff --git a/metadata/cache/net-dns/avahi-0.6.24 b/metadata/cache/net-dns/avahi-0.6.24
deleted file mode 100644
index c83f1cf15..000000000
--- a/metadata/cache/net-dns/avahi-0.6.24
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/libdaemon-0.11-r1[lib32?] dev-libs/expat[lib32?] >=dev-libs/glib-2[lib32?] gdbm? ( sys-libs/gdbm[lib32?] ) qt3? ( x11-libs/qt:3[lib32?] ) qt4? ( || ( x11-libs/qt-core:4[lib32?] x11-libs/qt:4[lib32?] ) ) gtk? ( >=x11-libs/gtk+-2.4.0[lib32?] >=gnome-base/libglade-2.4.0[lib32?] ) dbus? ( >=sys-apps/dbus-0.30[lib32?] python? ( || ( dev-python/dbus-python ( <sys-apps/dbus-0.90[lib32?] >=sys-apps/dbus-0.30[lib32?] ) ) ) ) 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[lib32?] ) >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9.0 doc? ( app-doc/doxygen mono? ( >=virtual/monodoc-1.1.8 ) ) sys-apps/abi-wrapper
->=dev-libs/libdaemon-0.11-r1[lib32?] dev-libs/expat[lib32?] >=dev-libs/glib-2[lib32?] gdbm? ( sys-libs/gdbm[lib32?] ) qt3? ( x11-libs/qt:3[lib32?] ) qt4? ( || ( x11-libs/qt-core:4[lib32?] x11-libs/qt:4[lib32?] ) ) gtk? ( >=x11-libs/gtk+-2.4.0[lib32?] >=gnome-base/libglade-2.4.0[lib32?] ) dbus? ( >=sys-apps/dbus-0.30[lib32?] python? ( || ( dev-python/dbus-python ( <sys-apps/dbus-0.90[lib32?] >=sys-apps/dbus-0.30[lib32?] ) ) ) ) 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[lib32?] ) sys-apps/abi-wrapper
-0
-http://avahi.org/download/avahi-0.6.24.tar.gz
-
-http://avahi.org/
-LGPL-2.1
-System which facilitates service discovery on a local network
-alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-alternatives base eutils mono multilib multilib-native portability python toolchain-funcs
-bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test ipv6 lib32
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
deleted file mode 100644
index 7752d819d..000000000
--- a/net-dns/avahi/ChangeLog
+++ /dev/null
@@ -1,678 +0,0 @@
-# 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.162 2009/03/11 13:33:19 ranger Exp $
-
-  11 Mar 2009; Brent Baude <ranger@gentoo.org> avahi-0.6.24-r2.ebuild:
-  Marking avahi-0.6.24-r2 ppc64 for bug 260971
-
-  08 Mar 2009; Timothy Redaelli <drizzt@gentoo.org> avahi-0.6.24-r2.ebuild:
-  Readd ~x86-fbsd keyword wrt #184008
-
-  08 Mar 2009; Tobias Klausmann <klausman@gentoo.org>
-  avahi-0.6.24-r2.ebuild:
-  Stable on alpha, bug #260971
-
-  07 Mar 2009; Jeroen Roovers <jer@gentoo.org> avahi-0.6.24-r2.ebuild:
-  Stable for HPPA (bug #260971).
-
-  06 Mar 2009; Sven Wegener <swegener@gentoo.org> avahi-0.6.24-r2.ebuild:
-  Proper fix for libtool problem by loki_val.
-
-*avahi-0.6.24-r2 (06 Mar 2009)
-
-  06 Mar 2009; Sven Wegener <swegener@gentoo.org> avahi-0.6.24-r1.ebuild,
-  +avahi-0.6.24-r2.ebuild:
-  Split out gfbsd patches to separate revision to allow early security
-  stable marking.
-
-*avahi-0.6.24-r1 (05 Mar 2009)
-
-  05 Mar 2009; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.24-CVE-2009-0758.patch,
-  +files/avahi-0.6.24-cmsg_space.patch, +files/avahi-0.6.24-libintl.patch,
-  +avahi-0.6.24-r1.ebuild:
-  Add gfbsd patches, bug #184008. Security bump, bug #260971.
-
-  22 Dec 2008; Raúl Porcel <armin76@gentoo.org> avahi-0.6.24.ebuild:
-  ia64/sparc stable wrt #250913
-
-  20 Dec 2008; Tobias Klausmann <klausman@gentoo.org> avahi-0.6.24.ebuild:
-  Stable on alpha, bug #250913
-
-  18 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> avahi-0.6.24.ebuild:
-  ppc stable, bug #250913
-
-  18 Dec 2008; Brent Baude <ranger@gentoo.org> avahi-0.6.24.ebuild:
-  Marking avahi-0.6.24 ppc64 for bug 250913
-
-  18 Dec 2008; Jeroen Roovers <jer@gentoo.org> avahi-0.6.24.ebuild:
-  Stable for HPPA (bug #250913).
-
-  17 Dec 2008; Markus Meier <maekke@gentoo.org> avahi-0.6.24.ebuild:
-  amd64/x86 stable, bug #250913
-
-*avahi-0.6.24 (14 Dec 2008)
-
-  14 Dec 2008; Sven Wegener <swegener@gentoo.org> +avahi-0.6.24.ebuild:
-  Version bump, security bug #250913.
-
-  14 Dec 2008; Peter Alfredsen <loki_val@gentoo.org> avahi-0.6.19-r2.ebuild,
-  avahi-0.6.22-r1.ebuild, avahi-0.6.23.ebuild:
-  Use virtual/monodoc to accomodate inclusion of monodoc in mono from
-  >=mono-2.2_pre1
-
-  17 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-  27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> avahi-0.6.19-r2.ebuild:
-  QA: Get rid of deprecated qt?_min_version().
-
-*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,
-  -files/avahi-0.6.20-make-known-answers-not-conflict.patch,
-  -files/avahi-0.6.20-ui-sharp-gtk.patch,
-  -files/avahi-0.6.21-browse-help.patch,
-  -files/avahi-0.6.21-dbus-compat.patch,
-  -files/avahi-0.6.21-no-browse-domains-segfault.patch,
-  -files/avahi-0.6.21-no-ipv6.patch,
-  -files/avahi-0.6.21-service_name_chosen.patch, -avahi-0.6.20-r2.ebuild,
-  -avahi-0.6.21.ebuild, -avahi-0.6.22.ebuild:
-  Cleanup.
-
-  29 May 2008; Ali Polatel <hawking@gentoo.org> avahi-0.6.19-r2.ebuild,
-  avahi-0.6.20-r2.ebuild, avahi-0.6.21.ebuild, avahi-0.6.22.ebuild,
-  avahi-0.6.22-r1.ebuild:
-  python_mod_{cleanup,optimize} are ROOT aware.
-
-  13 May 2008; Raúl Porcel <armin76@gentoo.org> avahi-0.6.22-r1.ebuild:
-  alpha/ia64/sparc stable wrt #220803
-
-  11 May 2008; Markus Rothe <corsair@gentoo.org> avahi-0.6.22-r1.ebuild:
-  Stable on ppc64; bug #220803
-
-  10 May 2008; Jeroen Roovers <jer@gentoo.org> avahi-0.6.22-r1.ebuild:
-  Stable for HPPA (bug #220803).
-
-  10 May 2008; nixnut <nixnut@gentoo.org> avahi-0.6.22-r1.ebuild:
-  Stable on ppc wrt bug 220803
-
-  07 May 2008; Markus Meier <maekke@gentoo.org> avahi-0.6.22-r1.ebuild:
-  amd64/x86 stable, bug #220803
-
-  19 Apr 2008; Sven Wegener <swegener@gentoo.org> +files/autoipd-openrc.sh,
-  avahi-0.6.22-r1.ebuild:
-  Adjust dependencies for split qt-4 packages, bug #217204. Add
-  openrc-compatible autoipd.sh.
-
-  11 Apr 2008; Sven Wegener <swegener@gentoo.org> avahi-0.6.22-r1.ebuild:
-  We need dbus and gtk support for proper python support, bug #216835.
-
-  21 Feb 2008; Raúl Porcel <armin76@gentoo.org> avahi-0.6.20-r2.ebuild:
-  alpha/ia64/sparc/x86 stable
-
-*avahi-0.6.22-r1 (03 Jan 2008)
-
-  03 Jan 2008; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.22-gobject.patch, files/avahi-0.6.22-vncviewer.patch,
-  avahi-0.6.19-r2.ebuild, avahi-0.6.20-r2.ebuild, avahi-0.6.21.ebuild,
-  avahi-0.6.22.ebuild, +avahi-0.6.22-r1.ebuild:
-  Adjust gtk-sharp dependency, bug #203610. Add intltool dependency, bug
-  #203369. Add automake patch submitted to upstream, bug #202968.
-
-  01 Jan 2008; Sven Wegener <swegener@gentoo.org> avahi-0.6.19-r2.ebuild,
-  avahi-0.6.20-r2.ebuild, avahi-0.6.21.ebuild, avahi-0.6.22.ebuild:
-  Install into /$(get_libdir)/rcscripts, bug #172391.
-
-*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,
-  avahi-0.6.20-r2.ebuild, avahi-0.6.21.ebuild:
-  Add a patch to use vncviewer instead of xvncviewer.
-
-  10 Nov 2007; Sven Wegener <swegener@gentoo.org> avahi-0.6.19-r2.ebuild,
-  avahi-0.6.20-r2.ebuild, avahi-0.6.21.ebuild:
-  Update gtk+ and libglade dependencies for bug #198627.
-
-  15 Oct 2007; Markus Rothe <corsair@gentoo.org> avahi-0.6.20-r2.ebuild:
-  Stable on ppc64
-
-  25 Sep 2007; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.21-no-ipv6.patch, avahi-0.6.21.ebuild:
-  Adjust ipv6 patch for 0.6.21, bug #193646.
-
-  25 Sep 2007; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.21-no-browse-domains-segfault.patch, avahi-0.6.21.ebuild:
-  Include a patch from upstream that fixes a segfault.
-
-  09 Sep 2007; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.21-service_name_chosen.patch,
-  +files/avahi-start-after-netmount.patch, avahi-0.6.19-r2.ebuild,
-  avahi-0.6.20-r2.ebuild, avahi-0.6.21.ebuild:
-  Start avahi-daemon before netmount, bug #188719. Print a message that the
-  dbus configuration needs to be reloaded before starting avahi-daemon for the
-  first time, bug #191307.
-
-  09 Sep 2007; Sven Wegener <swegener@gentoo.org>
-  -files/avahi-0.6.16-svn-1353.patch, -files/avahi-0.6.16-svn-1361.patch,
-  -files/avahi-0.6.16-svn-1363.patch, -files/avahi-0.6.16-svn-1365.patch,
-  -files/avahi-0.6.16-svn-1366.patch, -files/avahi-0.6.16-svn-1370.patch,
-  -files/avahi-0.6.16-svn-1371.patch, -files/avahi-0.6.16-svn-1372.patch,
-  -files/avahi-0.6.16-svn-1374.patch, -avahi-0.6.16-r1.ebuild:
-  Cleanup.
-
-  20 Aug 2007; Stuart Longland <redhatter@gentoo.org> avahi-0.6.21.ebuild:
-  Tested and working on MIPS... keyworded ~mips.
-
-  18 Aug 2007; Sven Wegener <swegener@gentoo.org> -avahi-0.6.19-r1.ebuild,
-  -avahi-0.6.20-r1.ebuild:
-  Cleanup.
-
-  12 Aug 2007; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.21-browse-help.patch, avahi-0.6.21.ebuild:
-  Small patch that fixes avahi-browse --help output.
-
-*avahi-0.6.21 (12 Aug 2007)
-
-  12 Aug 2007; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.21-dbus-compat.patch, +avahi-0.6.21.ebuild:
-  Version bump.
-
-*avahi-0.6.20-r2 (08 Aug 2007)
-*avahi-0.6.19-r2 (08 Aug 2007)
-
-  08 Aug 2007; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.20-autoipd.patch, +avahi-0.6.19-r2.ebuild,
-  +avahi-0.6.20-r2.ebuild:
-  Revision bump, including a fix from upstream for autoipd.
-
-  21 Jul 2007; Sven Wegener <swegener@gentoo.org>
-  -files/avahi-0.6.18-inotify-ifdef-fix.patch, -avahi-0.6.17.ebuild,
-  -avahi-0.6.18.ebuild, -avahi-0.6.19.ebuild, -avahi-0.6.20.ebuild:
-  Cleanup.
-
-  13 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> avahi-0.6.20.ebuild,
-  avahi-0.6.20-r1.ebuild:
-  Remove ~x86-fbsd keywording as 0.6.20 release does not build for now.
-
-  12 Jul 2007; Sven Wegener <swegener@gentoo.org>
-  files/avahi-0.6.20-make-known-answers-not-conflict.patch:
-  Fix line endings, bug #185036.
-
-*avahi-0.6.20-r1 (11 Jul 2007)
-
-  11 Jul 2007; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.20-cleanup-dns-compression-table.patch,
-  +files/avahi-0.6.20-make-known-answers-not-conflict.patch,
-  +avahi-0.6.20-r1.ebuild:
-  Add two patches from upstream. Enable IPv6 in configuration, depending on
-  the ipv6 USE flag, bug #184813.
-
-  07 Jul 2007; Steve Dibb <beandog@gentoo.org> avahi-0.6.20.ebuild:
-  amd64 stable, security bug 182918
-
-  02 Jul 2007; Jeroen Roovers <jer@gentoo.org> avahi-0.6.19-r1.ebuild:
-  Stable for HPPA (bug #182918).
-
-  29 Jun 2007; Sven Wegener <swegener@gentoo.org> avahi-0.6.20.ebuild:
-  Adjust libdaemon dependency.
-
-  29 Jun 2007; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.19-ui-sharp-gtk.patch,
-  +files/avahi-0.6.20-ui-sharp-gtk.patch, avahi-0.6.19-r1.ebuild,
-  avahi-0.6.20.ebuild:
-  Add a patch to fix bug #183607.
-
-  28 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  avahi-0.6.19-r1.ebuild:
-  ppc stable, bug #182918
-
-  28 Jun 2007; Raúl Porcel <armin76@gentoo.org> avahi-0.6.19-r1.ebuild:
-  alpha/ia64/x86 stable wrt security #182918
-
-  28 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org>
-  avahi-0.6.19-r1.ebuild:
-  Stable on sparc wrt security #182918
-
-  28 Jun 2007; Markus Rothe <corsair@gentoo.org> avahi-0.6.19-r1.ebuild:
-  Stable on ppc64; bug #182918
-
-*avahi-0.6.19-r1 (23 Jun 2007)
-
-  23 Jun 2007; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.19-assert-security.patch, +avahi-0.6.19-r1.ebuild:
-  Backporting the security fix to 0.6.19 because of unresolved issues with
-  0.6.20.
-
-*avahi-0.6.20 (22 Jun 2007)
-
-  22 Jun 2007; Sven Wegener <swegener@gentoo.org> +avahi-0.6.20.ebuild:
-  Version bump, security bug #182918.
-
-  25 May 2007; Donnie Berkholz <dberkholz@gentoo.org>;
-  avahi-0.6.16-r1.ebuild, avahi-0.6.17.ebuild, avahi-0.6.18.ebuild,
-  avahi-0.6.19.ebuild:
-  Fix a silly typo in elog output: /etc/conf.net -> /etc/conf.d/net.
-
-  15 May 2007; Sven Wegener <swegener@gentoo.org> avahi-0.6.16-r1.ebuild,
-  avahi-0.6.17.ebuild, avahi-0.6.18.ebuild, avahi-0.6.19.ebuild:
-  Disable byte-compiling python modules during src_install, we will do it in
-  pkg_post* later.
-
-  10 May 2007; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.19-ui-sharp-automake.patch, avahi-0.6.19.ebuild:
-  Add patch from upstream to fix avahi-ui-sharp building, bug #177879.
-
-*avahi-0.6.19 (09 May 2007)
-
-  09 May 2007; Sven Wegener <swegener@gentoo.org> +avahi-0.6.19.ebuild:
-  Version bump.
-
-  06 May 2007; Marius Mauch <genone@gentoo.org> avahi-0.6.16-r1.ebuild,
-  avahi-0.6.17.ebuild, avahi-0.6.18.ebuild:
-  Replacing einfo with elog
-
-  28 Apr 2007; Carsten Lohrke <carlo@gentoo.org> avahi-0.6.18.ebuild:
-  Block mDNSResponder, both because of the header installed with
-  mdnsresponder-compat use flag set and sys-auth/nss-mdns.
-
-  24 Apr 2007; Sven Wegener <swegener@gentoo.org>
-  -files/0.6.15-dbus-fixes.patch, -avahi-0.6.15.ebuild:
-  Cleanup.
-
-  21 Apr 2007; Sven Wegener <swegener@gentoo.org> avahi-0.6.18.ebuild:
-  Readd ~x86-fbsd keyword.
-
-  21 Apr 2007; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.18-inotify-ifdef-fix.patch, avahi-0.6.18.ebuild:
-  Fix for systems where inotify is not available.
-
-  21 Apr 2007; Sven Wegener <swegener@gentoo.org> avahi-0.6.18.ebuild:
-  Workaround for ServiceTypeDatabase.py bug.
-
-  20 Apr 2007; Timothy Redaelli <drizzt@gentoo.org> avahi-0.6.18.ebuild:
-  net-dns/avahi-0.6.18 does not build under ~x86-fbsd (bug #175333)
-
-*avahi-0.6.18 (19 Apr 2007)
-
-  19 Apr 2007; Sven Wegener <swegener@gentoo.org> +avahi-0.6.18.ebuild:
-  Version bump.
-
-  05 Mar 2007; Sven Wegener <swegener@gentoo.org> avahi-0.6.17.ebuild:
-  Add libcap dependency for kernel_linux, should fix bug #168910.
-
-*avahi-0.6.17 (04 Feb 2007)
-
-  04 Feb 2007; Sven Wegener <swegener@gentoo.org> +avahi-0.6.17.ebuild:
-  Version bump.
-
-  29 Jan 2007; Sven Wegener <swegener@gentoo.org> avahi-0.6.16-r1.ebuild:
-  Drop useless autoconf dependency.
-
-  15 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> avahi-0.6.16-r1.ebuild:
-  Stable on Alpha, bug 159306.
-
-  15 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org>
-  avahi-0.6.16-r1.ebuild:
-  Stable on sparc wrt security #159306
-
-  15 Jan 2007; Luis Medinas <metalgod@gentoo.org> avahi-0.6.16-r1.ebuild:
-  Stable on amd64. Security bug #159306.
-
-  14 Jan 2007; Andrej Kacian <ticho@gentoo.org> avahi-0.6.16-r1.ebuild:
-  Stable on x86, security bug #159306.
-
-  13 Jan 2007; Markus Rothe <corsair@gentoo.org> avahi-0.6.16-r1.ebuild:
-  Stable on ppc64; bug #159306
-
-  13 Jan 2007; Jeroen Roovers <jer@gentoo.org> avahi-0.6.16-r1.ebuild:
-  Stable for HPPA (bug #159306).
-
-*avahi-0.6.16-r1 (07 Jan 2007)
-
-  07 Jan 2007; Sven Wegener <swegener@gentoo.org>
-  +files/avahi-0.6.16-svn-1353.patch, +files/avahi-0.6.16-svn-1361.patch,
-  +files/avahi-0.6.16-svn-1363.patch, +files/avahi-0.6.16-svn-1365.patch,
-  +files/avahi-0.6.16-svn-1366.patch, +files/avahi-0.6.16-svn-1370.patch,
-  +files/avahi-0.6.16-svn-1371.patch, +files/avahi-0.6.16-svn-1372.patch,
-  +files/avahi-0.6.16-svn-1374.patch, -avahi-0.6.16.ebuild,
-  +avahi-0.6.16-r1.ebuild:
-  Revision bump, pull in a couple of fixes until 0.6.17 is released.
-
-*avahi-0.6.16 (29 Dec 2006)
-
-  29 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  +avahi-0.6.16.ebuild:
-  Version bump for security bug #159306, marked ppc stable
-
-  15 Nov 2006; Sven Wegener <swegener@gentoo.org>
-  -files/0.6.13-svn-fixes.patch, -avahi-0.6.10.ebuild, -avahi-0.6.11.ebuild,
-  -avahi-0.6.12.ebuild, -avahi-0.6.13.ebuild, -avahi-0.6.14.ebuild:
-  Cleanup.
-
-  15 Nov 2006; Markus Rothe <corsair@gentoo.org> avahi-0.6.15.ebuild:
-  Stable on ppc64; bug #154322
-
-  14 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> avahi-0.6.15.ebuild:
-  Stable on Alpha, bug 154322.
-
-  13 Nov 2006; René Nussbaumer <killerfox@gentoo.org> avahi-0.6.15.ebuild:
-  Stable on hppa. See bug #154322.
-
-  11 Nov 2006; Sven Wegener <swegener@gentoo.org>
-  +files/0.6.15-dbus-fixes.patch, avahi-0.6.15.ebuild:
-  Pull in a patch from upstream, to fix two dbus problems.
-
-  10 Nov 2006; Daniel Gryniewicz <dang@gentoo.org> avahi-0.6.15.ebuild:
-  Marked stable on amd64
-
-  10 Nov 2006; Christian Faulhammer <opfer@gentoo.org> avahi-0.6.15.ebuild:
-  stable x86, security bug #154322
-
-  09 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org> avahi-0.6.15.ebuild:
-  Stable on sparc wrt security #154322
-
-  09 Nov 2006; Tobias Scherbaum <dertobi123@gentoo.org> avahi-0.6.15.ebuild:
-  ppc stable, bug #154322
-
-*avahi-0.6.15 (09 Nov 2006)
-
-  09 Nov 2006; Sven Wegener <swegener@gentoo.org> +avahi-0.6.15.ebuild:
-  Version bump.
-
-  03 Nov 2006; Sven Wegener <swegener@gentoo.org> avahi-0.6.10.ebuild,
-  avahi-0.6.11.ebuild, avahi-0.6.12.ebuild, avahi-0.6.13.ebuild,
-  avahi-0.6.14.ebuild:
-  Only run python_mod_* when USE="python" is active, bug #153885 by Chris
-  Slycord.
-
-  03 Nov 2006; Sven Wegener <swegener@gentoo.org> files/autoipd.sh,
-  avahi-0.6.14.ebuild:
-  Drop the functions dependency.
-
-  01 Nov 2006; Doug Goldstein <cardoe@gentoo.org> avahi-0.6.14.ebuild:
-  Fixing dbus depends
-
-  25 Oct 2006; Joshua Jackson <tsunam@gentoo.org> avahi-0.6.12.ebuild:
-  Stable x86; bug #150540
-
-  23 Oct 2006; Sven Wegener <swegener@gentoo.org> avahi-0.6.10.ebuild,
-  avahi-0.6.11.ebuild, avahi-0.6.12.ebuild, avahi-0.6.13.ebuild,
-  avahi-0.6.14.ebuild:
-  Add missing pkconfig dep, bug #152535.
-
-  22 Oct 2006; Markus Rothe <corsair@gentoo.org> avahi-0.6.12.ebuild:
-  Stable on ppc64; bug #150540
-
-  21 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> avahi-0.6.12.ebuild:
-  ppc stable
-
-  20 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> avahi-0.6.12.ebuild:
-  Stable on sparc wrt #150540
-
-  15 Oct 2006; Sven Wegener <swegener@gentoo.org> files/autoipd.sh:
-  Touchup the net script.
-
-  24 Sep 2006; Sven Wegener <swegener@gentoo.org> avahi-0.6.11.ebuild,
-  avahi-0.6.12.ebuild, avahi-0.6.13.ebuild, avahi-0.6.14.ebuild:
-  Fix the qt4 dependency, thanks to Guillaume Infantes in bug #148520.
-
-  21 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> avahi-0.6.14.ebuild:
-  Add ~x86-fbsd keyword.
-
-*avahi-0.6.14 (20 Sep 2006)
-
-  20 Sep 2006; Sven Wegener <swegener@gentoo.org> +files/autoipd.sh,
-  +avahi-0.6.14.ebuild:
-  Version bump.
-
-  20 Sep 2006; Sven Wegener <swegener@gentoo.org> avahi-0.6.11.ebuild,
-  avahi-0.6.12.ebuild, avahi-0.6.13.ebuild:
-  Depend on proper qt with PKG_CONFIG_PATH support.
-
-  19 Sep 2006; Aron Griffis <agriffis@gentoo.org> avahi-0.6.12.ebuild:
-  Mark 0.6.12 stable on ia64
-
-  18 Sep 2006; Sven Wegener <swegener@gentoo.org> avahi-0.6.11.ebuild,
-  avahi-0.6.12.ebuild, avahi-0.6.13.ebuild:
-  Remove the PKG_CONFIG_PATH workaround.
-
-  12 Sep 2006; Sven Wegener <swegener@gentoo.org>
-  files/0.6.13-svn-fixes.patch:
-  Fix line endings.
-
-*avahi-0.6.13 (10 Sep 2006)
-
-  10 Sep 2006; Sven Wegener <swegener@gentoo.org>
-  +files/0.6.13-svn-fixes.patch, +avahi-0.6.13.ebuild:
-  Version bump.
-
-  19 Aug 2006; Bryan Østergaard <kloeri@gentoo.org> avahi-0.6.12.ebuild:
-  Add ~ia64 keyword.
-
-*avahi-0.6.12 (27 Jul 2006)
-
-  27 Jul 2006; Sven Wegener <swegener@gentoo.org> +avahi-0.6.12.ebuild:
-  Version bump.
-
-  16 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> avahi-0.6.10.ebuild:
-  hppa stable, bug #139612
-
-  14 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> avahi-0.6.10.ebuild:
-  ppc stable, bug #139612
-
-*avahi-0.6.11 (09 Jul 2006)
-
-  09 Jul 2006; Sven Wegener <swegener@gentoo.org> +avahi-0.6.11.ebuild:
-  Version bump. Add support for the qt4 USE flag and tweak configure logic.
-
-  30 Jun 2006; Thomas Cort <tcort@gentoo.org> avahi-0.6.10.ebuild:
-  Stable on alpha.
-
-  28 Jun 2006; Luis Medinas <metalgod@gentoo.org> avahi-0.6.10.ebuild:
-  Stable on amd64. See bug #124293.
-
-  24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> avahi-0.6.10.ebuild:
-  USE flag qt->qt3/qt4 change
-
-  10 Jun 2006; Sven Wegener <swegener@gentoo.org> avahi-0.6.10.ebuild:
-  Unset DISPLAY for bug #123318.
-
-  26 May 2006; Markus Rothe <corsair@gentoo.org> avahi-0.6.10.ebuild:
-  Stable on ppc64
-
-  23 May 2006; Sven Wegener <swegener@gentoo.org> -avahi-0.6.9.ebuild:
-  Cleanup.
-
-  17 May 2006; Joshua Jackson <tsunam@gentoo.org> avahi-0.6.10.ebuild:
-  Stable on x86 for security bug #133513
-
-  16 May 2006; Gustavo Zacarias <gustavoz@gentoo.org> avahi-0.6.10.ebuild:
-  Stable on sparc wrt security #133513
-
-  14 May 2006; Sven Wegener <swegener@gentoo.org> avahi-0.6.9.ebuild,
-  avahi-0.6.10.ebuild:
-  Enable the compat support without requiring the dbus USE flag.
-
-  12 May 2006; Tobias Scherbaum <dertobi123@gentoo.org> avahi-0.6.10.ebuild:
-  Added ~hppa, bug #131737
-
-*avahi-0.6.10 (06 May 2006)
-
-  06 May 2006; Sven Wegener <swegener@gentoo.org> +avahi-0.6.10.ebuild:
-  Version bump.
-
-  04 May 2006; Mark Loeser <halcy0n@gentoo.org> avahi-0.6.9.ebuild:
-  Stable on x86; bug #121558
-
-  01 May 2006; Markus Rothe <corsair@gentoo.org> avahi-0.6.9.ebuild:
-  Added ~ppc64
-
-  18 Apr 2006; Sven Wegener <swegener@gentoo.org> avahi-0.6.9.ebuild:
-  Tweak the configure logic.
-
-  12 Apr 2006; Thomas Cort <tcort@gentoo.org> avahi-0.6.9.ebuild:
-  Added ~alpha keyword.
-
-  11 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> avahi-0.6.9.ebuild:
-  Stable on sparc
-
-  11 Apr 2006; Sven Wegener <swegener@gentoo.org>
-  -files/avahi-0.6.3-mono-docs.patch,
-  -files/0.6.1-need-dbus-initscript.patch, -avahi-0.6.4.ebuild,
-  -avahi-0.6.8.ebuild, avahi-0.6.9.ebuild:
-  Made the glib dependency unconditional.
-
-*avahi-0.6.9 (02 Mar 2006)
-
-  02 Mar 2006; Sven Wegener <swegener@gentoo.org> +avahi-0.6.9.ebuild:
-  Version bump.
-
-*avahi-0.6.8 (27 Feb 2006)
-
-  27 Feb 2006; Sven Wegener <swegener@gentoo.org> -avahi-0.5.2-r1.ebuild,
-  -avahi-0.6.7.ebuild, +avahi-0.6.8.ebuild:
-  Version bump.
-
-*avahi-0.6.7 (19 Feb 2006)
-
-  19 Feb 2006; Sven Wegener <swegener@gentoo.org> +avahi-0.6.7.ebuild:
-  Version bump.
-
-*avahi-0.6.4 (18 Jan 2006)
-
-  18 Jan 2006; Doug Goldstein <cardoe@gentoo.org> -avahi-0.6.3.ebuild,
-  +avahi-0.6.4.ebuild:
-  Rev bump. Includes Mono Posix fix.
-
-  18 Jan 2006; Doug Goldstein <cardoe@gentoo.org>
-  +files/avahi-0.6.3-mono-docs.patch, avahi-0.6.3.ebuild:
-  Added patch to make mono docs compile.
-
-*avahi-0.6.3 (11 Jan 2006)
-
-  11 Jan 2006; Sven Wegener <swegener@gentoo.org> -avahi-0.6.2.ebuild,
-  +avahi-0.6.3.ebuild:
-  Version bump, bug #118593.
-
-  06 Jan 2006; Sven Wegener <swegener@gentoo.org>
-  -files/0.6.1-dbus-0.60-support.patch, -avahi-0.6.1.ebuild,
-  -avahi-0.6.1-r1.ebuild, avahi-0.6.2.ebuild:
-  Remove fixes that have been included by upstream. Move from -* to ~arch.
-
-*avahi-0.6.2 (06 Jan 2006)
-
-  06 Jan 2006; Mike Frysinger <vapier@gentoo.org> +avahi-0.6.2.ebuild:
-  Version bump.
-
-  06 Jan 2006; Mike Frysinger <vapier@gentoo.org>
-  +files/avahi-0.6.1-no-ipv6.patch, avahi-0.6.1-r1.ebuild:
-  Fix building on uClibc systems with USE=-ipv6.
-
-*avahi-0.6.1-r1 (01 Jan 2006)
-
-  01 Jan 2006; Sven Wegener <swegener@gentoo.org>
-  +files/0.6.1-need-dbus-initscript.patch,
-  +files/0.6.1-dbus-0.60-support.patch, +avahi-0.6.1-r1.ebuild:
-  Revision bump to pull in some changes from Gentopia. The init script needs
-  dbus, if we've compiled avahi with dbus support. This is a work-a-round,
-  a clean solution will be available in upstream's sources.
-
-  04 Dec 2005; Sven Wegener <swegener@gentoo.org> avahi-0.6.1.ebuild:
-  Add support for the gdbm USE flag.
-
-  29 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> avahi-0.6.1.ebuild:
-  Keyworded ~sparc wrt #113875
-
-*avahi-0.6.1 (25 Nov 2005)
-
-  25 Nov 2005; Sven Wegener <swegener@gentoo.org> +avahi-0.6.1.ebuild:
-  Version bump, bug #113110.
-
-  21 Nov 2005; Sven Wegener <swegener@gentoo.org> avahi-0.5.2-r1.ebuild:
-  Parallel build problems, bug #113092.
-
-  14 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> avahi-0.5.2-r1.ebuild:
-  Added to ~ppc. See bug #111461.
-
-  07 Nov 2005; Sven Wegener <swegener@gentoo.org> avahi-0.5.2.ebuild,
-  avahi-0.5.2-r1.ebuild:
-  Make the pygtk support dependant on the gtk USE flag in addition to the
-  python USE flag.
-
-*avahi-0.5.2-r1 (04 Nov 2005)
-
-  04 Nov 2005; Sven Wegener <swegener@gentoo.org> +avahi-0.5.2-r1.ebuild:
-  Revision bump for testing the mono docs stuff.
-
-  04 Nov 2005; Sven Wegener <swegener@gentoo.org> avahi-0.5.2.ebuild:
-  Add built_with_use test for bug #111413.
-
-*avahi-0.5.2 (03 Oct 2005)
-
-  03 Oct 2005; Sven Wegener <swegener@gentoo.org> -avahi-0.5.1.ebuild,
-  +avahi-0.5.2.ebuild:
-  Another bugfix release.
-
-*avahi-0.5.1 (30 Sep 2005)
-
-  30 Sep 2005; Sven Wegener <swegener@gentoo.org> -avahi-0.5.ebuild,
-  +avahi-0.5.1.ebuild:
-  Version bump, bugfix release.
-
-  25 Sep 2005; Sven Wegener <swegener@gentoo.org> -avahi-0.4.ebuild:
-  Removed old ebuild.
-
-  20 Sep 2005; Sven Wegener <swegener@gentoo.org> avahi-0.5.ebuild:
-  Updated mono dependency, bug #106640. Thanks to Frederick Martin.
-
-*avahi-0.5 (14 Sep 2005)
-
-  14 Sep 2005; Sven Wegener <swegener@gentoo.org> +avahi-0.5.ebuild:
-  Version bump.
-
-*avahi-0.4 (08 Sep 2005)
-
-  08 Sep 2005; Sven Wegener <swegener@gentoo.org> -files/0.2-anydbm.patch,
-  -avahi-0.2.ebuild, -avahi-0.3.ebuild, +avahi-0.4.ebuild:
-  Version bump.
-
-*avahi-0.3 (03 Sep 2005)
-
-  03 Sep 2005; Sven Wegener <swegener@gentoo.org> +avahi-0.3.ebuild:
-  Version bump.
-
-  30 Aug 2005; <dang@gentoo.org> avahi-0.2.ebuild:
-  Marked ~amd64
-
-  29 Aug 2005; Sven Wegener <swegener@gentoo.org> +files/0.2-anydbm.patch,
-  avahi-0.2.ebuild:
-  Only enable python support, if we also want dbus support, bug #104081. Use
-  anydbm instead of dbm for creating service-types.db.
-
-*avahi-0.2 (28 Aug 2005)
-
-  28 Aug 2005; Sven Wegener <swegener@gentoo.org> -files/avahi-daemon.initd,
-  -files/avahi-dnsconfd.initd, -avahi-0.1.ebuild, +avahi-0.2.ebuild:
-  Version bump.
-
-  23 Aug 2005; Sven Wegener <swegener@gentoo.org> -files/avahi.initd,
-  +files/avahi-daemon.initd, avahi-0.1.ebuild:
-  Renamed the avahi-daemon initscript to match the name used by upstream and
-  other distributions.
-
-*avahi-0.1 (22 Aug 2005)
-
-  22 Aug 2005; Sven Wegener <swegener@gentoo.org> +files/avahi.initd,
-  +files/avahi-dnsconfd.initd, +metadata.xml, +avahi-0.1.ebuild:
-  Initial commit, ebuild written by me.
-
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 0594e9f76..0c2165dc3 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,21 +1,10 @@
-AUX autoipd-openrc.sh 690 RMD160 d229d9909b40d7620798471ad99ff7392656eed1 SHA1 f3bf533d7267477b4d23446c98e3b1b15dafc569 SHA256 dd440a708fdaa286662b23e477ccb9544fbbff4dd1d2fb401d2fd9dd801000f4
+AUX autoipd-openrc.sh 700 RMD160 00e259967279dc52ee99476dfb4d6c9672b77ee3 SHA1 1d9858b99f23688f6a0f4a6726400bbbe41df976 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
-AUX avahi-0.6.1-no-ipv6.patch 362 RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d1 SHA1 97126f8035616821e9dc937c9b741316e7222fe2 SHA256 e00bd75a9770acf68c0f92cb8594b62acb0d60577e7dbeb1b7680e250b4d39b4
-AUX avahi-0.6.19-assert-security.patch 794 RMD160 7c9218345b9ce84291b679748ccd24ed9cc1c81d SHA1 9a3d9a8a726cecb45b07cd4411b4521acc1b7fd8 SHA256 b52d7ffda641a58f446112fb6413cdfee670e666c943751389dc6ef2b3b3c4e4
-AUX avahi-0.6.19-ui-sharp-automake.patch 654 RMD160 a55092fc273e7d01a92609219a3ba30dcd2770e9 SHA1 9c0a7a1fc7691181d73375e4380d0aa19830ca72 SHA256 4c1ef7b47639072151af0d745eedd34a6396ad2cb904ad4ad4f4cde482457b92
-AUX avahi-0.6.19-ui-sharp-gtk.patch 427 RMD160 967c446b0204baa4ddf5a0568164352caa90cfaa SHA1 6261c6ed45f5a5651ed5464c60777f21e4a482de SHA256 ae4ae6a21ebfcf39f3f1f9bf67cc5f47881d4e28cfb6f488517819806909ee9c
-AUX avahi-0.6.20-autoipd.patch 584 RMD160 5117179edd7af3237edad97c5c141b271470f58a SHA1 aa15b45e31cf97721d597fc030d56f66365d2f88 SHA256 7a8fa3ce860730d5a63641fe4e7e9f85d0fc45b7d4a0aa4d84a2b58e2c4112cd
-AUX avahi-0.6.22-gobject.patch 1113 RMD160 d4551aecefa470a6fe1f0998cc382192942ef647 SHA1 7e005c7d773aece3171f24061769c02b55693c35 SHA256 440df6f17e9e619622a326547313a9cb9df696ef1cfa0339385a225b69c8001a
-AUX avahi-0.6.22-vncviewer.patch 462 RMD160 a79540e16aecb781f0701ceb57db456f33296666 SHA1 de77191d8f2fe499be77c9f54adaefeea9919fc3 SHA256 daf1eaf78883b07669536b46b081c0b66f5a4a375a833a071ab91b6e12656da5
 AUX avahi-0.6.24-CVE-2009-0758.patch 953 RMD160 7c1a2a2082c61d6feb05d985068122133b434b02 SHA1 429347d8b9f9022c5316ce1e5163a68fa7393b4f SHA256 e8a93a705ec07ca6a4c4c7634a97b9b2c5ee0712c9e80767c6bf7e3f4a5d6853
 AUX avahi-0.6.24-cmsg_space.patch 449 RMD160 9593ee893daf908e35f36a7396ae5d52a7618022 SHA1 49fd79c1d0e0302747e84bdf611cfb0bf310b4c3 SHA256 f3b6bf6f522aea93627df8afda317782ed760493ffad9108697b50a310bc92d7
 AUX avahi-0.6.24-libintl.patch 542 RMD160 918aa11cdbce6f38d9a9446c798db2bc43a957b5 SHA1 c9f8ef5d0047b591e6e88153731ae380d64a2431 SHA256 fb8e37d6071a990184a7ad3c20a7709554103fb2c4f02450c338b9fbcf358215
-AUX avahi-start-after-netmount.patch 998 RMD160 865a837ad85f6569405ab8d69bd08aebafbb9342 SHA1 a5b084504f70ceaf99bcfd75ddad846bda294166 SHA256 03ec271640c86405297cdd2292bcb3745fac517ed050e777a3dfc4188f06b5fb
-AUX avahi-vncviewer.patch 474 RMD160 ca19092b5a410cefb67480f0de7f4baf8ceff1fc SHA1 1838114e7c0ed4ff15c4adaf791fb6cbfab1bb48 SHA256 3175b1febd682681a38536e1a8f65891b8d8467495b73ce40c4dcac0b2003d3b
 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 5528 RMD160 52fee6b26d464252f900b73ece70bad2dadac60f SHA1 a657aa0f2777439a1a8593f586c1f122f4afe10b SHA256 fae2509505ea156b3d54142df2b03f4c2f1e066c5f799fe7ae16158cc00e4f20
-EBUILD avahi-0.6.24.ebuild 5212 RMD160 d8766a0f544124141064326ba5521c3377f695d0 SHA1 784c6e11f252474503864407c82708e45aa1f9a2 SHA256 38eae549b92661ffe5d1c81702afc773c66574d08d49c3dcdb89aed162e2cd57
 EBUILD avahi-0.6.25.ebuild 5516 RMD160 eb443d1f6ed1d7fd5caed24eadeca77713d9e5aa SHA1 a000bc421f363b7e92a4148fd9841eb1dd3bf0ba SHA256 cb1093197451f8e385f39dc7e43e3bed71a2c3271da4ba6ff79d31ea18041b41
-MISC ChangeLog 24018 RMD160 bd7b705d94876246df3d3f47053bc079c203ff24 SHA1 e47fdbaa2193bb4ede5a12cfe2d2924102d5e324 SHA256 45f96a96f161c68cb1d75d68ca82a2ff7254c9200986ba745586ca0bfeddf284
 MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa
diff --git a/net-dns/avahi/avahi-0.6.24.ebuild b/net-dns/avahi/avahi-0.6.24.ebuild
deleted file mode 100644
index 159896053..000000000
--- a/net-dns/avahi/avahi-0.6.24.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 2000-2009 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.ebuild,v 1.8 2009/03/05 21:13:27 swegener Exp $
-
-EAPI="2"
-
-inherit eutils mono python multilib multilib-native
-
-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[lib32?]
-	dev-libs/expat[lib32?]
-	>=dev-libs/glib-2[lib32?]
-	gdbm? ( sys-libs/gdbm[lib32?] )
-	qt3? ( x11-libs/qt:3[lib32?] )
-	qt4? (
-		|| (
-			x11-libs/qt-core:4[lib32?]
-			x11-libs/qt:4[lib32?]
-		)
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.4.0[lib32?]
-		>=gnome-base/libglade-2.4.0[lib32?]
-	)
-	dbus? (
-		>=sys-apps/dbus-0.30[lib32?]
-		python? (
-			|| (
-				dev-python/dbus-python
-				(
-					<sys-apps/dbus-0.90[lib32?]
-					>=sys-apps/dbus-0.30[lib32?]
-				)
-			)
-		)
-	)
-	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[lib32?] )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9.0
-	doc? (
-		app-doc/doxygen
-		mono? ( >=virtual/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
-}
-
-multilib-native_src_configure_internal() {
-	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"
-}
-
-multilib-native_src_compile_internal() {
-	emake || die "emake failed"
-
-	use doc && emake avahi.devhelp
-}
-
-multilib-native_src_install_internal() {
-	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
-}
diff --git a/net-dns/avahi/files/autoipd-openrc.sh b/net-dns/avahi/files/autoipd-openrc.sh
index 839c6909f..dec3aa052 100644
--- a/net-dns/avahi/files/autoipd-openrc.sh
+++ b/net-dns/avahi/files/autoipd-openrc.sh
@@ -24,7 +24,7 @@ autoipd_start() {
 }
 
 autoipd_stop() {
-	avahi-autoipd --check --syslog "${IFACE}" || return 0
+	/usr/sbin/avahi-autoipd --check --syslog "${IFACE}" || return 0
 
 	ebegin "Stopping avahi-autoipd"
 	/usr/sbin/avahi-autoipd --kill --syslog "${IFACE}"
diff --git a/net-dns/avahi/files/avahi-0.6.1-no-ipv6.patch b/net-dns/avahi/files/avahi-0.6.1-no-ipv6.patch
deleted file mode 100644
index 85d782076..000000000
--- a/net-dns/avahi/files/avahi-0.6.1-no-ipv6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-uClibc systems dont define IPV6_V6ONLY when USE=-ipv6
-
---- avahi-core/socket.c
-+++ avahi-core/socket.c
-@@ -360,6 +360,7 @@
- }
- 
- int avahi_open_socket_ipv6(int no_reuse) {
-+#ifdef IPV6_V6ONLY
-     struct sockaddr_in6 sa, local;
-     int fd = -1, yes, r;
-     int ttl;
-@@ -425,6 +426,7 @@
- fail:
-     if (fd >= 0)
-         close(fd);
-+#endif
- 
-     return -1;
- }
diff --git a/net-dns/avahi/files/avahi-0.6.19-assert-security.patch b/net-dns/avahi/files/avahi-0.6.19-assert-security.patch
deleted file mode 100644
index 596245ecb..000000000
--- a/net-dns/avahi/files/avahi-0.6.19-assert-security.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: trunk/avahi-daemon/dbus-util.c
-===================================================================
---- trunk/avahi-daemon/dbus-util.c (revision 1357)
-+++ trunk/avahi-daemon/dbus-util.c (revision 1482)
-@@ -345,4 +345,7 @@
-         n = 0;
-         dbus_message_iter_get_fixed_array(&sub2, &k, &n);
-+
-+        if (!k)
-+            k = (const uint8_t*) "";
-             
-         strlst = avahi_string_list_add_arbitrary(strlst, k, n);
-Index: trunk/avahi-common/strlst.c
-===================================================================
---- trunk/avahi-common/strlst.c (revision 1050)
-+++ trunk/avahi-common/strlst.c (revision 1482)
-@@ -52,5 +52,5 @@
-     AvahiStringList *n;
- 
--    assert(text);
-+    assert(size == 0 || text);
- 
-     if (!(n = avahi_string_list_add_anonymous(l, size)))
diff --git a/net-dns/avahi/files/avahi-0.6.19-ui-sharp-automake.patch b/net-dns/avahi/files/avahi-0.6.19-ui-sharp-automake.patch
deleted file mode 100644
index a99cc2ed2..000000000
--- a/net-dns/avahi/files/avahi-0.6.19-ui-sharp-automake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: trunk/avahi-ui-sharp/Makefile.am
-===================================================================
---- trunk/avahi-ui-sharp/Makefile.am	(revision 1478)
-+++ trunk/avahi-ui-sharp/Makefile.am	(revision 1480)
-@@ -39,8 +39,8 @@
- $(ASSEMBLY).config: $(ASSEMBLY).config.in
- 	$(srcdir)/gencfg.sh $(top_builddir)/avahi-common/libavahi-common.la < $< > $@
- 
--zssh.exe: $(srcdir)/zssh.cs
--	mcs -out:$@ $^ -r:./avahi-ui-sharp.dll -pkg:gtk-sharp-2.0 -r:Mono.Posix
-+zssh.exe: $(srcdir)/zssh.cs $(ASSEMBLY)
-+	mcs -out:$@ $(srcdir)/zssh.cs -r:./avahi-ui-sharp.dll -r:../avahi-sharp/avahi-sharp.dll -pkg:gtk-sharp-2.0 -r:Mono.Posix
- 
- if HAVE_MONO
- if HAVE_DBUS
diff --git a/net-dns/avahi/files/avahi-0.6.19-ui-sharp-gtk.patch b/net-dns/avahi/files/avahi-0.6.19-ui-sharp-gtk.patch
deleted file mode 100644
index 8f3d261e6..000000000
--- a/net-dns/avahi/files/avahi-0.6.19-ui-sharp-gtk.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur avahi-0.6.19.orig/avahi-ui-sharp/Makefile.am avahi-0.6.19/avahi-ui-sharp/Makefile.am
---- avahi-0.6.19.orig/avahi-ui-sharp/Makefile.am	2007-06-29 17:46:50.068591000 +0000
-+++ avahi-0.6.19/avahi-ui-sharp/Makefile.am	2007-06-29 17:48:32.023145178 +0000
-@@ -44,6 +44,7 @@
- 
- if HAVE_MONO
- if HAVE_DBUS
-+if HAVE_GTK
- all: $(ASSEMBLY) $(ASSEMBLY).config zssh.exe
- 
- if HAVE_MONODOC
-@@ -68,3 +69,4 @@
- 
- endif
- endif
-+endif
diff --git a/net-dns/avahi/files/avahi-0.6.20-autoipd.patch b/net-dns/avahi/files/avahi-0.6.20-autoipd.patch
deleted file mode 100644
index 9e5175752..000000000
--- a/net-dns/avahi/files/avahi-0.6.20-autoipd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/avahi-autoipd/main.c
-===================================================================
---- trunk/avahi-autoipd/main.c	(revision 1502)
-+++ trunk/avahi-autoipd/main.c	(revision 1503)
-@@ -510,7 +510,7 @@
-     sa.sll_halen = ETHER_ADDRLEN;
-     memset(sa.sll_addr, 0xFF, ETHER_ADDRLEN);
- 
--    if (sendto(fd, packet, packet_len, 0, (struct sockaddr*) &sa, sizeof(sa)) < 0) {
-+    if (sendto(fd, packet->ether_payload, packet_len, 0, (struct sockaddr*) &sa, sizeof(sa)) < 0) {
-         daemon_log(LOG_ERR, "sendto() failed: %s", strerror(errno));
-         return -1;
-     }
diff --git a/net-dns/avahi/files/avahi-0.6.22-gobject.patch b/net-dns/avahi/files/avahi-0.6.22-gobject.patch
deleted file mode 100644
index 2546ee1c7..000000000
--- a/net-dns/avahi/files/avahi-0.6.22-gobject.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-build avahi-gobject only when avahi-client is also built
-
-(modified to only patch the makefiles)
-
-Index: trunk/avahi-gobject/Makefile.am
-===================================================================
---- trunk/avahi-gobject/Makefile.am	(revision 1669)
-+++ trunk/avahi-gobject/Makefile.am	(revision 1670)
-@@ -23,6 +23,7 @@
- AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
- 
- if HAVE_GOBJECT
-+if HAVE_DBUS
- 
- avahigobjectincludedir=$(includedir)/avahi-gobject
- 
-@@ -109,6 +110,7 @@
- 	$< > $@
- 
- endif
-+endif
- 
- indent:
- 	indent -brf -nbbo -nbc -ip0 -cs -nbfde -npsl -br -brs -bap -i4 -bs -cdw -ce -npcs -hnl -cli4 -nut -ci8 ga-*.[ch]
-Index: trunk/Makefile.am
-===================================================================
---- trunk/Makefile.am	(revision 1669)
-+++ trunk/Makefile.am	(revision 1670)
-@@ -112,6 +112,7 @@
- 	$(srcdir)/avahi-glib/glib-malloc.h
- 
- if HAVE_GOBJECT
-+if HAVE_DBUS
- DX_INPUT += \
- 	$(srcdir)/avahi-gobject/ga-client.h \
- 	$(srcdir)/avahi-gobject/ga-entry-group.h \
-@@ -122,6 +123,7 @@
- 	$(srcdir)/avahi-gobject/ga-service-resolver.h
- endif
- endif
-+endif
- 
- if HAVE_DBUS
- DX_INPUT += \
diff --git a/net-dns/avahi/files/avahi-0.6.22-vncviewer.patch b/net-dns/avahi/files/avahi-0.6.22-vncviewer.patch
deleted file mode 100644
index 3a47e79ff..000000000
--- a/net-dns/avahi/files/avahi-0.6.22-vncviewer.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-xvncviewer is an alternative on debian.
-vncviewer is what the vnc distribution and we use.
-
---- avahi-0.6.22/avahi-ui/bssh.c
-+++ avahi-0.6.22/avahi-ui/bssh.c
-@@ -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/avahi-start-after-netmount.patch b/net-dns/avahi/files/avahi-start-after-netmount.patch
deleted file mode 100644
index 74de8e647..000000000
--- a/net-dns/avahi/files/avahi-start-after-netmount.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: trunk/initscript/gentoo/avahi-dnsconfd.in
-===================================================================
---- trunk/initscript/gentoo/avahi-dnsconfd.in	(revision 1538)
-+++ trunk/initscript/gentoo/avahi-dnsconfd.in	(working copy)
-@@ -3,7 +3,7 @@
- # Copyright 1999-2005 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- 
--opts="${opts} reload"
-+opts="reload"
- 
- depend() {
- 	need avahi-daemon
-Index: trunk/initscript/gentoo/avahi-daemon.in
-===================================================================
---- trunk/initscript/gentoo/avahi-daemon.in	(revision 1538)
-+++ trunk/initscript/gentoo/avahi-daemon.in	(working copy)
-@@ -1,11 +1,12 @@
- #!/sbin/runscript
- # $Id: avahi-start-after-netmount.patch,v 1.1 2007/09/09 20:37:33 swegener Exp $
- # Copyright 1999-2005 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- 
--opts="${opts} reload"
-+opts="reload"
- 
- depend() {
-+	before netmount
- 	use net
- 	need dbus
- }
diff --git a/net-dns/avahi/files/avahi-vncviewer.patch b/net-dns/avahi/files/avahi-vncviewer.patch
deleted file mode 100644
index cad6eb210..000000000
--- a/net-dns/avahi/files/avahi-vncviewer.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-xvncviewer is an alternative on debian.
-vncviewer is what the vnc distribution and we use.
-
---- avahi/avahi-ui/bssh.c
-+++ avahi/avahi-ui/bssh.c
-@@ -76,8 +76,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];