diff options
author | Sven Wegener <swegener@gentoo.org> | 2011-03-12 13:32:21 +0000 |
---|---|---|
committer | Sven Wegener <swegener@gentoo.org> | 2011-03-12 13:32:21 +0000 |
commit | 6932114c0dd45576a499f44f5531146845b261db (patch) | |
tree | 9adc7f97a05c37b24d04b8c042b1783f1a00d367 /net-dns/avahi | |
parent | Cleanup. (diff) | |
download | historical-6932114c0dd45576a499f44f5531146845b261db.tar.gz historical-6932114c0dd45576a499f44f5531146845b261db.tar.bz2 historical-6932114c0dd45576a499f44f5531146845b261db.zip |
Cleanup.
Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64
Diffstat (limited to 'net-dns/avahi')
-rw-r--r-- | net-dns/avahi/ChangeLog | 8 | ||||
-rw-r--r-- | net-dns/avahi/Manifest | 11 | ||||
-rw-r--r-- | net-dns/avahi/avahi-0.6.25-r1.ebuild | 208 | ||||
-rw-r--r-- | net-dns/avahi/avahi-0.6.27-r1.ebuild | 204 | ||||
-rw-r--r-- | net-dns/avahi/avahi-0.6.27.ebuild | 198 | ||||
-rw-r--r-- | net-dns/avahi/avahi-0.6.28.ebuild | 200 | ||||
-rw-r--r-- | net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch | 11 | ||||
-rw-r--r-- | net-dns/avahi/files/avahi-0.6.24-libintl.patch | 11 | ||||
-rw-r--r-- | net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch | 37 |
9 files changed, 8 insertions, 880 deletions
diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog index 7238b990f3e2..2711f0cca6da 100644 --- a/net-dns/avahi/ChangeLog +++ b/net-dns/avahi/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-dns/avahi # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.199 2011/03/05 13:42:05 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.200 2011/03/12 13:32:20 swegener Exp $ + + 12 Mar 2011; Sven Wegener <swegener@gentoo.org> + -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@gentoo.org> avahi-0.6.28-r1.ebuild: alpha/arm/ia64/s390/sh/sparc stable wrt #355583 diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest index a296a6294842..81785a30a358 100644 --- a/net-dns/avahi/Manifest +++ b/net-dns/avahi/Manifest @@ -1,17 +1,8 @@ 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-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-0.6.27-no-auto-activated.patch 1677 RMD160 c5abd8cab9872c22b57de2158c3cb3117722b206 SHA1 2158ca2c25aa8f81dbb6d376ff00a3ed26932e4b SHA256 907ccacfaf118e88a750ff3699e53b4efed7661bb3d09722f04fc389fe46f12b AUX avahi-0.6.28-CVE-2011-1002.patch 2076 RMD160 0b561a78e75099a14e7a3da5290cd1ffa6a75533 SHA1 6d298861d7c7b432cd350f3df277e43ed59b378b SHA256 bf8422b278c0c66eca063672c4836346a4d85cb16014882ca3003b0a79ba9f97 AUX netlink-request-all-matches-when-requesting-interface.patch 1642 RMD160 b8c1987c35e2d7fde63ee3971bb6e5cafe37ae43 SHA1 44fe78fda6a2cdfbb92654164fa421450aaec68a SHA256 9b91094b8316d8125a2dc2b118c406e2ae8e5f7760089a041bbf539ff44dc12f -DIST avahi-0.6.25.tar.gz 1103653 RMD160 3025f774360a8ea3b9de87e2df0b00387569aaf2 SHA1 7ce8ed5a494d72401dd81f64594fda59d2ec91fd SHA256 9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59 -DIST avahi-0.6.27.tar.gz 1217974 RMD160 36e6a242f0c926351e31871d8a4f8a52a501fdc3 SHA1 e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b SHA256 c22df5e0b0d695bfe3cc52545bf0affc1c52060818a5a65d70055e320bc45e84 DIST avahi-0.6.28.tar.gz 1238660 RMD160 d61b370baa3f25d57efba43f2c34b54cab7e7e9e SHA1 5da3f7da2cff8ddf74f8746e4dcb2524e5047f67 SHA256 a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91 -EBUILD avahi-0.6.25-r1.ebuild 4969 RMD160 93b0bb1c0f87637f7485081fa6647ecaa0ce15dd SHA1 a4ee3e21b81e432b2a1c6f4d26471a0a445f1b7a SHA256 d72e398f421fd87996dfd0d8ebe55190427fb9ec1083b2a499de1e964d3f7a6b -EBUILD avahi-0.6.27-r1.ebuild 4871 RMD160 053b02c70371f9b197e983c70b7e5265f8f988eb SHA1 ffcc35d3e3532f20585934808e868dd4ba8db15e SHA256 913f4cf3becf8345e6c9a9888163d6fbe33aea49a06313e4e6a3a4c15e699542 -EBUILD avahi-0.6.27.ebuild 4618 RMD160 097694af948068f26992569ee32ed475b051ba50 SHA1 f3e5906e4f5f4ef03683172056254de37a5d0041 SHA256 4461291256d37728553ae17766437422b55cd1bcf340d32ce3bbf076fc7b5acf EBUILD avahi-0.6.28-r1.ebuild 4934 RMD160 7ebe1201b97f00f08a330211f8f81b07e3d17250 SHA1 4bc99179361a3a55234dbd6f646ce958bbe96e61 SHA256 fb564902531fd9e2059456b2e4659ac0f66ca6e8c1dc0911b9c7fc1cf6c1eed5 -EBUILD avahi-0.6.28.ebuild 4834 RMD160 661b6823f941606bf4b9e798c4b41ae9a684076f SHA1 af6026f849905b6b16c3e4910b671ab7c793dd7f SHA256 81eb492644ab25e0026e0ec399c12765011f586364343c8e5294c12b1f6c6366 -MISC ChangeLog 29596 RMD160 78185b751ea23f7813895df322ba8e7e929d0964 SHA1 ffb0d6271aa08543c187b9b0c86a193b11c4130f SHA256 a579103d1bd38a1cd6bc50f4538c6165c8d319b0cb9d2a8d126d85e830069909 +MISC ChangeLog 29877 RMD160 8db6b28f022bbb342b59f5ebfce2193524fd6124 SHA1 02ddd5f5c209136d387fc49e00197328cd16d44b SHA256 50b896ecd0ad9e20cd3fb84bcd5b6ab2bea3b9e78788e432e58b56d894523974 MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa diff --git a/net-dns/avahi/avahi-0.6.25-r1.ebuild b/net-dns/avahi/avahi-0.6.25-r1.ebuild deleted file mode 100644 index 560c8f635c9f..000000000000 --- a/net-dns/avahi/avahi-0.6.25-r1.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 1999-2010 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-r1.ebuild,v 1.10 2010/08/29 17:48:19 armin76 Exp $ - -EAPI="3" - -PYTHON_DEPEND="python? 2" -PYTHON_USE_WITH="gdbm" -PYTHON_USE_WITH_OPT="python" - -inherit eutils mono python multilib autotools flag-o-matic - -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 qt4 autoipd kernel_linux test ipv6" - -RDEPEND=">=dev-libs/libdaemon-0.11-r1 - dev-libs/expat - >=dev-libs/glib-2 - gdbm? ( sys-libs/gdbm ) - qt4? ( x11-libs/qt-core:4 ) - gtk? ( - >=x11-libs/gtk+-2.4.0 - >=gnome-base/libglade-2.4.0 - ) - dbus? ( - >=sys-apps/dbus-0.30 - python? ( dev-python/dbus-python ) - ) - mono? ( - >=dev-lang/mono-1.1.10 - gtk? ( >=dev-dotnet/gtk-sharp-2 ) - ) - howl-compat? ( !net-misc/howl ) - mdnsresponder-compat? ( !net-misc/mDNSResponder ) - python? ( - gtk? ( >=dev-python/pygtk-2 ) - ) - bookmarks? ( - dev-python/twisted - dev-python/twisted-web - ) - kernel_linux? ( sys-libs/libcap )" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40.5 - >=dev-util/pkgconfig-0.9.0 - doc? ( - app-doc/doxygen - mono? ( >=virtual/monodoc-1.1.8 ) - )" - -pkg_setup() { - if use python - then - python_set_active_version 2 - python_pkg_setup - 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_prepare() { - 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 - - # Fix intltoolize broken file, see GNOME upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed" - - 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 -} - -src_configure() { - 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) \ - --disable-qt3 \ - $(use_enable qt4) \ - $(use_enable gdbm) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - use doc && emake avahi.devhelp -} - -src_install() { - emake install py_compile=true DESTDIR="${D}" || die "make install failed" - use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks - - use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc - use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h - - if use autoipd - then - insinto /$(get_libdir)/rcscripts/net - doins "${FILESDIR}"/autoipd.sh - - insinto /$(get_libdir)/rc/net - newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh - fi - - dodoc docs/{AUTHORS,NEWS,README,TODO} - - if use doc - then - dohtml -r doxygen/html/. - insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp - fi -} - -pkg_postrm() { - if use python; then - python_mod_cleanup avahi avahi_discover - fi -} - -pkg_postinst() { - if use python; then - python_mod_optimize avahi avahi_discover - 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.27-r1.ebuild b/net-dns/avahi/avahi-0.6.27-r1.ebuild deleted file mode 100644 index b04a8e03d21b..000000000000 --- a/net-dns/avahi/avahi-0.6.27-r1.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.27-r1.ebuild,v 1.3 2010/12/14 00:27:52 swegener Exp $ - -EAPI="3" - -PYTHON_DEPEND="python? 2" -PYTHON_USE_WITH="gdbm" -PYTHON_USE_WITH_OPT="python" - -inherit eutils mono python multilib flag-o-matic - -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 qt4 autoipd kernel_linux test ipv6" - -RDEPEND=">=dev-libs/libdaemon-0.11-r1 - dev-libs/expat - >=dev-libs/glib-2 - gdbm? ( sys-libs/gdbm ) - qt4? ( x11-libs/qt-core:4 ) - gtk? ( - >=x11-libs/gtk+-2.14.0:2 - ) - dbus? ( - >=sys-apps/dbus-0.30 - python? ( dev-python/dbus-python ) - ) - mono? ( - >=dev-lang/mono-1.1.10 - gtk? ( >=dev-dotnet/gtk-sharp-2 ) - ) - howl-compat? ( !net-misc/howl ) - mdnsresponder-compat? ( !net-misc/mDNSResponder ) - python? ( - gtk? ( >=dev-python/pygtk-2 ) - ) - bookmarks? ( - dev-python/twisted - dev-python/twisted-web - ) - kernel_linux? ( sys-libs/libcap )" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40.5 - >=dev-util/pkgconfig-0.9.0 - doc? ( - app-doc/doxygen - mono? ( >=virtual/monodoc-1.1.8 ) - )" - -pkg_setup() { - if use python - then - python_set_active_version 2 - python_pkg_setup - 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_prepare() { - 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 - - epatch "${FILESDIR}"/${P}-no-auto-activated.patch -} - -src_configure() { - 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 - - # Upstream ships a gir file (AvahiCore.gir) which does not work with - # >=gobject-introspection-0.9, so we disable introspection for now. - # http://avahi.org/ticket/318 - econf \ - --localstatedir=/var \ - --with-distro=gentoo \ - --disable-python-dbus \ - --disable-pygtk \ - --disable-xmltoman \ - --disable-monodoc \ - --disable-introspection \ - --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) \ - --disable-gtk3 \ - $(use_enable gtk) \ - --disable-qt3 \ - $(use_enable qt4) \ - $(use_enable gdbm) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - use doc && emake avahi.devhelp -} - -src_install() { - emake install py_compile=true DESTDIR="${D}" || die "make install failed" - use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks - - use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc - use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h - - if use autoipd - then - insinto /$(get_libdir)/rcscripts/net - doins "${FILESDIR}"/autoipd.sh - - insinto /$(get_libdir)/rc/net - newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh - fi - - dodoc docs/{AUTHORS,NEWS,README,TODO} - - if use doc - then - dohtml -r doxygen/html/. - insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp - fi -} - -pkg_postrm() { - if use python; then - python_mod_cleanup avahi avahi_discover - fi -} - -pkg_postinst() { - if use python; then - python_mod_optimize avahi avahi_discover - 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.27.ebuild b/net-dns/avahi/avahi-0.6.27.ebuild deleted file mode 100644 index a55d2a023eff..000000000000 --- a/net-dns/avahi/avahi-0.6.27.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.27.ebuild,v 1.2 2010/12/14 00:27:52 swegener Exp $ - -EAPI="3" - -PYTHON_DEPEND="python? 2" -PYTHON_USE_WITH="gdbm" -PYTHON_USE_WITH_OPT="python" - -inherit eutils mono python multilib flag-o-matic - -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 qt4 autoipd kernel_linux test ipv6" - -RDEPEND=">=dev-libs/libdaemon-0.11-r1 - dev-libs/expat - >=dev-libs/glib-2 - gdbm? ( sys-libs/gdbm ) - qt4? ( x11-libs/qt-core:4 ) - gtk? ( - >=x11-libs/gtk+-2.14.0:2 - ) - dbus? ( - >=sys-apps/dbus-0.30 - python? ( dev-python/dbus-python ) - ) - mono? ( - >=dev-lang/mono-1.1.10 - gtk? ( >=dev-dotnet/gtk-sharp-2 ) - ) - howl-compat? ( !net-misc/howl ) - mdnsresponder-compat? ( !net-misc/mDNSResponder ) - python? ( - gtk? ( >=dev-python/pygtk-2 ) - ) - bookmarks? ( - dev-python/twisted - dev-python/twisted-web - ) - kernel_linux? ( sys-libs/libcap )" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40.5 - >=dev-util/pkgconfig-0.9.0 - doc? ( - app-doc/doxygen - mono? ( >=virtual/monodoc-1.1.8 ) - )" - -pkg_setup() { - if use python - then - python_set_active_version 2 - python_pkg_setup - 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_prepare() { - use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf - - sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl -} - -src_configure() { - 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) \ - --disable-gtk3 \ - $(use_enable gtk) \ - --disable-qt3 \ - $(use_enable qt4) \ - $(use_enable gdbm) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - use doc && emake avahi.devhelp -} - -src_install() { - emake install py_compile=true DESTDIR="${D}" || die "make install failed" - use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks - - use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc - use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h - - if use autoipd - then - insinto /$(get_libdir)/rcscripts/net - doins "${FILESDIR}"/autoipd.sh - - insinto /$(get_libdir)/rc/net - newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh - fi - - dodoc docs/{AUTHORS,NEWS,README,TODO} - - if use doc - then - dohtml -r doxygen/html/. - insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp - fi -} - -pkg_postrm() { - if use python; then - python_mod_cleanup avahi avahi_discover - fi -} - -pkg_postinst() { - if use python; then - python_mod_optimize avahi avahi_discover - 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.28.ebuild b/net-dns/avahi/avahi-0.6.28.ebuild deleted file mode 100644 index fe770c7371e0..000000000000 --- a/net-dns/avahi/avahi-0.6.28.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28.ebuild,v 1.6 2011/01/23 20:24:45 swegener Exp $ - -EAPI="3" - -PYTHON_DEPEND="python? 2" -PYTHON_USE_WITH="gdbm" -PYTHON_USE_WITH_OPT="python" - -inherit eutils mono python multilib flag-o-matic - -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="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux mdnsresponder-compat mono python qt4 test " - -DBUS_DEPEND=">=sys-apps/dbus-0.30" -RDEPEND=">=dev-libs/libdaemon-0.14 - dev-libs/expat - >=dev-libs/glib-2 - gdbm? ( sys-libs/gdbm ) - qt4? ( x11-libs/qt-core:4 ) - gtk? ( - >=x11-libs/gtk+-2.14.0:2 - ) - dbus? ( - ${DBUS_DEPEND} - python? ( dev-python/dbus-python ) - ) - mono? ( - >=dev-lang/mono-1.1.10 - gtk? ( >=dev-dotnet/gtk-sharp-2 ) - ) - howl-compat? ( - !net-misc/howl - ${DBUS_DEPEND} - ) - mdnsresponder-compat? ( - !net-misc/mDNSResponder - ${DBUS_DEPEND} - ) - python? ( - gtk? ( >=dev-python/pygtk-2 ) - ) - bookmarks? ( - dev-python/twisted - dev-python/twisted-web - ) - kernel_linux? ( sys-libs/libcap )" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40.5 - >=dev-util/pkgconfig-0.9.0 - doc? ( - app-doc/doxygen - mono? ( >=virtual/monodoc-1.1.8 ) - )" - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi - - if use python && ! use dbus && ! use gtk; then - ewarn "For proper python support you should also enable 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_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 - - epatch "${FILESDIR}"/netlink-request-all-matches-when-requesting-interface.patch -} - -src_configure() { - use sh && replace-flags -O? -O0 - - local myconf="" - - if use python; then - myconf+=" - $(use_enable dbus python-dbus) - $(use_enable gtk pygtk) - " - fi - - if use mono; then - myconf+=" $(use_enable doc monodoc)" - fi - - # these require dbus enabled - if use mdnsresponder-compat || use howl-compat || use mono; then - myconf+=" --enable-dbus" - fi - - # We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module - unset DISPLAY - - # Upstream ships a gir file (AvahiCore.gir) which does not work with - # >=gobject-introspection-0.9, so we disable introspection for now. - # http://avahi.org/ticket/318 - econf \ - --localstatedir=/var \ - --with-distro=gentoo \ - --disable-python-dbus \ - --disable-pygtk \ - --disable-xmltoman \ - --disable-monodoc \ - --disable-introspection \ - --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) \ - --disable-gtk3 \ - $(use_enable gtk) \ - --disable-qt3 \ - $(use_enable qt4) \ - $(use_enable gdbm) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - use doc && { emake avahi.devhelp || die ; } -} - -src_install() { - emake install py_compile=true DESTDIR="${D}" || die "make install failed" - use bookmarks && use python && use dbus && use gtk || \ - 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 || 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 -} - -pkg_postrm() { - use python && python_mod_cleanup avahi avahi_discover -} - -pkg_postinst() { - use python && python_mod_optimize avahi avahi_discover - - if use autoipd; then - echo - elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" - elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!" - fi - - if use dbus; then - echo - 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!" - fi -} 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 220e63fa24f3..000000000000 --- 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 3ad943ac130c..000000000000 --- 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/files/avahi-0.6.27-no-auto-activated.patch b/net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch deleted file mode 100644 index 8a37cd7f3282..000000000000 --- a/net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git b/avahi-client/client.c a/avahi-client/client.c -index 2b29480..6435723 100644 ---- b/avahi-client/client.c -+++ a/avahi-client/client.c -@@ -141,10 +141,9 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message, - - if (strcmp(name, AVAHI_DBUS_NAME) == 0) { - -- if (old[0] && -- avahi_client_is_connected(client)) { -+ if (avahi_client_is_connected(client)) { - -- /* Regardless if the server lost its name or -+ /* Regardless if the server lost or acquired its name or - * if the name was transfered: our services are no longer - * available, so we disconnect ourselves */ - avahi_client_set_errno(client, AVAHI_ERR_DISCONNECTED); -@@ -523,7 +522,7 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags, - goto fail; - } - -- if (!dbus_connection_add_filter(client->bus, filter_func, client, NULL)) { -+ if (!dbus_connection_add_filter (client->bus, filter_func, client, NULL)) { - if (ret_error) - *ret_error = AVAHI_ERR_NO_MEMORY; - goto fail; -@@ -560,7 +559,9 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags, - if (dbus_error_is_set(&error)) - goto fail; - -- if (!dbus_bus_start_service_by_name(client->bus, AVAHI_DBUS_NAME, 0, NULL, &error)) { -+ -+ if (!(dbus_bus_name_has_owner(client->bus, AVAHI_DBUS_NAME, &error)) || -+ dbus_error_is_set(&error)) { - - /* We free the error so its not set, that way the fail target - * will return the NO_DAEMON error rather than a DBUS error */ |