public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-dns/avahi: avahi-0.6.27-r1.ebuild ChangeLog
@ 2010-08-10 20:40 Sven Wegener (swegener)
  0 siblings, 0 replies; 2+ messages in thread
From: Sven Wegener (swegener) @ 2010-08-10 20:40 UTC (permalink / raw
  To: gentoo-commits

swegener    10/08/10 20:40:06

  Modified:             ChangeLog
  Added:                avahi-0.6.27-r1.ebuild
  Log:
  Revert one commit that introduced compability for auto-activated services. This fixes bug #331275.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.182                net-dns/avahi/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.182&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.182&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?r1=1.181&r2=1.182

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- ChangeLog	3 Aug 2010 20:09:38 -0000	1.181
+++ ChangeLog	10 Aug 2010 20:40:05 -0000	1.182
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.181 2010/08/03 20:09:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.182 2010/08/10 20:40:05 swegener Exp $
+
+*avahi-0.6.27-r1 (10 Aug 2010)
+
+  10 Aug 2010; Sven Wegener <swegener@gentoo.org> +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)
 



1.1                  net-dns/avahi/avahi-0.6.27-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.27-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.27-r1.ebuild?rev=1.1&content-type=text/plain

Index: avahi-0.6.27-r1.ebuild
===================================================================
# 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.1 2010/08/10 20:40:05 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.4.0:2
		>=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

	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

	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
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-dns/avahi: avahi-0.6.27-r1.ebuild ChangeLog
@ 2010-08-11 14:18 Arun Raghavan (ford_prefect)
  0 siblings, 0 replies; 2+ messages in thread
From: Arun Raghavan (ford_prefect) @ 2010-08-11 14:18 UTC (permalink / raw
  To: gentoo-commits

ford_prefect    10/08/11 14:18:15

  Modified:             avahi-0.6.27-r1.ebuild ChangeLog
  Log:
  Disable introspection for now. Upstream ships a .gir file which is broken with >=gobject-introspection-0.9. (http://avahi.org/ticket/318)
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-dns/avahi/avahi-0.6.27-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.27-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.27-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/avahi-0.6.27-r1.ebuild?r1=1.1&r2=1.2

Index: avahi-0.6.27-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.27-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avahi-0.6.27-r1.ebuild	10 Aug 2010 20:40:05 -0000	1.1
+++ avahi-0.6.27-r1.ebuild	11 Aug 2010 14:18:15 -0000	1.2
@@ -1,6 +1,6 @@
 # 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.1 2010/08/10 20:40:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.27-r1.ebuild,v 1.2 2010/08/11 14:18:15 ford_prefect Exp $
 
 EAPI="3"
 
@@ -116,6 +116,9 @@
 	# 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 \
@@ -123,6 +126,7 @@
 		--disable-pygtk \
 		--disable-xmltoman \
 		--disable-monodoc \
+		--disable-introspection \
 		--enable-glib \
 		$(use_enable test tests) \
 		$(use_enable autoipd) \



1.183                net-dns/avahi/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.183&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.183&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/avahi/ChangeLog?r1=1.182&r2=1.183

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- ChangeLog	10 Aug 2010 20:40:05 -0000	1.182
+++ ChangeLog	11 Aug 2010 14:18:15 -0000	1.183
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.182 2010/08/10 20:40:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.183 2010/08/11 14:18:15 ford_prefect Exp $
+
+  11 Aug 2010; Arun Raghavan <ford_prefect@gentoo.org>
+  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)
 






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-08-11 14:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-10 20:40 [gentoo-commits] gentoo-x86 commit in net-dns/avahi: avahi-0.6.27-r1.ebuild ChangeLog Sven Wegener (swegener)
  -- strict thread matches above, loose matches on Subject: below --
2010-08-11 14:18 Arun Raghavan (ford_prefect)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox