Add USE=nls, bug #491206

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 238 insertions, 2 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index a8704c08b1e8..8686434133d2 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.258 2014/01/19 21:27:12 moult Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.259 2014/01/26 21:07:55 blueness Exp $
+
+*avahi-0.6.31-r3 (26 Jan 2014)
+
+  26 Jan 2014; Anthony G. Basile <blueness@gentoo.org> +avahi-0.6.31-r3.ebuild:
+  Add USE=nls, bug #491206
 
   19 Jan 2014; Dion Moult <moult@gentoo.org> avahi-0.6.30-r3.ebuild:
   Change virtual/monodoc dep to dev-lang/mono as former is treecleaned (bug
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index accd5a3bce92..e8234e8b2df1 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX autoipd-openrc.sh 700 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0 SHA512 a5dbbac4d6d1959db3a07a63acb7569dbeba33d2274a1dd3253dc27687549371611cf08bad3998d89efb3ace63b5541a4d225e484274450e0c82661f5a1dbc32 WHIRLPOOL e6b256655f64f557338ae5f79eaf98ead572d39cf90c76ca270dc54cee4b5edfc087326e5f04166eb2ff232ec2a8a5b87adadc8b3bd8b2ec2e3b6503ca39bee6
 AUX autoipd.sh 1271 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3 WHIRLPOOL b33889de73f571b18da092342be6a47e71d608466aa0d94fa3f0d8d7e373265767a62bdfb82df31059549e4ec0d05aacef89f1778ea561152fd5e1970072584c
 AUX avahi-0.6.30-automake-1.11.2.patch 3256 SHA256 bcfd79cb5c74c2ec17d7320d9302c6946282b36e306ab16261aec0de590a5423 SHA512 0e9603fd8389d9eb1f6ef66cdfffbd962f2ea98216613e323ff4ede00d8d0f13530607ac668e81c9c73a8e7ea9888e071bf1ed13e68b7bbc7dc890e1a7050fbe WHIRLPOOL 36b27ea86d162bd3e57561c2b3287daea23337067348c23f2b37862b1a6d356e2d7918d73f4e4235576d085637b035c0ac6f1bb099970957cfbdb8dc86a6e6fc
@@ -11,5 +14,23 @@ DIST avahi-0.6.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c399809
 DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f
 EBUILD avahi-0.6.30-r3.ebuild 5757 SHA256 997578a1d06db538a0d2b9fa3900d0343fef9c48638c7d39240b3c4cd8209cb9 SHA512 f7e1fe5bb1eae692d03396c9856286f88e248f93d19fe2002097a7cd397d760d14438ce11fb66f9fe8f589bb19f4e70862247447bd2e917ebac0c5c320427abb WHIRLPOOL 8a824c818e7a24e86cc4306d3dbc77e53a108a76c5ad5b138617c3ef270c04dceddc7e7e33b7cd441d80bc117aa4bf4d17e5c30fecbb516cdaea06fd7a7eb1bb
 EBUILD avahi-0.6.31-r2.ebuild 5123 SHA256 5d5ae5a9ed6c12504771313a52eb1400f0cc8eedc978dd608a47f54843509dad SHA512 c0987830ab4f150bdab6dd4dbabe8aeba7c588dce059e73d7f2348aaf1dd3cd3a8c5a13e9ed0a864275aed9962cbef6d86faf877622fef5957cdd8f37884c30c WHIRLPOOL 3da502aa806ddb3a4d27265d3a3f1776fb6f3906bf9c48ad9d7ad5070ca84ae190591f602d306d16a9251681e950b1e35a8b2101d9faba196cce6c8d0eb08582
-MISC ChangeLog 38500 SHA256 ebdf27025e0f920f021460a68b1c67807ae8343522a9366c7d57d080f312460d SHA512 e4c01f0270a337b2b2a77ea2878ca19eb0ac8e71b6c6e0ed7a18608bbc7dfa80fc80e30bcab94f620d6992818fc9157d8097ec89ecce4973bd3976f714585852 WHIRLPOOL bb9ca312cf825508d8444ef3020e43fa83dee7b8ca08a682004472476f4efb3d1f38c3b1596be534e71398ce519746f296a5fdefd3b5410a06c0a8e87532b698
+EBUILD avahi-0.6.31-r3.ebuild 5153 SHA256 c3efb7e451cf6c63fac6a867b33540c802ebc4cd59b63fe0101b8677aca3c212 SHA512 c40fa556c3486afc7f58f161285d7457072bd57fd081290fcbe90cbf0e174692dfe7fdae47b615add9ec3443b05d43754eafba5d71a6f200e4805237bd13f936 WHIRLPOOL 09c21d8c264b8bdd8b717b89987c22d514fc5e94a6995dfd72e45ddc07e7f0e77ee3c790eee7de1dc74ad1b907a37c6a4852865cd3394f176febc69e6d4634fa
+MISC ChangeLog 38643 SHA256 38b029eea7e98694c150468ca02c4a2259b239833c7ff0fc13dd2883d4c267e6 SHA512 37238d6fd0021ebab34d0ff5de7c7ebce7c19a6679bace73ffd0465da7fe434ba92244335310fe9402589a4e88dcff94012391c103b930167d65c859d8f1f90f WHIRLPOOL 06cd6d098d43eea2e12038690fdf39d5f2406dd2857ca7b9f676ab6ec429203aacbce2cd3b24544bbb41e9cfabe5f89759d7ebf6e3003ad4a85e1235195fdde4
 MISC metadata.xml 924 SHA256 f35a98d122e0ea6a5e9a491cd9327fc4fc0a752b4f5bb6bcf746c914eb0c42bb SHA512 c386ad5a44a2dc6bc8d9d62ed27381550ec9d62fa685f2cdc7857c7bbcc31baa00ec4481d3b2694eab32cb899314dd20603c917479b6deac132a5204cdae3d5a WHIRLPOOL e2893a1fc00d6649000904a8db99f50efabf8b1aecdab2fa0eec401204b593aeadf8eb13812c1ada324315a7f0d9b617a9b1c3174e7f7d07f2c94374c7034276
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJS5XlDAAoJEJOE+m71LUu6zFMQAKtDb8rjJ1OnXi/EggVTGDS2
+SyrzqTfn5THpfjwi5b9zp/wcp21zLQk8BYcP5GoxMLYZYcQ5u0N0Z8Cm//neNbvA
+BksWD5aRzLOLP56oHC+f6yl1z8wVj3FDJXjY+17xOsNCE2yGK67Z5386DGXUOFnV
+JuOEAeWLaw9oJS9e2gO10AVp8kJ7qxhU2+F4WQAvEI0BtfUGNVFo60WAIsGDcJMs
+P0YmCeqWVaNiv3He0Z3VVFiXtosKtUEKoGH/YmNOyBb+TEoqB1i3x9JpMWnLN70O
+tjLdgh45sJPROsfwAGxuPfmMD+Vudp2jt9QG/5s229ybgP4toZqaeypB4jePwGaI
+jOhEwgPQfHuMiCLuhLCexzdh2KgQpNgeLdspUxtyGB3GZG2Wk6bJzdLD6z1GllV1
+Y2fpe7GyA7QB3Cmm2wx7ITXMaSHz+EJ7vqLdHmvQRKJQaeaFEmPeiayXHz033RCX
+Uwvt95SN9BTIxH9VWAH/SX8HWKHooILU4LPDGRCNeLIcpsKvzIZI+Zn9aAVXTxaM
+bE+gYSKemGqWbcL9ZC3MmF3Pu51S8YA7TJBsj5aHoKJY0pswsaSPVYf6NOemeNo1
+LTLGU6SGBbYmejNFOO3ECXbn839LDm8Scb8Axj3ATrrfqsIYQ42MbLq+tG/24Nk7
+E96WsqSZnpvGOnMbPnSh
+=r+4i
+-----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.31-r3.ebuild b/net-dns/avahi/avahi-0.6.31-r3.ebuild
new file mode 100644
index 000000000000..acb14bb6105b
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.31-r3.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2014 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-r3.ebuild,v 1.1 2014/01/26 21:07:55 blueness Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="gdbm"
+
+WANT_AUTOMAKE=1.11
+
+inherit autotools eutils python-r1 multilib flag-o-matic user systemd
+
+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 nls python qt4 test utils"
+
+REQUIRED_USE="
+	utils? ( || ( gtk gtk3 ) )
+	python? ( dbus gdbm )
+	mono? ( dbus )
+	howl-compat? ( dbus )
+	mdnsresponder-compat? ( dbus )
+"
+
+COMMON_DEPEND="
+	dev-libs/libdaemon
+	dev-libs/expat
+	dev-libs/glib:2
+	gdbm? ( sys-libs/gdbm )
+	qt4? ( dev-qt/qtcore:4 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	dbus? ( sys-apps/dbus )
+	kernel_linux? ( sys-libs/libcap )
+	introspection? ( dev-libs/gobject-introspection )
+	mono? (
+		dev-lang/mono
+		gtk? ( dev-dotnet/gtk-sharp )
+	)
+	python? (
+		${PYTHON_DEPS}
+		gtk? ( dev-python/pygtk )
+		dbus? ( dev-python/dbus-python )
+	)
+	bookmarks? (
+		dev-python/twisted-core
+		dev-python/twisted-web
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )
+"
+
+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
+
+	# Backport host-name-from-machine-id patch, bug #466134
+	epatch "${FILESDIR}"/${P}-host-name-from-machine-id.patch
+
+	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
+	epatch "${FILESDIR}"/${P}-fix-install-avahi-discover.patch
+
+	# Drop DEPRECATED flags, bug #384743
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
+
+	# Fix references to Lennart's home directory, bug #466210
+	sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || 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
+		python_export_best
+		myconf+="
+			$(use_enable dbus python-dbus)
+			$(use_enable gtk pygtk)
+		"
+	fi
+
+	if use mono; then
+		myconf+=" $(use_enable doc monodoc)"
+	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 nls) \
+		$(use_enable introspection) \
+		$(use_enable utils gtk-utils) \
+		--disable-qt3 \
+		$(use_enable qt4) \
+		$(use_enable gdbm) \
+		$(systemd_with_unitdir) \
+		${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
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+	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
+}