summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Sachau <tommy@gentoo.org>2009-08-15 15:24:42 +0200
committerThomas Sachau <tommy@gentoo.org>2009-08-15 15:24:42 +0200
commit4ba8c732fe126e778b7038c280bf685fcd640249 (patch)
treea2ff351c67e3659093b8223e19822782620fd557
parentDrop sys-kernel/linux-headers (diff)
downloadmultilib-portage-4ba8c732fe126e778b7038c280bf685fcd640249.tar.gz
multilib-portage-4ba8c732fe126e778b7038c280bf685fcd640249.tar.bz2
multilib-portage-4ba8c732fe126e778b7038c280bf685fcd640249.zip
Drop net-dns/avahi
-rw-r--r--net-dns/avahi/Manifest10
-rw-r--r--net-dns/avahi/avahi-0.6.24-r2.ebuild220
-rw-r--r--net-dns/avahi/avahi-0.6.25.ebuild220
-rw-r--r--net-dns/avahi/files/autoipd-openrc.sh32
-rw-r--r--net-dns/avahi/files/autoipd.sh52
-rw-r--r--net-dns/avahi/files/avahi-0.6.24-CVE-2009-0758.patch22
-rw-r--r--net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch11
-rw-r--r--net-dns/avahi/files/avahi-0.6.24-libintl.patch11
-rw-r--r--net-dns/avahi/metadata.xml17
9 files changed, 0 insertions, 595 deletions
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
deleted file mode 100644
index 0c2165dc3..000000000
--- a/net-dns/avahi/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-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.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
-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.25.ebuild 5516 RMD160 eb443d1f6ed1d7fd5caed24eadeca77713d9e5aa SHA1 a000bc421f363b7e92a4148fd9841eb1dd3bf0ba SHA256 cb1093197451f8e385f39dc7e43e3bed71a2c3271da4ba6ff79d31ea18041b41
-MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa
diff --git a/net-dns/avahi/avahi-0.6.24-r2.ebuild b/net-dns/avahi/avahi-0.6.24-r2.ebuild
deleted file mode 100644
index e2768c372..000000000
--- a/net-dns/avahi/avahi-0.6.24-r2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-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-r2.ebuild,v 1.9 2009/03/29 21:27:57 maekke Exp $
-
-EAPI="2"
-
-inherit eutils mono python multilib autotools flag-o-matic 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 ~x86-fbsd"
-IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test ipv6"
-
-RDEPEND=">=dev-libs/libdaemon-0.11-r1[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
-}
-
-multilib-native_src_prepare_internal() {
- use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
-
- sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl
-
- rm -f common/libtool.m4 common/lt*.m4 || die "Removing libtool macros failed"
-
- epatch "${FILESDIR}"/avahi-0.6.24-CVE-2009-0758.patch
- epatch "${FILESDIR}"/avahi-0.6.24-cmsg_space.patch
- epatch "${FILESDIR}"/avahi-0.6.24-libintl.patch
-
- eautoreconf
-}
-
-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() {
- use sh && replace-flags -O? -O0
- 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/avahi-0.6.25.ebuild b/net-dns/avahi/avahi-0.6.25.ebuild
deleted file mode 100644
index b9e3faa29..000000000
--- a/net-dns/avahi/avahi-0.6.25.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-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.25.ebuild,v 1.1 2009/04/17 18:41:14 swegener Exp $
-
-EAPI="2"
-
-inherit eutils mono python multilib autotools flag-o-matic 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 ~x86-fbsd"
-IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test ipv6"
-
-RDEPEND=">=dev-libs/libdaemon-0.11-r1[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[lib32?]
- (
- <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[lib32?] )
- )
- bookmarks? (
- dev-python/twisted[lib32?]
- dev-python/twisted-web[lib32?]
- )
- 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
-}
-
-multilib-native_src_prepare_internal() {
- use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
-
- sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl
-
- rm -f common/libtool.m4 common/lt*.m4 || die "Removing libtool macros failed"
-
- epatch "${FILESDIR}"/avahi-0.6.24-cmsg_space.patch
- epatch "${FILESDIR}"/avahi-0.6.24-libintl.patch
-
- eautoreconf
-}
-
-multilib-native_src_configure_internal() {
- use sh && replace-flags -O? -O0
-
- local myconf=""
-
- if use python
- then
- use dbus && myconf="${myconf} --enable-python-dbus"
- use gtk && myconf="${myconf} --enable-pygtk"
- fi
-
- if use mono && use doc
- then
- myconf="${myconf} --enable-monodoc"
- fi
-
- # We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
- unset DISPLAY
-
- econf \
- --localstatedir=/var \
- --with-distro=gentoo \
- --disable-python-dbus \
- --disable-pygtk \
- --disable-xmltoman \
- --disable-monodoc \
- --enable-glib \
- $(use_enable test tests) \
- $(use_enable autoipd) \
- $(use_enable mdnsresponder-compat compat-libdns_sd) \
- $(use_enable howl-compat compat-howl) \
- $(use_enable doc doxygen-doc) \
- $(use_enable mono) \
- $(use_enable dbus) \
- $(use_enable python) \
- $(use_enable gtk) \
- $(use_enable qt3) \
- $(use_enable qt4) \
- $(use_enable gdbm) \
- ${myconf} \
- || die "econf failed"
-}
-
-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
deleted file mode 100644
index dec3aa052..000000000
--- 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@gentoo.org)
-
-_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 89d02e338..000000000
--- 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@gentoo.org)
-
-# 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.24-CVE-2009-0758.patch b/net-dns/avahi/files/avahi-0.6.24-CVE-2009-0758.patch
deleted file mode 100644
index 578839364..000000000
--- a/net-dns/avahi/files/avahi-0.6.24-CVE-2009-0758.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/avahi-core/server.c b/avahi-core/server.c
-index 453db09..8187690 100644
---- a/avahi-core/server.c
-+++ b/avahi-core/server.c
-@@ -844,7 +844,7 @@ static int originates_from_local_legacy_unicast_socket(AvahiServer *s, const Ava
- if (getsockname(s->fd_legacy_unicast_ipv4, (struct sockaddr*) &lsa, &l) != 0)
- avahi_log_warn("getsockname(): %s", strerror(errno));
- else
-- return lsa.sin_port == port;
-+ return avahi_port_from_sockaddr((struct sockaddr*) &lsa) == port;
-
- }
-
-@@ -855,7 +855,7 @@ static int originates_from_local_legacy_unicast_socket(AvahiServer *s, const Ava
- if (getsockname(s->fd_legacy_unicast_ipv6, (struct sockaddr*) &lsa, &l) != 0)
- avahi_log_warn("getsockname(): %s", strerror(errno));
- else
-- return lsa.sin6_port == port;
-+ return avahi_port_from_sockaddr((struct sockaddr*) &lsa) == port;
- }
-
- return 0;
diff --git a/net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch b/net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch
deleted file mode 100644
index 220e63fa2..000000000
--- a/net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig 2009-02-25 11:51:29 +0100
-+++ configure.ac 2009-02-25 11:55:47 +0100
-@@ -348,7 +348,7 @@
- # Solaris stuff
- AC_SEARCH_LIBS([inet_ntop],[nsl])
- AC_SEARCH_LIBS([recv],[socket])
-- AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__")
-+ AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__", [[#include <sys/socket.h>]])
-
- # Checks for library functions.
- AC_FUNC_MEMCMP
diff --git a/net-dns/avahi/files/avahi-0.6.24-libintl.patch b/net-dns/avahi/files/avahi-0.6.24-libintl.patch
deleted file mode 100644
index 3ad943ac1..000000000
--- a/net-dns/avahi/files/avahi-0.6.24-libintl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- avahi-common/Makefile.am.orig 2008-12-12 21:33:35 +0100
-+++ avahi-common/Makefile.am 2009-02-25 12:21:14 +0100
-@@ -71,7 +71,7 @@
- i18n.c i18n.h
-
- libavahi_common_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -DAVAHI_LOCALEDIR=\"$(avahilocaledir)\"
--libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBINTL)
-+libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(INTLLIBS)
- libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
-
- strlst_test_SOURCES = \
diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
deleted file mode 100644
index d8e743d47..000000000
--- a/net-dns/avahi/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
- <email>swegener@gentoo.org</email>
-</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='mdnsresponder-compat'>Enable compat libraries for
- mDNSResponder</flag>
-</use>
-</pkgmetadata>