[gentoo-commits] dev/blueness:master commit in: net-dns/avahi/, net-dns/avahi/files/

[Anthony G. Basile]

commit:     08acdbe4d8d77c92045e87a56c499866440305ba
Author:     layman <layman <AT> localhost>
AuthorDate: Tue May 28 21:41:04 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue May 28 21:41:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=08acdbe4

net-dns/avahi: fixes moved to the tree in avahi-0.6.31-r2

Package-Manager: portage-2.1.11.62

---
 net-dns/avahi/ChangeLog                            | 994 ---------------------
 net-dns/avahi/Manifest                             |  11 -
 net-dns/avahi/avahi-0.6.31-r99.ebuild              | 206 -----
 net-dns/avahi/files/autoipd-openrc.sh              |  32 -
 net-dns/avahi/files/autoipd.sh                     |  52 --
 .../files/avahi-0.6.30-optional-gtk-utils.patch    |  83 --
 ...ahi-0.6.31-disable-install-avahi-discover.patch |  31 -
 .../avahi-0.6.31-host-name-from-machine-id.patch   |  85 --
 .../files/avahi-0.6.31-install-exec-hook.patch     |  11 -
 ...ahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch |  22 -
 net-dns/avahi/metadata.xml                         |  23 -
 11 files changed, 1550 deletions(-)

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
deleted file mode 100644
index 634acc0..0000000
--- a/net-dns/avahi/ChangeLog
+++ /dev/null
@@ -1,994 +0,0 @@
-# ChangeLog for net-dns/avahi
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.240 2013/04/20 15:11:33 blueness Exp $
-
-*avahi-0.6.31-r1 (20 Apr 2013)
-
-  20 Apr 2013; Anthony G. Basile <blueness@g.o> +avahi-0.6.31-r1.ebuild,
-  +files/avahi-0.6.31-host-name-from-machine-id.patch:
-  Add option host-name-from-machine-id, bug #466134
-
-  03 Mar 2013; Davide Pesavento <pesa@g.o> avahi-0.6.30-r1.ebuild,
-  avahi-0.6.30-r3.ebuild, avahi-0.6.31.ebuild:
-  Move Qt dependencies to the new category. Using --force because of bad
-  dependency on gtk+:3 for s390 profiles.
-
-  02 Feb 2013; Anthony G. Basile <blueness@g.o> avahi-0.6.31.ebuild:
-  Add systemd support, bug #366173
-
-  26 Nov 2012; Anthony G. Basile <blueness@g.o> metadata.xml:
-  Added myself as maintainer
-
-  25 Nov 2012; Sven Wegener <swegener@g.o> metadata.xml:
-  Move to maintainer-needed.
-
-*avahi-0.6.31 (25 Nov 2012)
-
-  25 Nov 2012; Sven Wegener <swegener@g.o> +avahi-0.6.31.ebuild,
-  +files/avahi-0.6.31-install-exec-hook.patch:
-  Version bump, bug #404209.
-
-  07 Oct 2012; Raúl Porcel <armin76@g.o> avahi-0.6.30-r3.ebuild:
-  alpha/ia64/s390/sh/sparc stable wrt #431830
-
-  06 Oct 2012; Anthony G. Basile <blueness@g.o> avahi-0.6.30-r3.ebuild:
-  stable ppc64, bug #431830
-
-  05 Oct 2012; Brent Baude <ranger@g.o> avahi-0.6.30-r3.ebuild:
-  Marking avahi-0.6.30-r3 ppc for bug 431830
-
-  02 Oct 2012; Markus Meier <maekke@g.o> avahi-0.6.30-r3.ebuild:
-  arm stable, bug #431830
-
-  02 Oct 2012; Jeroen Roovers <jer@g.o> avahi-0.6.30-r3.ebuild:
-  Stable for HPPA (bug #431830).
-
-  01 Oct 2012; Agostino Sarubbo <ago@g.o> avahi-0.6.30-r3.ebuild:
-  Stable for amd64, wrt bug #431830
-
-  01 Oct 2012; Pawel Hajdan jr <phajdan.jr@g.o> avahi-0.6.30-r3.ebuild:
-  x86 stable wrt bug #431830
-
-  16 Jun 2012; Diego E. Pettenò <flameeyes@g.o> avahi-0.6.30-r3.ebuild:
-  Use automake 1.11 to avoid build failures.
-
-  14 Jun 2012; Zac Medico <zmedico@g.o> avahi-0.6.30-r1.ebuild,
-  avahi-0.6.30-r3.ebuild:
-  inherit user for enewgroup and enewuser
-
-  13 May 2012; Alexis Ballier <aballier@g.o> avahi-0.6.30-r3.ebuild:
-  keyword ~amd64-fbsd
-
-  03 May 2012; Jeff Horelick <jdhore@g.o> avahi-0.6.30-r1.ebuild,
-  avahi-0.6.30-r3.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-  01 May 2012; Diego E. Pettenò <flameeyes@g.o>
-  +files/avahi-0.6.30-parallel.patch, avahi-0.6.30-r3.ebuild:
-  Fix bug #411351 (broken parallel install with USE=utils).
-
-  12 Feb 2012; Mike Gilbert <floppym@g.o> avahi-0.6.30-r3.ebuild:
-  Call python_convert_shebangs() only in correct combination of USE flags. Patch
-  by Arfrever.
-
-  16 Jan 2012; Samuli Suominen <ssuominen@g.o> -avahi-0.6.28-r1.ebuild,
-  -files/avahi-0.6.28-CVE-2011-1002.patch, -avahi-0.6.29-r1.ebuild,
-  -avahi-0.6.30-r2.ebuild,
-  -files/netlink-request-all-matches-when-requesting-interface.patch:
-  old
-
-  16 Jan 2012; Samuli Suominen <ssuominen@g.o> avahi-0.6.30-r1.ebuild:
-  ppc/ppc64 stable wrt #393009
-
-  16 Jan 2012; Samuli Suominen <ssuominen@g.o> avahi-0.6.30-r3.ebuild:
-  Remove || die from python_convert_shebangs and run it on a directory instead
-  wrt #396339 by Deepak Shandilya
-
-*avahi-0.6.30-r3 (15 Jan 2012)
-
-  15 Jan 2012; Samuli Suominen <ssuominen@g.o> +avahi-0.6.30-r3.ebuild,
-  +files/avahi-0.6.30-automake-1.11.2.patch:
-  Install services-types file(s) to pkgdatadir instead of pkglibdir. Empty
-  py-compile script instead of pointing the 'make install' to "true". Closing
-  #397477.
-
-  01 Jan 2012; Raúl Porcel <armin76@g.o> avahi-0.6.30-r1.ebuild:
-  alpha/ia64/s390/sh/sparc stable wrt #393009
-
-  28 Dec 2011; Diego E. Pettenò <flameeyes@g.o> avahi-0.6.30-r2.ebuild:
-  QA: do not try to convert the shebang of avahi-discover if gtk and/or dbus are
-  disabled.
-
-  27 Dec 2011; Jesus Rivero <neurogeek@g.o> avahi-0.6.30-r2.ebuild:
-  Removed die from python_convert_shebangs. Patch by Arfrever
-
-  25 Dec 2011; Maxim Koltsov <maksbotan@g.o> avahi-0.6.29-r1.ebuild,
-  avahi-0.6.30-r2.ebuild:
-  Fix 395957 again
-
-  25 Dec 2011; Maxim Koltsov <maksbotan@g.o> avahi-0.6.29-r1.ebuild,
-  avahi-0.6.30-r2.ebuild:
-  Fix bug 395957, call python_convert_shebangs only when use python is set
-
-  18 Dec 2011; Markus Meier <maekke@g.o> avahi-0.6.30-r1.ebuild:
-  arm stable, bug #393009
-
-  18 Dec 2011; Pawel Hajdan jr <phajdan.jr@g.o> avahi-0.6.30-r1.ebuild:
-  x86 stable wrt bug #393009
-
-  16 Dec 2011; Jeroen Roovers <jer@g.o> avahi-0.6.30-r1.ebuild:
-  Stable for HPPA (bug #393009).
-
-*avahi-0.6.30-r2 (24 Dec 2011)
-*avahi-0.6.29-r1 (24 Dec 2011)
-
-  24 Dec 2011; Maxim Koltsov <maksbotan@g.o> -avahi-0.6.29.ebuild,
-  +avahi-0.6.29-r1.ebuild, -avahi-0.6.30.ebuild, +avahi-0.6.30-r2.ebuild:
-  Fix shebangs, bug 383773. Clean old versions
-
-  15 Dec 2011; Agostino Sarubbo <ago@g.o> avahi-0.6.30-r1.ebuild:
-  Stable for AMD64, wrt bug #393009
-
-  23 Oct 2011; Lars Wendler <polynomial-c@g.o>
-  +files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch,
-  avahi-0.6.29.ebuild, avahi-0.6.30.ebuild, avahi-0.6.30-r1.ebuild:
-  non-maintainer commit: Replaced deprecated opts variable in init scripts (bug
-  #383641).
-
-  02 Oct 2011; Pacho Ramos <pacho@g.o> avahi-0.6.30-r1.ebuild:
-  Drop DEPRECATED flags, bug #384743
-
-*avahi-0.6.30-r1 (14 Aug 2011)
-
-  14 Aug 2011; Nirbheek Chauhan <nirbheek@g.o> +avahi-0.6.30-r1.ebuild,
-  +files/avahi-0.6.30-optional-gtk-utils.patch:
-  Add gtk3 and introspection support, make utilities optional, reorder deps to
-  use COMMON_DEPEND, remove static libraries and .la files
-
-  06 Aug 2011; Zac Medico <zmedico@g.o> avahi-0.6.30.ebuild:
-  Fix for prefix and add ~x86-linux keyword.
-
-*avahi-0.6.30 (06 Apr 2011)
-
-  06 Apr 2011; Sven Wegener <swegener@g.o> +avahi-0.6.30.ebuild:
-  Version bump.
-
-  17 Mar 2011; Sven Wegener <swegener@g.o>
-  files/netlink-request-all-matches-when-requesting-interface.patch:
-  Update netlink patch from git.
-
-*avahi-0.6.29 (17 Mar 2011)
-
-  17 Mar 2011; Sven Wegener <swegener@g.o> +avahi-0.6.29.ebuild:
-  Version bump, bug #358971.
-
-  12 Mar 2011; Sven Wegener <swegener@g.o>
-  -files/avahi-0.6.24-cmsg_space.patch, -files/avahi-0.6.24-libintl.patch,
-  -avahi-0.6.25-r1.ebuild, -avahi-0.6.27.ebuild, -avahi-0.6.27-r1.ebuild,
-  -files/avahi-0.6.27-no-auto-activated.patch, -avahi-0.6.28.ebuild:
-  Cleanup.
-
-  05 Mar 2011; Raúl Porcel <armin76@g.o> avahi-0.6.28-r1.ebuild:
-  alpha/arm/ia64/s390/sh/sparc stable wrt #355583
-
-  03 Mar 2011; Jeroen Roovers <jer@g.o> avahi-0.6.28-r1.ebuild:
-  Stable for HPPA (bug #355583).
-
-  02 Mar 2011; Thomas Kahle <tomka@g.o> avahi-0.6.28-r1.ebuild:
-  x86 stable per bug 355583
-
-  01 Mar 2011; Kacper Kowalik <xarthisius@g.o>
-  avahi-0.6.28-r1.ebuild:
-  ppc/ppc64 stable wrt #355583
-
-  01 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  avahi-0.6.28-r1.ebuild:
-  Byte-compile avahi_discover only with USE="dbus gtk python" (bug #339933).
-
-  28 Feb 2011; Markos Chandras <hwoarang@g.o> avahi-0.6.28-r1.ebuild:
-  Stable on amd64 wrt bug #355583
-
-*avahi-0.6.28-r1 (27 Feb 2011)
-
-  27 Feb 2011; Sven Wegener <swegener@g.o> +avahi-0.6.28-r1.ebuild,
-  +files/avahi-0.6.28-CVE-2011-1002.patch:
-  Revision bump, security bug #355583.
-
-  23 Jan 2011; Sven Wegener <swegener@g.o> avahi-0.6.28.ebuild,
-  +files/netlink-request-all-matches-when-requesting-interface.patch:
-  Add bugfix patch to support kernels >=2.6.38, bug #352070.
-
-  23 Jan 2011; Sven Wegener <swegener@g.o> -avahi-0.6.24-r2.ebuild,
-  -files/avahi-0.6.24-CVE-2009-0758.patch, -avahi-0.6.25.ebuild:
-  Cleanup.
-
-  14 Dec 2010; Sven Wegener <swegener@g.o> avahi-0.6.27.ebuild,
-  avahi-0.6.27-r1.ebuild, avahi-0.6.28.ebuild:
-  Drop glade dependency and bump gtk+ to 2.14.0, bug #348394.
-
-  20 Nov 2010; Diego E. Pettenò <flameeyes@g.o> avahi-0.6.28.ebuild:
-  Fix obvious typo.
-
-  03 Nov 2010; Tomáš Chvátal <scarabeus@g.o> avahi-0.6.28.ebuild:
-  QA: add missing dies, remove dies from pkg_setup, cleanup conditions in
-  configure phase.
-
-  06 Oct 2010; Sven Wegener <swegener@g.o> avahi-0.6.28.ebuild:
-  Bump libdaemon dependency to 0.14, bug #339885.
-
-*avahi-0.6.28 (05 Oct 2010)
-
-  05 Oct 2010; Sven Wegener <swegener@g.o> +avahi-0.6.28.ebuild:
-  Version bump.
-
-  29 Aug 2010; Raúl Porcel <armin76@g.o> avahi-0.6.25-r1.ebuild:
-  ia64/s390/sh/sparc stable wrt #278177
-
-  11 Aug 2010; Joseph Jezak <josejx@g.o> avahi-0.6.25-r1.ebuild:
-  Marked ppc/ppc64 stable for bug #278177.
-
-  11 Aug 2010; Arun Raghavan <ford_prefect@g.o>
-  avahi-0.6.27-r1.ebuild:
-  Disable introspection for now. Upstream ships a .gir file which is broken
-  with >=gobject-introspection-0.9. (http://avahi.org/ticket/318)
-
-*avahi-0.6.27-r1 (10 Aug 2010)
-
-  10 Aug 2010; Sven Wegener <swegener@g.o> +avahi-0.6.27-r1.ebuild,
-  +files/avahi-0.6.27-no-auto-activated.patch:
-  Revert one commit that introduced compability for auto-activated services.
-  This fixes bug #331275.
-
-*avahi-0.6.27 (03 Aug 2010)
-
-  03 Aug 2010; Sven Wegener <swegener@g.o> +avahi-0.6.27.ebuild:
-  Version bump.
-
-  03 Aug 2010; Jeroen Roovers <jer@g.o> avahi-0.6.25-r1.ebuild:
-  Stable for HPPA (bug #278177).
-
-  19 Jul 2010; Markus Meier <maekke@g.o> avahi-0.6.25-r1.ebuild:
-  arm stable, bug #278177
-
-  11 Jul 2010; Tobias Klausmann <klausman@g.o>
-  avahi-0.6.25-r1.ebuild:
-  Stable on alpha, bug #278177
-
-  28 Jun 2010; Pawel Hajdan jr <phajdan.jr@g.o>
-  avahi-0.6.25-r1.ebuild:
-  x86 stable wrt bug #278177
-
-  25 Jun 2010; Christoph Mende <angelos@g.o> avahi-0.6.25-r1.ebuild:
-  Stable on amd64 wrt bug #278177
-
-  24 Jun 2010; Sven Wegener <swegener@g.o> avahi-0.6.25-r1.ebuild:
-  Fix broken intltool rules, bug #319057.
-
-  19 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
-  avahi-0.6.24-r2.ebuild, avahi-0.6.25.ebuild, avahi-0.6.25-r1.ebuild:
-  Use Python 2 (bug #315093).
-
-*avahi-0.6.25-r1 (09 Feb 2010)
-
-  09 Feb 2010; Diego E. Pettenò <flameeyes@g.o>
-  +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@g.o>
-  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@g.o>
-  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@g.o> avahi-0.6.24-r2.ebuild,
-  avahi-0.6.25.ebuild:
-  Removed alternative dependency on Qt metapackage
-
-  13 Aug 2009; Sven Wegener <swegener@g.o> avahi-0.6.24-r2.ebuild,
-  avahi-0.6.25.ebuild:
-  Install NEWS file, bug #274757.
-
-*avahi-0.6.25 (17 Apr 2009)
-
-  17 Apr 2009; Sven Wegener <swegener@g.o> +avahi-0.6.25.ebuild:
-  Version bump.
-
-  17 Apr 2009; Sven Wegener <swegener@g.o>
-  -files/avahi-0.6.1-no-ipv6.patch,
-  -files/avahi-0.6.19-assert-security.patch,
-  -files/avahi-0.6.19-ui-sharp-automake.patch,
-  -files/avahi-0.6.19-ui-sharp-gtk.patch, -files/avahi-0.6.20-autoipd.patch,
-  -files/avahi-0.6.22-gobject.patch, -files/avahi-0.6.22-vncviewer.patch,
-  -files/avahi-start-after-netmount.patch, -files/avahi-vncviewer.patch,
-  -avahi-0.6.19-r2.ebuild, -avahi-0.6.22-r1.ebuild, -avahi-0.6.23.ebuild,
-  -avahi-0.6.24.ebuild, -avahi-0.6.24-r1.ebuild:
-  Cleanup.
-
-  01 Apr 2009; Sven Wegener <swegener@g.o> files/autoipd-openrc.sh:
-  Use absolute path to avahi-autoipd in openrc support script.
-
-  29 Mar 2009; Markus Meier <maekke@g.o> avahi-0.6.24-r2.ebuild:
-  amd64 stable, bug #260971
-
-  27 Mar 2009; Raúl Porcel <armin76@g.o> avahi-0.6.24-r2.ebuild:
-  arm/ia64/s390/sh/sparc/x86 stable wrt #260971
-
-  19 Mar 2009; Brent Baude <ranger@g.o> avahi-0.6.24-r2.ebuild:
-  Marking avahi-0.6.24-r2 ppc for bug 260971
-
-  11 Mar 2009; Brent Baude <ranger@g.o> avahi-0.6.24-r2.ebuild:
-  Marking avahi-0.6.24-r2 ppc64 for bug 260971
-
-  08 Mar 2009; Timothy Redaelli <drizzt@g.o> avahi-0.6.24-r2.ebuild:
-  Readd ~x86-fbsd keyword wrt #184008
-
-  08 Mar 2009; Tobias Klausmann <klausman@g.o>
-  avahi-0.6.24-r2.ebuild:
-  Stable on alpha, bug #260971
-
-  07 Mar 2009; Jeroen Roovers <jer@g.o> avahi-0.6.24-r2.ebuild:
-  Stable for HPPA (bug #260971).
-
-  06 Mar 2009; Sven Wegener <swegener@g.o> 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@g.o> 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@g.o>
-  +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@g.o> avahi-0.6.24.ebuild:
-  ia64/sparc stable wrt #250913
-
-  20 Dec 2008; Tobias Klausmann <klausman@g.o> avahi-0.6.24.ebuild:
-  Stable on alpha, bug #250913
-
-  18 Dec 2008; Tobias Scherbaum <dertobi123@g.o> avahi-0.6.24.ebuild:
-  ppc stable, bug #250913
-
-  18 Dec 2008; Brent Baude <ranger@g.o> avahi-0.6.24.ebuild:
-  Marking avahi-0.6.24 ppc64 for bug 250913
-
-  18 Dec 2008; Jeroen Roovers <jer@g.o> avahi-0.6.24.ebuild:
-  Stable for HPPA (bug #250913).
-
-  17 Dec 2008; Markus Meier <maekke@g.o> avahi-0.6.24.ebuild:
-  amd64/x86 stable, bug #250913
-
-*avahi-0.6.24 (14 Dec 2008)
-
-  14 Dec 2008; Sven Wegener <swegener@g.o> +avahi-0.6.24.ebuild:
-  Version bump, security bug #250913.
-
-  14 Dec 2008; Peter Alfredsen <loki_val@g.o> 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@g.o> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-  27 Jul 2008; Carsten Lohrke <carlo@g.o> 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@g.o> +avahi-0.6.23.ebuild:
-  Version bump.
-
-  30 May 2008; Sven Wegener <swegener@g.o>
-  -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@g.o> 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@g.o> avahi-0.6.22-r1.ebuild:
-  alpha/ia64/sparc stable wrt #220803
-
-  11 May 2008; Markus Rothe <corsair@g.o> avahi-0.6.22-r1.ebuild:
-  Stable on ppc64; bug #220803
-
-  10 May 2008; Jeroen Roovers <jer@g.o> avahi-0.6.22-r1.ebuild:
-  Stable for HPPA (bug #220803).
-
-  10 May 2008; nixnut <nixnut@g.o> avahi-0.6.22-r1.ebuild:
-  Stable on ppc wrt bug 220803
-
-  07 May 2008; Markus Meier <maekke@g.o> avahi-0.6.22-r1.ebuild:
-  amd64/x86 stable, bug #220803
-
-  19 Apr 2008; Sven Wegener <swegener@g.o> +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@g.o> 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@g.o> 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@g.o>
-  +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@g.o> 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@g.o>
-  +files/avahi-0.6.22-vncviewer.patch, +avahi-0.6.22.ebuild:
-  Version bump.
-
-  19 Nov 2007; Sven Wegener <swegener@g.o>
-  +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@g.o> 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@g.o> avahi-0.6.20-r2.ebuild:
-  Stable on ppc64
-
-  25 Sep 2007; Sven Wegener <swegener@g.o>
-  +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@g.o>
-  +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@g.o>
-  +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@g.o>
-  -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@g.o> avahi-0.6.21.ebuild:
-  Tested and working on MIPS... keyworded ~mips.
-
-  18 Aug 2007; Sven Wegener <swegener@g.o> -avahi-0.6.19-r1.ebuild,
-  -avahi-0.6.20-r1.ebuild:
-  Cleanup.
-
-  12 Aug 2007; Sven Wegener <swegener@g.o>
-  +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@g.o>
-  +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@g.o>
-  +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@g.o>
-  -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@g.o> 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@g.o>
-  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@g.o>
-  +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@g.o> avahi-0.6.20.ebuild:
-  amd64 stable, security bug 182918
-
-  02 Jul 2007; Jeroen Roovers <jer@g.o> avahi-0.6.19-r1.ebuild:
-  Stable for HPPA (bug #182918).
-
-  29 Jun 2007; Sven Wegener <swegener@g.o> avahi-0.6.20.ebuild:
-  Adjust libdaemon dependency.
-
-  29 Jun 2007; Sven Wegener <swegener@g.o>
-  +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@g.o>
-  avahi-0.6.19-r1.ebuild:
-  ppc stable, bug #182918
-
-  28 Jun 2007; Raúl Porcel <armin76@g.o> avahi-0.6.19-r1.ebuild:
-  alpha/ia64/x86 stable wrt security #182918
-
-  28 Jun 2007; Gustavo Zacarias <gustavoz@g.o>
-  avahi-0.6.19-r1.ebuild:
-  Stable on sparc wrt security #182918
-
-  28 Jun 2007; Markus Rothe <corsair@g.o> 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@g.o>
-  +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@g.o> +avahi-0.6.20.ebuild:
-  Version bump, security bug #182918.
-
-  25 May 2007; Donnie Berkholz <dberkholz@g.o>;
-  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@g.o> 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@g.o>
-  +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@g.o> +avahi-0.6.19.ebuild:
-  Version bump.
-
-  06 May 2007; Marius Mauch <genone@g.o> 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@g.o> 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@g.o>
-  -files/0.6.15-dbus-fixes.patch, -avahi-0.6.15.ebuild:
-  Cleanup.
-
-  21 Apr 2007; Sven Wegener <swegener@g.o> avahi-0.6.18.ebuild:
-  Readd ~x86-fbsd keyword.
-
-  21 Apr 2007; Sven Wegener <swegener@g.o>
-  +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@g.o> avahi-0.6.18.ebuild:
-  Workaround for ServiceTypeDatabase.py bug.
-
-  20 Apr 2007; Timothy Redaelli <drizzt@g.o> 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@g.o> +avahi-0.6.18.ebuild:
-  Version bump.
-
-  05 Mar 2007; Sven Wegener <swegener@g.o> 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@g.o> +avahi-0.6.17.ebuild:
-  Version bump.
-
-  29 Jan 2007; Sven Wegener <swegener@g.o> avahi-0.6.16-r1.ebuild:
-  Drop useless autoconf dependency.
-
-  15 Jan 2007; Bryan Østergaard <kloeri@g.o> avahi-0.6.16-r1.ebuild:
-  Stable on Alpha, bug 159306.
-
-  15 Jan 2007; Gustavo Zacarias <gustavoz@g.o>
-  avahi-0.6.16-r1.ebuild:
-  Stable on sparc wrt security #159306
-
-  15 Jan 2007; Luis Medinas <metalgod@g.o> avahi-0.6.16-r1.ebuild:
-  Stable on amd64. Security bug #159306.
-
-  14 Jan 2007; Andrej Kacian <ticho@g.o> avahi-0.6.16-r1.ebuild:
-  Stable on x86, security bug #159306.
-
-  13 Jan 2007; Markus Rothe <corsair@g.o> avahi-0.6.16-r1.ebuild:
-  Stable on ppc64; bug #159306
-
-  13 Jan 2007; Jeroen Roovers <jer@g.o> 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@g.o>
-  +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@g.o>
-  +avahi-0.6.16.ebuild:
-  Version bump for security bug #159306, marked ppc stable
-
-  15 Nov 2006; Sven Wegener <swegener@g.o>
-  -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@g.o> avahi-0.6.15.ebuild:
-  Stable on ppc64; bug #154322
-
-  14 Nov 2006; Bryan Østergaard <kloeri@g.o> avahi-0.6.15.ebuild:
-  Stable on Alpha, bug 154322.
-
-  13 Nov 2006; René Nussbaumer <killerfox@g.o> avahi-0.6.15.ebuild:
-  Stable on hppa. See bug #154322.
-
-  11 Nov 2006; Sven Wegener <swegener@g.o>
-  +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@g.o> avahi-0.6.15.ebuild:
-  Marked stable on amd64
-
-  10 Nov 2006; Christian Faulhammer <opfer@g.o> avahi-0.6.15.ebuild:
-  stable x86, security bug #154322
-
-  09 Nov 2006; Gustavo Zacarias <gustavoz@g.o> avahi-0.6.15.ebuild:
-  Stable on sparc wrt security #154322
-
-  09 Nov 2006; Tobias Scherbaum <dertobi123@g.o> avahi-0.6.15.ebuild:
-  ppc stable, bug #154322
-
-*avahi-0.6.15 (09 Nov 2006)
-
-  09 Nov 2006; Sven Wegener <swegener@g.o> +avahi-0.6.15.ebuild:
-  Version bump.
-
-  03 Nov 2006; Sven Wegener <swegener@g.o> 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@g.o> files/autoipd.sh,
-  avahi-0.6.14.ebuild:
-  Drop the functions dependency.
-
-  01 Nov 2006; Doug Goldstein <cardoe@g.o> avahi-0.6.14.ebuild:
-  Fixing dbus depends
-
-  25 Oct 2006; Joshua Jackson <tsunam@g.o> avahi-0.6.12.ebuild:
-  Stable x86; bug #150540
-
-  23 Oct 2006; Sven Wegener <swegener@g.o> 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@g.o> avahi-0.6.12.ebuild:
-  Stable on ppc64; bug #150540
-
-  21 Oct 2006; Tobias Scherbaum <dertobi123@g.o> avahi-0.6.12.ebuild:
-  ppc stable
-
-  20 Oct 2006; Gustavo Zacarias <gustavoz@g.o> avahi-0.6.12.ebuild:
-  Stable on sparc wrt #150540
-
-  15 Oct 2006; Sven Wegener <swegener@g.o> files/autoipd.sh:
-  Touchup the net script.
-
-  24 Sep 2006; Sven Wegener <swegener@g.o> 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@g.o> avahi-0.6.14.ebuild:
-  Add ~x86-fbsd keyword.
-
-*avahi-0.6.14 (20 Sep 2006)
-
-  20 Sep 2006; Sven Wegener <swegener@g.o> +files/autoipd.sh,
-  +avahi-0.6.14.ebuild:
-  Version bump.
-
-  20 Sep 2006; Sven Wegener <swegener@g.o> 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@g.o> avahi-0.6.12.ebuild:
-  Mark 0.6.12 stable on ia64
-
-  18 Sep 2006; Sven Wegener <swegener@g.o> 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@g.o>
-  files/0.6.13-svn-fixes.patch:
-  Fix line endings.
-
-*avahi-0.6.13 (10 Sep 2006)
-
-  10 Sep 2006; Sven Wegener <swegener@g.o>
-  +files/0.6.13-svn-fixes.patch, +avahi-0.6.13.ebuild:
-  Version bump.
-
-  19 Aug 2006; Bryan Østergaard <kloeri@g.o> avahi-0.6.12.ebuild:
-  Add ~ia64 keyword.
-
-*avahi-0.6.12 (27 Jul 2006)
-
-  27 Jul 2006; Sven Wegener <swegener@g.o> +avahi-0.6.12.ebuild:
-  Version bump.
-
-  16 Jul 2006; Tobias Scherbaum <dertobi123@g.o> avahi-0.6.10.ebuild:
-  hppa stable, bug #139612
-
-  14 Jul 2006; Tobias Scherbaum <dertobi123@g.o> avahi-0.6.10.ebuild:
-  ppc stable, bug #139612
-
-*avahi-0.6.11 (09 Jul 2006)
-
-  09 Jul 2006; Sven Wegener <swegener@g.o> +avahi-0.6.11.ebuild:
-  Version bump. Add support for the qt4 USE flag and tweak configure logic.
-
-  30 Jun 2006; Thomas Cort <tcort@g.o> avahi-0.6.10.ebuild:
-  Stable on alpha.
-
-  28 Jun 2006; Luis Medinas <metalgod@g.o> avahi-0.6.10.ebuild:
-  Stable on amd64. See bug #124293.
-
-  24 Jun 2006; Doug Goldstein <cardoe@g.o> avahi-0.6.10.ebuild:
-  USE flag qt->qt3/qt4 change
-
-  10 Jun 2006; Sven Wegener <swegener@g.o> avahi-0.6.10.ebuild:
-  Unset DISPLAY for bug #123318.
-
-  26 May 2006; Markus Rothe <corsair@g.o> avahi-0.6.10.ebuild:
-  Stable on ppc64
-
-  23 May 2006; Sven Wegener <swegener@g.o> -avahi-0.6.9.ebuild:
-  Cleanup.
-
-  17 May 2006; Joshua Jackson <tsunam@g.o> avahi-0.6.10.ebuild:
-  Stable on x86 for security bug #133513
-
-  16 May 2006; Gustavo Zacarias <gustavoz@g.o> avahi-0.6.10.ebuild:
-  Stable on sparc wrt security #133513
-
-  14 May 2006; Sven Wegener <swegener@g.o> 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@g.o> avahi-0.6.10.ebuild:
-  Added ~hppa, bug #131737
-
-*avahi-0.6.10 (06 May 2006)
-
-  06 May 2006; Sven Wegener <swegener@g.o> +avahi-0.6.10.ebuild:
-  Version bump.
-
-  04 May 2006; Mark Loeser <halcy0n@g.o> avahi-0.6.9.ebuild:
-  Stable on x86; bug #121558
-
-  01 May 2006; Markus Rothe <corsair@g.o> avahi-0.6.9.ebuild:
-  Added ~ppc64
-
-  18 Apr 2006; Sven Wegener <swegener@g.o> avahi-0.6.9.ebuild:
-  Tweak the configure logic.
-
-  12 Apr 2006; Thomas Cort <tcort@g.o> avahi-0.6.9.ebuild:
-  Added ~alpha keyword.
-
-  11 Apr 2006; Gustavo Zacarias <gustavoz@g.o> avahi-0.6.9.ebuild:
-  Stable on sparc
-
-  11 Apr 2006; Sven Wegener <swegener@g.o>
-  -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@g.o> +avahi-0.6.9.ebuild:
-  Version bump.
-
-*avahi-0.6.8 (27 Feb 2006)
-
-  27 Feb 2006; Sven Wegener <swegener@g.o> -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@g.o> +avahi-0.6.7.ebuild:
-  Version bump.
-
-*avahi-0.6.4 (18 Jan 2006)
-
-  18 Jan 2006; Doug Goldstein <cardoe@g.o> -avahi-0.6.3.ebuild,
-  +avahi-0.6.4.ebuild:
-  Rev bump. Includes Mono Posix fix.
-
-  18 Jan 2006; Doug Goldstein <cardoe@g.o>
-  +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@g.o> -avahi-0.6.2.ebuild,
-  +avahi-0.6.3.ebuild:
-  Version bump, bug #118593.
-
-  06 Jan 2006; Sven Wegener <swegener@g.o>
-  -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@g.o> +avahi-0.6.2.ebuild:
-  Version bump.
-
-  06 Jan 2006; Mike Frysinger <vapier@g.o>
-  +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@g.o>
-  +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@g.o> avahi-0.6.1.ebuild:
-  Add support for the gdbm USE flag.
-
-  29 Nov 2005; Gustavo Zacarias <gustavoz@g.o> avahi-0.6.1.ebuild:
-  Keyworded ~sparc wrt #113875
-
-*avahi-0.6.1 (25 Nov 2005)
-
-  25 Nov 2005; Sven Wegener <swegener@g.o> +avahi-0.6.1.ebuild:
-  Version bump, bug #113110.
-
-  21 Nov 2005; Sven Wegener <swegener@g.o> avahi-0.5.2-r1.ebuild:
-  Parallel build problems, bug #113092.
-
-  14 Nov 2005; Michael Hanselmann <hansmi@g.o> avahi-0.5.2-r1.ebuild:
-  Added to ~ppc. See bug #111461.
-
-  07 Nov 2005; Sven Wegener <swegener@g.o> 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@g.o> +avahi-0.5.2-r1.ebuild:
-  Revision bump for testing the mono docs stuff.
-
-  04 Nov 2005; Sven Wegener <swegener@g.o> 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@g.o> -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@g.o> -avahi-0.5.ebuild,
-  +avahi-0.5.1.ebuild:
-  Version bump, bugfix release.
-
-  25 Sep 2005; Sven Wegener <swegener@g.o> -avahi-0.4.ebuild:
-  Removed old ebuild.
-
-  20 Sep 2005; Sven Wegener <swegener@g.o> 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@g.o> +avahi-0.5.ebuild:
-  Version bump.
-
-*avahi-0.4 (08 Sep 2005)
-
-  08 Sep 2005; Sven Wegener <swegener@g.o> -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@g.o> +avahi-0.3.ebuild:
-  Version bump.
-
-  30 Aug 2005; <dang@g.o> avahi-0.2.ebuild:
-  Marked ~amd64
-
-  29 Aug 2005; Sven Wegener <swegener@g.o> +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@g.o> -files/avahi-daemon.initd,
-  -files/avahi-dnsconfd.initd, -avahi-0.1.ebuild, +avahi-0.2.ebuild:
-  Version bump.
-
-  23 Aug 2005; Sven Wegener <swegener@g.o> -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@g.o> +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
deleted file mode 100644
index 9959f01..0000000
--- a/net-dns/avahi/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX autoipd-openrc.sh 700 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0 SHA512 a5dbbac4d6d1959db3a07a63acb7569dbeba33d2274a1dd3253dc27687549371611cf08bad3998d89efb3ace63b5541a4d225e484274450e0c82661f5a1dbc32 WHIRLPOOL e6b256655f64f557338ae5f79eaf98ead572d39cf90c76ca270dc54cee4b5edfc087326e5f04166eb2ff232ec2a8a5b87adadc8b3bd8b2ec2e3b6503ca39bee6
-AUX autoipd.sh 1271 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3 WHIRLPOOL b33889de73f571b18da092342be6a47e71d608466aa0d94fa3f0d8d7e373265767a62bdfb82df31059549e4ec0d05aacef89f1778ea561152fd5e1970072584c
-AUX avahi-0.6.30-optional-gtk-utils.patch 2422 SHA256 1233ba93af567117091094921e5ba76f205b1d984fd5a97153c2004f8f0509e3 SHA512 3ea7f7cd0074286bbe474f783ea9638abef7f68d9466d4f5d4d3a0bc6624a43e48bb293f02f2dd08413d5dcf3f99161e0f45537c5f922b1a326375d40b574596 WHIRLPOOL 82a61a4bce9547e15d6370cd856ac020bcdf9ad220f20929d5c64909c0505406e09fa8503aa79c835477811be48e9c72fbcbfc12061c49722431db196c0cbb8c
-AUX avahi-0.6.31-disable-install-avahi-discover.patch 715 SHA256 79da591066f1ddb454f4d7b7ed7163a0d13c332462ac0c2db3e8a6cd130f8441 SHA512 0cdcf41bbd25caea84a62054c4081dfdba1d421cef56babebe33f480a8ba9af1362c7b698803c17132ee78716439ec70cd5d71f7c85b5d49ba9bda471466cb79 WHIRLPOOL 3b5aa85769688a070707e2a03cccbb4861465bad7b03f5d6e34819dbe2dda5934b332934102616d0a0910cddf80150497f15df19d53726850e1a64d0c48e34d9
-AUX avahi-0.6.31-host-name-from-machine-id.patch 3001 SHA256 257685dde4c7dc78b9fbfeab5f213a94121c8bff6ae8fff99a9aae7eeaa34442 SHA512 659d36b06bf721664105bf51a1610186700004dea2af5dc43e29a8d688e903fb0c69416b1b98957de902901fc5ed04fdd252d30e23f680608608e6f633b94b17 WHIRLPOOL e258af6f138ab7b838a8886d74b73f8d44aefea981bd3e876cca41a144081ad4d199f9ba4031fda71c5d78578869fadd1b226a11b101df406fa2d85911d06e81
-AUX avahi-0.6.31-install-exec-hook.patch 507 SHA256 5411262dd719e647ab7781d2e10ff05d051ff1d7218d58e5bf3a3fbe8628a439 SHA512 c25802f78b5c2f6cc15705c6e426b6590dbcdf30d33e239bd919e9592c5e72c7fb244726e74addfeff4b81fa41cc62afb3ddb880232fea66f3cc9470bb5940b1 WHIRLPOOL 864804ca378b2ef83766ba10e08998f0524ed8c2f6c5fe491eefe88dac2184a3b20848258cd7d19af10a50bbbe8567928c3762b00896bb32b18fda6a4d117c19
-AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 SHA256 0bd4f2b2f720684b754698d86b6b1f106576473cead815e7b60b1c62171e4cdc SHA512 c2d11b243acdc058cde03b872dccbbbd44a7a584adf168f16016f29c7a5d9d8668095b781f53102feba8b9c80b2cbbd788c9b327d9d1e2e552fbdcf3c2960517 WHIRLPOOL faae601dca07f267ebe6f8254ff2e00d7ff3de3aa4aa92186e9dead9ac49b43c670b3310d0d7671eae8858ef2f046a4c6b27cb1bb23c20413fddb791ad793a67
-DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f
-EBUILD avahi-0.6.31-r99.ebuild 5027 SHA256 2cd85140fbcb9e9533c4ba4a47da83437c35a8e7170d69483fd97c8160d44140 SHA512 6368557f4d6452e9fe66aed975d0841917d09c6d265b4b6a4c0756364bca99bc17ca7c9457390a93fbdaa6b020d2128ab6393f29e2d907442205c4b049caa595 WHIRLPOOL 1b0b0808561a96a233905a09faa7dbcc7b2b2e57b58cb89c41c52eb5f792e3bb876783727e6ecb9aa6f17733e89e337b1efc53867dc61d9e87abae113b26b9d5
-MISC ChangeLog 35925 SHA256 007cb0fe777f7f3c5fa7b17e70a5a189925a9fc963a5f02c8a4d6636163a439b SHA512 39e4f1f6c6b13029e2e34684ed14d44bd775885f44b8f21bcee3e0ea8adedb0d1b1e9676e7754c1ed8d231ab20f0cc59a995e6e6f3ec7eb6eb5811aba38a7723 WHIRLPOOL 0ef0cd907cc46ca021c436b26c4257916cc36ea3d874d65d349ab9cab4769af1b3dc299084a0d3fd2efd82e1ceff254b1d1597549bbb2e8117ab9df53dc3fe62
-MISC metadata.xml 924 SHA256 f35a98d122e0ea6a5e9a491cd9327fc4fc0a752b4f5bb6bcf746c914eb0c42bb SHA512 c386ad5a44a2dc6bc8d9d62ed27381550ec9d62fa685f2cdc7857c7bbcc31baa00ec4481d3b2694eab32cb899314dd20603c917479b6deac132a5204cdae3d5a WHIRLPOOL e2893a1fc00d6649000904a8db99f50efabf8b1aecdab2fa0eec401204b593aeadf8eb13812c1ada324315a7f0d9b617a9b1c3174e7f7d07f2c94374c7034276

diff --git a/net-dns/avahi/avahi-0.6.31-r99.ebuild b/net-dns/avahi/avahi-0.6.31-r99.ebuild
deleted file mode 100644
index ed745b6..0000000
--- a/net-dns/avahi/avahi-0.6.31-r99.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r1.ebuild,v 1.1 2013/04/20 15:11:33 blueness Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
-PYTHON_REQ_USE="gdbm"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils mono python-r1 multilib flag-o-matic user systemd
-
-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 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono python qt4 test utils"
-
-REQUIRED_USE="
-	utils? ( || ( gtk gtk3 ) )
-	python? ( dbus gdbm )
-	mono? ( dbus )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-libs/libdaemon
-	dev-libs/expat
-	dev-libs/glib:2
-	gdbm? ( sys-libs/gdbm )
-	qt4? ( dev-qt/qtcore:4 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	dbus? ( sys-apps/dbus )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection )
-	mono? (
-		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
-	python? (
-		gtk? ( dev-python/pygtk )
-		dbus? ( dev-python/dbus-python )
-	)
-	bookmarks? (
-		dev-python/twisted
-		dev-python/twisted-web
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		mono? ( virtual/monodoc )
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-"
-
-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() {
-	if use ipv6; then
-		sed -i \
-			-e s/use-ipv6=no/use-ipv6=yes/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
-
-	# Fix init scripts for >=openrc-0.9.0, bug #383641
-	epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
-
-	# install-exec-local -> install-exec-hook
-	epatch "${FILESDIR}"/${P}-install-exec-hook.patch
-
-	# Backport host-name-from-machine-id patch, bug #466134
-	epatch "${FILESDIR}"/${P}-host-name-from-machine-id.patch
-
-	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
-	epatch "${FILESDIR}"/${P}-disable-install-avahi-discover.patch
-
-	# Drop DEPRECATED flags, bug #384743
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
-
-	# Prevent .pyc files in DESTDIR
-	>py-compile
-
-	eautoreconf
-}
-
-src_configure() {
-	use sh && replace-flags -O? -O0
-
-	local myconf="--disable-static"
-
-	if use python; then
-		python_export_best
-		myconf+="
-			$(use_enable dbus python-dbus)
-			$(use_enable gtk pygtk)
-		"
-	fi
-
-	if use mono; then
-		myconf+=" $(use_enable doc monodoc)"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(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 gtk3) \
-		$(use_enable introspection) \
-		$(use_enable utils gtk-utils) \
-		--disable-qt3 \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	use doc && { emake avahi.devhelp || die ; }
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h
-
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh || die
-
-		insinto /$(get_libdir)/rc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO} || die
-
-	if use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	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
-}

diff --git a/net-dns/avahi/files/autoipd-openrc.sh b/net-dns/avahi/files/autoipd-openrc.sh
deleted file mode 100644
index dec3aa0..0000000
--- a/net-dns/avahi/files/autoipd-openrc.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2004-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Sven Wegener (swegener@g.o)
-
-_config_vars="$_config_vars autoipd"
-
-autoipd_depend() {
-	program /usr/sbin/avahi-autoipd
-	after interface
-}
-
-autoipd_start() {
-	_exists true || return 1
-
-        eval args=\$autoipd_${IFVAR}
-
-	ebegin "Starting avahi-autoipd"
-	/usr/sbin/avahi-autoipd --daemonize --syslog --wait ${args} "${IFACE}"
-	eend "${?}" || return 1
-
-	_show_address
-
-	return 0
-}
-
-autoipd_stop() {
-	/usr/sbin/avahi-autoipd --check --syslog "${IFACE}" || return 0
-
-	ebegin "Stopping avahi-autoipd"
-	/usr/sbin/avahi-autoipd --kill --syslog "${IFACE}"
-	eend "${?}"
-}

diff --git a/net-dns/avahi/files/autoipd.sh b/net-dns/avahi/files/autoipd.sh
deleted file mode 100644
index 89d02e3..0000000
--- a/net-dns/avahi/files/autoipd.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (c) 2004-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Sven Wegener (swegener@g.o)
-
-# void autoipd_depend(void)
-#
-# Sets up the dependencies for the module
-autoipd_depend() {
-	after interface
-}
-
-# void autoipd_expose(void)
-#
-# Expose variables that can be configured
-autoipd_expose() {
-	variables autoipd
-}
-
-# bool autoipd_start(char *iface)
-#
-# Tries to configure the interface via avahi-autoipd
-autoipd_start() {
-	local iface="${1}" ifvar="$(bash_variable "${iface}")" opts="autoipd_${ifvar}" addr=""
-
-	interface_exists "${iface}" true || return 1
-
-	ebegin "Starting avahi-autoipd"
-	if /usr/sbin/avahi-autoipd --daemonize --syslog --wait ${!opts} "${iface}"
-	then
-			eend 0
-			addr="$(interface_get_address "${iface}")"
-			einfo "${iface} received address ${addr}"
-			return 0
-	fi
-
-	eend "${?}" "Failed to get address via avahi-autoipd!"
-}
-
-# bool autoipd_stop(char *iface)
-#
-# Stops a running avahi-autoipd instance
-autoipd_stop() {
-	local iface="${1}"
-
-	/usr/sbin/avahi-autoipd --check --syslog "${iface}" || return 0
-
-	ebegin "Stopping avahi-autoipd"
-	/usr/sbin/avahi-autoipd --kill --syslog "${iface}"
-	eend "${?}" "Failed to stop running avahi-autoipd instance!"
-}
-
-# vim: set ts=4 :

diff --git a/net-dns/avahi/files/avahi-0.6.30-optional-gtk-utils.patch b/net-dns/avahi/files/avahi-0.6.30-optional-gtk-utils.patch
deleted file mode 100644
index 2c615a2..0000000
--- a/net-dns/avahi/files/avahi-0.6.30-optional-gtk-utils.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- avahi-discover-standalone/Makefile.am
-+++ avahi-discover-standalone/Makefile.am
-@@ -23,7 +23,7 @@
- # This cool debug trap works on i386/gcc only
- AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
- 
--if HAVE_GTK2OR3
-+if ENABLE_GTK_UTILS
- if HAVE_GLIB
- bin_PROGRAMS = \
- 	avahi-discover-standalone
---- avahi-ui/Makefile.am
-+++ avahi-ui/Makefile.am
-@@ -76,6 +76,7 @@
- libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
- endif
- 
-+if ENABLE_GTK_UTILS
- bin_PROGRAMS = bssh
- desktop_DATA += bssh.desktop bvnc.desktop
- @INTLTOOL_DESKTOP_RULE@
-@@ -102,6 +103,7 @@
- bvnc.desktop.in: bvnc.desktop.in.in
- 	$(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@
- 
-+endif # ENABLE_GTK_UTILS
- endif # HAVE_GLIB
- endif
- endif
---- configure.ac
-+++ configure.ac
-@@ -564,7 +564,29 @@
- fi
- AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes")
- 
--AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK" = "xyes" )
-+#
-+# Check for GTK+ Utils
-+#
-+AC_ARG_ENABLE(gtk-utils,
-+        AS_HELP_STRING([--disable-gtk-utils],[Disable GTK+ utilities]),
-+        [case "${enableval}" in
-+                yes) WANT_GTK_UTILS=yes ;;
-+                no)  WANT_GTK_UTILS=no ;;
-+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk-utils) ;;
-+        esac],
-+        [WANT_GTK_UTILS=yes])
-+
-+ENABLE_GTK_UTILS=no
-+HAVE_GTK2OR3=no
-+if test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK" = "xyes"; then
-+	HAVE_GTK2OR3=yes
-+	if test "x$WANT_GTK_UTILS" = "xyes"; then
-+		ENABLE_GTK_UTILS=yes
-+	fi
-+fi
-+
-+AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK2OR3" = "xyes")
-+AM_CONDITIONAL(ENABLE_GTK_UTILS, test "x$ENABLE_GTK_UTILS" = "xyes")
- 
- #
- # D-Bus
-@@ -1199,11 +1221,6 @@
-    ENABLE_AUTOIPD="no   (You need libdaemon!)"
- fi
- 
--HAVE_GTK2OR3=no
--if test "x$HAVE_GTK" = "xyes" -o "x$HAVE_GTK3" = "xyes" ; then
--   HAVE_GTK2OR3=yes
--fi
--
- BUILD_UI="no"
- if test "x$HAVE_GTK2OR3" = "xyes" -a "x$BUILD_CLIENT" = "xyes" ; then
-    BUILD_UI="yes"
-@@ -1223,7 +1240,7 @@
-     Building avahi-python:              ${BUILD_PYTHON}
-     Building libavahi-glib:             ${HAVE_GLIB}
-     Building libavahi-gobject:          ${BUILD_GOBJECT}
--    Building avahi-discover-standalone: ${HAVE_GTK2OR3}
-+    Building avahi-discover-standalone: ${ENABLE_GTK_UTILS}
-     Building libavahi-qt3:              ${HAVE_QT3}
-     Building libavahi-qt4:              ${HAVE_QT4}
-     Building avahi-sharp:               ${HAVE_MONO}

diff --git a/net-dns/avahi/files/avahi-0.6.31-disable-install-avahi-discover.patch b/net-dns/avahi/files/avahi-0.6.31-disable-install-avahi-discover.patch
deleted file mode 100644
index 62ba967..0000000
--- a/net-dns/avahi/files/avahi-0.6.31-disable-install-avahi-discover.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- avahi-0.6.30.old/avahi-python/avahi-discover/Makefile.am	2010-06-28 23:30:34.000000000 -0400
-+++ avahi-0.6.30/avahi-python/avahi-discover/Makefile.am	2012-04-21 18:02:01.642934527 -0400
-@@ -22,6 +22,7 @@
- 	avahi-discover.py \
- 	avahi-discover.desktop.in.in
- 
-+if ENABLE_GTK_UTILS
- if HAVE_PYTHON
- if HAVE_PYTHON_DBUS
- if HAVE_PYGTK
-@@ -67,3 +68,4 @@
- endif
- endif
- endif
-+endif
---- avahi-0.6.30.old/man/Makefile.am	2012-04-21 18:10:45.690900742 -0400
-+++ avahi-0.6.30/man/Makefile.am	2012-04-21 18:09:15.146906578 -0400
-@@ -65,11 +65,13 @@
- man_MANS += \
- 	avahi-bookmarks.1
- if HAVE_GTK
-+if ENABLE_GTK_UTILS
- man_MANS += \
- 	avahi-discover.1
- endif
- endif
- endif
-+endif
- 
- if ENABLE_AUTOIPD
- if HAVE_LIBDAEMON

diff --git a/net-dns/avahi/files/avahi-0.6.31-host-name-from-machine-id.patch b/net-dns/avahi/files/avahi-0.6.31-host-name-from-machine-id.patch
deleted file mode 100644
index 17ecba5..0000000
--- a/net-dns/avahi/files/avahi-0.6.31-host-name-from-machine-id.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: David Zeuthen <zeuthen@××××××××.org>
-Date: Tue, 5 Mar 2013 19:52:38 +0000 (-0800)
-Subject: avahi-daemon: add option "host-name-from-machine-id="
-X-Git-Url: http://git.0pointer.de/?p=avahi.git;a=commitdiff_plain;h=147cdce70b22ae7cee9fb4fe123db40952f31c9e
-
-avahi-daemon: add option "host-name-from-machine-id="
-
-Signed-off-by: David Zeuthen <zeuthen@××××××××.org>
----
-
-diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
-index d46f40a..8c28fd6 100644
---- a/avahi-daemon/main.c
-+++ b/avahi-daemon/main.c
-@@ -65,6 +65,7 @@
- #include <avahi-core/publish.h>
- #include <avahi-core/dns-srv-rr.h>
- #include <avahi-core/log.h>
-+#include <avahi-core/util.h>
- 
- #ifdef ENABLE_CHROOT
- #include "chroot.h"
-@@ -576,6 +577,29 @@ static int parse_usec(const char *s, AvahiUsec *u) {
-     return 0;
- }
- 
-+static char *get_machine_id(void) {
-+    int fd;
-+    char buf[32];
-+
-+    fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-+    if (fd == -1 && errno == ENOENT)
-+        fd = open("/var/lib/dbus/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-+    if (fd == -1)
-+        return NULL;
-+
-+    /* File is on a filesystem so we never get EINTR or partial reads */
-+    if (read(fd, buf, sizeof buf) != sizeof buf) {
-+        close(fd);
-+        return NULL;
-+    }
-+    close(fd);
-+
-+    /* Contents can be lower, upper and even mixed case so normalize */
-+    avahi_strdown(buf);
-+
-+    return avahi_strndup(buf, sizeof buf);
-+}
-+
- static int load_config_file(DaemonConfig *c) {
-     int r = -1;
-     AvahiIniFile *f;
-@@ -631,6 +655,15 @@ static int load_config_file(DaemonConfig *c) {
-                     c->server_config.use_iff_running = is_yes(p->value);
-                 else if (strcasecmp(p->key, "disallow-other-stacks") == 0)
-                     c->server_config.disallow_other_stacks = is_yes(p->value);
-+                else if (strcasecmp(p->key, "host-name-from-machine-id") == 0) {
-+                    if (*(p->value) == 'y' || *(p->value) == 'Y') {
-+                        char *machine_id = get_machine_id();
-+                        if (machine_id != NULL) {
-+                            avahi_free(c->server_config.host_name);
-+                            c->server_config.host_name = machine_id;
-+                        }
-+                    }
-+                }
- #ifdef HAVE_DBUS
-                 else if (strcasecmp(p->key, "enable-dbus") == 0) {
- 
-diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in
-index bea7ed5..2d15017 100644
---- a/man/avahi-daemon.conf.5.xml.in
-+++ b/man/avahi-daemon.conf.5.xml.in
-@@ -40,6 +40,12 @@
-     </option>
- 
-     <option>
-+      <p><opt>host-name-from-machine-id=</opt> Takes a boolean
-+      value ("yes" or "no"). If set to "yes" avahi-daemon
-+      will use the machine-id as name on the LAN.</p>
-+    </option>
-+
-+    <option>
-       <p><opt>domain-name=</opt> Set the default domain name avahi-daemon
-       tries to register its host name and services on the LAN in. If
-       omitted defaults to ".local".</p>

diff --git a/net-dns/avahi/files/avahi-0.6.31-install-exec-hook.patch b/net-dns/avahi/files/avahi-0.6.31-install-exec-hook.patch
deleted file mode 100644
index d9a7bc3..0000000
--- a/net-dns/avahi/files/avahi-0.6.31-install-exec-hook.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- avahi-0.6.31/avahi-utils/Makefile.am
-+++ avahi-0.6.31/avahi-utils/Makefile.am
-@@ -53,7 +53,7 @@
- avahi_set_host_name_CFLAGS = $(AM_CFLAGS)
- avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
- 
--install-exec-local:
-+install-exec-hook:
- 	cd $(DESTDIR)/$(bindir) && \
- 		rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
- 		$(LN_S) avahi-resolve avahi-resolve-host-name && \

diff --git a/net-dns/avahi/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch b/net-dns/avahi/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
deleted file mode 100644
index 394f6d3..0000000
--- a/net-dns/avahi/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- avahi-0.6.30/initscript/gentoo/avahi-daemon.in
-+++ avahi-0.6.30/initscript/gentoo/avahi-daemon.in
-@@ -2,7 +2,7 @@
- # Copyright 1999-2007 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- 
--opts="reload"
-+extra_started_commands="reload"
- 
- depend() {
- 	before netmount nfsmount
---- avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in
-+++ avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in
-@@ -2,7 +2,7 @@
- # Copyright 1999-2007 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
- 
--opts="reload"
-+extra_started_commands="reload"
- 
- depend() {
- 	need avahi-daemon

diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
deleted file mode 100644
index 7eaf27c..0000000
--- a/net-dns/avahi/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-	<email>blueness@g.o</email>
-	<name>Anthony G. Basile</name>
-</maintainer>
-<use>
-	<flag name='autoipd'>Build and install the IPv4LL (RFC3927) network address
-		configuration daemon</flag>
-	<flag name='bookmarks'>Install the avahi-bookmarks application (requires
-		<pkg>dev-python/twisted</pkg>)</flag>
-	<flag name='howl-compat'>Enable compat libraries for howl</flag>
-	<flag name="gtk3">Build the avahi-ui-gtk3 library, and use gtk3 for the
-		avahi utilities under USE=utils</flag>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-		for introspection</flag>
-	<flag name='mdnsresponder-compat'>Enable compat libraries for
-		mDNSResponder</flag>
-	<flag name="utils">Install the avahi gtk+ utils avahi-discover, bssh, and
-		bvnc</flag>
-</use>
-</pkgmetadata>