Version bump, bug #404209.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x64D4CF24

4 files changed, 250 insertions, 5 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 284036543390..0e354f44f0e2 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.234 2012/10/07 14:33:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.235 2012/11/25 10:48:57 swegener Exp $
+
+*avahi-0.6.31 (25 Nov 2012)
+
+  25 Nov 2012; Sven Wegener <swegener@gentoo.org> +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@gentoo.org> avahi-0.6.30-r3.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #431830
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index f176d4fb1a69..8a3eeb8e762d 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -6,16 +6,19 @@ AUX autoipd.sh 1271 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed
 AUX avahi-0.6.30-automake-1.11.2.patch 3256 SHA256 bcfd79cb5c74c2ec17d7320d9302c6946282b36e306ab16261aec0de590a5423 SHA512 0e9603fd8389d9eb1f6ef66cdfffbd962f2ea98216613e323ff4ede00d8d0f13530607ac668e81c9c73a8e7ea9888e071bf1ed13e68b7bbc7dc890e1a7050fbe WHIRLPOOL 36b27ea86d162bd3e57561c2b3287daea23337067348c23f2b37862b1a6d356e2d7918d73f4e4235576d085637b035c0ac6f1bb099970957cfbdb8dc86a6e6fc
 AUX avahi-0.6.30-optional-gtk-utils.patch 2422 SHA256 1233ba93af567117091094921e5ba76f205b1d984fd5a97153c2004f8f0509e3 SHA512 3ea7f7cd0074286bbe474f783ea9638abef7f68d9466d4f5d4d3a0bc6624a43e48bb293f02f2dd08413d5dcf3f99161e0f45537c5f922b1a326375d40b574596 WHIRLPOOL 82a61a4bce9547e15d6370cd856ac020bcdf9ad220f20929d5c64909c0505406e09fa8503aa79c835477811be48e9c72fbcbfc12061c49722431db196c0cbb8c
 AUX avahi-0.6.30-parallel.patch 1348 SHA256 76dc507af0a6035881a0d5aaadfeea7a8aa1b598253e6671d3a5346f452b52d9 SHA512 826acb44f7164f7250604e9f97d6cc4e474d47d7712f29095fafba6de149bb636c4ef543b8c9b29b45922ee1f087495f8135d2c36740e16dd2eee53e509a6959 WHIRLPOOL cfcea707bb1cffa322815f68686a64f20929c884ec020617490642ab449fe56cb5eb99d7742284060f84490eb081b63f3fb8a20bc38630a2adbce80c74ee2f7a
+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.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f SHA512 1b0ad0d509fd5e18c651ebe432d4cc85a62cb96e0b240a769ea2f600944eb90d143e4e5abb9057f7bc1a421b4aa743cf483fe8a888b4f63cab61577eda08d7f4 WHIRLPOOL 0c503606adb07741c5ef30b0f8af858cac97e5bf6e36549ed41bb1c76884e27fe234dffe1f8320e7c5570a3cf0032351d6b4c3d2c8905a1be832cb1bdce562e9
+DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f
 EBUILD avahi-0.6.30-r1.ebuild 5552 SHA256 6d25ae9e5e2c8895f68b2ad98dadd5b4afdd8e87c8602eb872bc28adf15d76b7 SHA512 11931043c39d541f827b1d2ff973dbdb39b5d016bfe526037fe5dd4cc7703e2cd2097d3ff80875d1ecd208f2278aeeaf3f87b11df2a244d607ca2420d35f86d4 WHIRLPOOL e230b80c1c66be1172020d71ce763b343998aac4fc0e140f3e151ccfe7497396453c88471f115ff730fa59326ba46e0886230ee368ced1822df91043fb64d168
 EBUILD avahi-0.6.30-r3.ebuild 5937 SHA256 fcea3a3ad227c73b6cb6c1e0c5f6436f25b8674f30edc148dd64289e265609b2 SHA512 6a8581200869d43e7779e2cf5f467355da153f89061157b7d65d8ba9935b9bdc218b8dde26e72b08f6a7a615b8349675893dddb53031a2173a7260b23e38c9f4 WHIRLPOOL 212fcd4126ed8b72833a8e3ee9da9b10f1adefa5daa3ff4a74527955581a5b9c434d45ff2b48535d787f98e827cca72efe88cc4f717c96b699fb25373a015cb1
