[gentoo-commits] gentoo-x86 commit in net-dns/avahi: avahi-0.6.22.ebuild ChangeLog avahi-0.6.19-r2.ebuild avahi-0.6.20-r2.ebuild avahi-0.6.21.ebuild avahi-0.6.22-r1.ebuild

[Sven Wegener (swegener)]

swegener    08/01/03 17:53:11

  Modified:             avahi-0.6.22.ebuild ChangeLog
                        avahi-0.6.19-r2.ebuild avahi-0.6.20-r2.ebuild
                        avahi-0.6.21.ebuild
  Added:                avahi-0.6.22-r1.ebuild
  Log:
  Adjust gtk-sharp dependency, bug #203610. Add intltool dependency, bug #203369. Add automake patch submitted to upstream, bug #202968.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.3                  net-dns/avahi/avahi-0.6.22.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.22.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.22.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.22.ebuild?r1=1.2&r2=1.3

Index: avahi-0.6.22.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.22.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- avahi-0.6.22.ebuild	1 Jan 2008 19:57:12 -0000	1.2
+++ avahi-0.6.22.ebuild	3 Jan 2008 17:53:10 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 2000-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.22.ebuild,v 1.2 2008/01/01 19:57:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.22.ebuild,v 1.3 2008/01/03 17:53:10 swegener Exp $
 
 inherit eutils mono python qt3 qt4 multilib
 
@@ -37,7 +37,7 @@
 	)
 	mono? (
 		>=dev-lang/mono-1.1.10
-		gtk? ( dev-dotnet/gtk-sharp )
+		gtk? ( >=dev-dotnet/gtk-sharp-2 )
 	)
 	howl-compat? ( !net-misc/howl )
 	mdnsresponder-compat? ( !net-misc/mDNSResponder )
@@ -52,6 +52,7 @@
 	kernel_linux? ( sys-libs/libcap )
 	!net-misc/mDNSResponder"
 DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9.0
 	doc? (
 		app-doc/doxygen



1.134                net-dns/avahi/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.134&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/ChangeLog?rev=1.134&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/ChangeLog?r1=1.133&r2=1.134

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- ChangeLog	1 Jan 2008 19:57:12 -0000	1.133
+++ ChangeLog	3 Jan 2008 17:53:10 -0000	1.134
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.133 2008/01/01 19:57:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.134 2008/01/03 17:53:10 swegener Exp $
+
+*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:



1.7                  net-dns/avahi/avahi-0.6.19-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild?r1=1.6&r2=1.7

Index: avahi-0.6.19-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- avahi-0.6.19-r2.ebuild	1 Jan 2008 19:57:12 -0000	1.6
+++ avahi-0.6.19-r2.ebuild	3 Jan 2008 17:53:10 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild,v 1.6 2008/01/01 19:57:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild,v 1.7 2008/01/03 17:53:10 swegener Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="none"
@@ -40,7 +40,7 @@
 	)
 	mono? (
 		>=dev-lang/mono-1.1.10
-		gtk? ( dev-dotnet/gtk-sharp )
+		gtk? ( >=dev-dotnet/gtk-sharp-2 )
 	)
 	howl-compat? ( !net-misc/howl )
 	mdnsresponder-compat? ( !net-misc/mDNSResponder )
@@ -55,6 +55,7 @@
 	kernel_linux? ( sys-libs/libcap )
 	!net-misc/mDNSResponder"
 DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9.0
 	doc? (
 		app-doc/doxygen



1.7                  net-dns/avahi/avahi-0.6.20-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild?r1=1.6&r2=1.7

Index: avahi-0.6.20-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- avahi-0.6.20-r2.ebuild	1 Jan 2008 19:57:12 -0000	1.6
+++ avahi-0.6.20-r2.ebuild	3 Jan 2008 17:53:10 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 2000-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild,v 1.6 2008/01/01 19:57:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild,v 1.7 2008/01/03 17:53:10 swegener Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="none"
@@ -40,7 +40,7 @@
 	)
 	mono? (
 		>=dev-lang/mono-1.1.10
-		gtk? ( dev-dotnet/gtk-sharp )
+		gtk? ( >=dev-dotnet/gtk-sharp-2 )
 	)
 	howl-compat? ( !net-misc/howl )
 	mdnsresponder-compat? ( !net-misc/mDNSResponder )
@@ -55,6 +55,7 @@
 	kernel_linux? ( sys-libs/libcap )
 	!net-misc/mDNSResponder"
 DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9.0
 	doc? (
 		app-doc/doxygen



1.11                 net-dns/avahi/avahi-0.6.21.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild?r1=1.10&r2=1.11

Index: avahi-0.6.21.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- avahi-0.6.21.ebuild	1 Jan 2008 19:57:12 -0000	1.10
+++ avahi-0.6.21.ebuild	3 Jan 2008 17:53:10 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 2000-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v 1.10 2008/01/01 19:57:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v 1.11 2008/01/03 17:53:10 swegener Exp $
 
 inherit eutils mono python qt3 qt4 multilib
 
@@ -37,7 +37,7 @@
 	)
 	mono? (
 		>=dev-lang/mono-1.1.10
-		gtk? ( dev-dotnet/gtk-sharp )
+		gtk? ( >=dev-dotnet/gtk-sharp-2 )
 	)
 	howl-compat? ( !net-misc/howl )
 	mdnsresponder-compat? ( !net-misc/mDNSResponder )
@@ -52,6 +52,7 @@
 	kernel_linux? ( sys-libs/libcap )
 	!net-misc/mDNSResponder"
 DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9.0
 	doc? (
 		app-doc/doxygen



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

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

Index: avahi-0.6.22-r1.ebuild
===================================================================
# Copyright 2000-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.22-r1.ebuild,v 1.1 2008/01/03 17:53:10 swegener Exp $

WANT_AUTOMAKE="1.9"
WANT_AUTOCONF="none"

inherit eutils mono python qt3 qt4 multilib autotools

DESCRIPTION="System which facilitates service discovery on a local network"
HOMEPAGE="http://avahi.org/"
SRC_URI="http://avahi.org/download/${P}.tar.gz"

LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test ipv6"

RDEPEND=">=dev-libs/libdaemon-0.11-r1
	dev-libs/expat
	>=dev-libs/glib-2
	gdbm? ( sys-libs/gdbm )
	qt3? ( $(qt_min_version 3.3.6-r2) )
	qt4? ( $(qt4_min_version 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
				(
					<sys-apps/dbus-0.90
					>=sys-apps/dbus-0.30
				)
			)
		)
	)
	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 )
	!net-misc/mDNSResponder"
DEPEND="${RDEPEND}
	>=dev-util/intltool-0.35
	>=dev-util/pkgconfig-0.9.0
	doc? (
		app-doc/doxygen
		mono? ( >=dev-util/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
}

pkg_preinst() {
	enewgroup netdev
	enewgroup avahi
	enewuser avahi -1 -1 -1 avahi

	if use autoipd
	then
		enewgroup avahi-autoipd
		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
	fi
}

src_unpack() {
	unpack ${A}
	cd "${S}"

	epatch "${FILESDIR}"/${P}-vncviewer.patch
	epatch "${FILESDIR}"/${P}-gobject.patch

	eautomake

	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_compile() {
	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"
	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
	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() {
	use python && python_mod_optimize "${ROOT}"/usr/lib*/python*/site-packages/avahi

	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
}



-- 
gentoo-commits@g.o mailing list