-MISC ChangeLog 34984 SHA256 328e69a28280ce826f0752bcdc99bab6c6e7a8c8eab36a4704d880d31abccc1f SHA512 a49433b1dd49019297edeee55cff8ddfedefe88fc5c62e9973189e5fcf1cc61c11940ca101cfd220809e5427d21e009eaf954e6c60fe1664d23b1a944868f481 WHIRLPOOL a26820ddfef5839e1a711a3f0100d576771e31355159cc8c4b0fff4b912bab0d7366f81726cb21e81b8f78792054bbe92ebe7078c0326ccdb200aed45b0937f0
+EBUILD avahi-0.6.31.ebuild 5932 SHA256 d01cd63a237cf63b1dcd07780d78389930145d3213bc97b38a81e2429c5ccc58 SHA512 c61f4a129924743f59814365ebb6366be0e1af31bbb2fd3ebc026b7bc02d8cef1f8a8cf8c9d21f356dbdc128e78af4b831a26050c9dace2e892e1a11ee9980b4 WHIRLPOOL 44d22500fcf7281b33c6f6e622cdb08adf6fe24ec4633c2c7be3a4171e1ea6255f2ade81dac71f073376cc26521c32f569310c46898a9a9ae65e7973ff9d5f52
+MISC ChangeLog 35163 SHA256 260d0b9fd0f0ecd686a5087c008448b1a1480e853acdfaa27a507e51845765a6 SHA512 bbeea672ae5def6ace7984552abf4b11ab15201b35802f8cac9034db154c74ba9c7cae61bb2b4afe50b2be40a2e0060fe7199138ddf934716e2b17535c08ee18 WHIRLPOOL 93bbd740a64bad1fc075769fe89f9422aff0fb781a19d1914bdb8edfa8f3485c52c233ee615c60874a3b849dd7a2a76d6222af7574de3e73f909eaf451e2fe42
 MISC metadata.xml 892 SHA256 37689509fa8cae032b27236bf754a0060a21c79c03faa11630f606996e6062cc SHA512 6570eb773de5a824f7c4613a9b269da4f11f479090858706c3940f6b85c79e9ef93a7be8ff1d0bf7010b1a574ac04195f965a7798774e38ca3ccd61245cd1eee WHIRLPOOL 76fda1a6e339216a2a4490d8e2416f88aa9cd1f42665ed32a06778a0f6a2b843701d2861c360d47815772768aba391d1eecb4a4a43107fc76a9111e26c2cd3ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBxktIACgkQuQc30/atMkDF/QCfeSgRmlV3+8mpXBt9Q0gz/TQ/
-cXMAn1sJjxrJPj39wPh79TRJ45sSEtVe
-=KYuD
+iEYEAREIAAYFAlCx95oACgkQI1lqEGTUzyRzlQCgkJZXPd3dTbvd07S+h0R+xmEm
+DRwAoMlG/buXM9DuURtm8QhMUdz7SrdK
+=EbLV
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.31.ebuild b/net-dns/avahi/avahi-0.6.31.ebuild
new file mode 100644
index 000000000000..1ebc619d96eb
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.31.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2012 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.ebuild,v 1.1 2012/11/25 10:48:57 swegener Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="python? 2"
+PYTHON_USE_WITH="gdbm"
+PYTHON_USE_WITH_OPT="python"
+
+WANT_AUTOMAKE=1.11
+
+inherit autotools eutils mono python multilib flag-o-matic user
+
+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"
+
+DBUS_DEPEND=">=sys-apps/dbus-0.30"
+COMMON_DEPEND=">=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 )
+	gtk3? ( x11-libs/gtk+:3 )
+	dbus? (
+		${DBUS_DEPEND}
+		python? ( dev-python/dbus-python )
+	)
+	mono? (
+		>=dev-lang/mono-1.1.10
+		gtk? ( >=dev-dotnet/gtk-sharp-2 )
+	)
+	howl-compat? ( ${DBUS_DEPEND} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	mdnsresponder-compat? ( ${DBUS_DEPEND} )
+	python? (
+		gtk? ( >=dev-python/pygtk-2 )
+	)
+	bookmarks? (
+		dev-python/twisted
+		dev-python/twisted-web
+	)
+	kernel_linux? ( sys-libs/libcap )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.5
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		mono? ( >=virtual/monodoc-1.1.8 )
+	)"
+RDEPEND="${COMMON_DEPEND}
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )"
+
+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
+
+	# FIXME: Use REQUIRED_USE once python.eclass gets EAPI 4 support, bug 372255
+	if use utils && ! { use gtk || use gtk3; }; then
+		ewarn "To install the avahi utilities, USE='gtk utils' or USE='gtk3 utils''"
+	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
+
+	# 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
+
+	# 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
+		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
+
+	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) \
+		${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
+
+	# /usr/bin/avahi-bookmarks is installed only with USE="bookmarks dbus gtk python".
+	# /usr/bin/avahi-discover is installed only with USE="dbus gtk python".
+	use dbus && use gtk && use python && python_convert_shebangs -r 2 "${ED}usr/bin"
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover)
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize avahi $(use dbus && use gtk && echo 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.31-install-exec-hook.patch b/net-dns/avahi/files/avahi-0.6.31-install-exec-hook.patch
new file mode 100644
index 000000000000..d9a7bc3434c7
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.31-install-exec-hook.patch
@@ -0,0 +1,11 @@
+--- 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 && \