Fix bug #501664

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

4 files changed, 47 insertions, 18 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 706eb0f5ab80..62ac19770133 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.266 2014/08/03 17:45:35 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.267 2014/08/20 17:20:13 blueness Exp $
+
+  20 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/avahi-0.6.31-fix-locale-build.patch, avahi-0.6.31-r5.ebuild:
+  Fix bug #501664
 
   03 Aug 2014;  <tgall@gentoo.org> avahi-0.6.31-r2.ebuild,
   avahi-0.6.31-r5.ebuild:
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index aa274955c9d3..e1ccbf4049e3 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -8,6 +8,7 @@ AUX avahi-0.6.30-optional-gtk-utils.patch 2422 SHA256 1233ba93af567117091094921e
 AUX avahi-0.6.30-parallel.patch 1348 SHA256 76dc507af0a6035881a0d5aaadfeea7a8aa1b598253e6671d3a5346f452b52d9 SHA512 826acb44f7164f7250604e9f97d6cc4e474d47d7712f29095fafba6de149bb636c4ef543b8c9b29b45922ee1f087495f8135d2c36740e16dd2eee53e509a6959 WHIRLPOOL cfcea707bb1cffa322815f68686a64f20929c884ec020617490642ab449fe56cb5eb99d7742284060f84490eb081b63f3fb8a20bc38630a2adbce80c74ee2f7a
 AUX avahi-0.6.31-build-client-without-daemon.patch 738 SHA256 d3d1d451886f7bcd7c20cb2c29ec9b5f59ead4ee9567f40d9820ec2275a01a85 SHA512 0d7ab88560eed40bb04360442b4daba6aa58d9f7f7d60b64c0e47b86ff0e6f2fcc8ccc7fbeab9ed87f77eedfde3814d37f82da9ae010223ef0e81e5b64d34b04 WHIRLPOOL caee48616992cfaf71bd5b7b7b90bd0a179a17ab7b2eb60a04026bc099ad2a611f107cf21a634b2cdaf0f15bcbb44523a7eef84cd692e653f537a1bc1501aacc
 AUX avahi-0.6.31-fix-install-avahi-discover.patch 715 SHA256 79da591066f1ddb454f4d7b7ed7163a0d13c332462ac0c2db3e8a6cd130f8441 SHA512 0cdcf41bbd25caea84a62054c4081dfdba1d421cef56babebe33f480a8ba9af1362c7b698803c17132ee78716439ec70cd5d71f7c85b5d49ba9bda471466cb79 WHIRLPOOL 3b5aa85769688a070707e2a03cccbb4861465bad7b03f5d6e34819dbe2dda5934b332934102616d0a0910cddf80150497f15df19d53726850e1a64d0c48e34d9
+AUX avahi-0.6.31-fix-locale-build.patch 1154 SHA256 50fec589be9c40d1cd26d4b5d6a68fcc9f849a691265533236ad7b238fa21abe SHA512 b969378e596470f2465d63ebb3c66bb13bb3e7d9df8523abc76339b62a00967c58921f87b2b95a3c28f884ab4dc79ea5d2675cb052b99cd9a426c410b75734d8 WHIRLPOOL a98aac36801ffaa816aaee010ff8bb10f37e5202901b81bf6daef0e7f411a135d836a2254b65a4229f1cff8466d4c1f613af925311f02be0fa03aec15ba31b8d
 AUX avahi-0.6.31-host-name-from-machine-id.patch 3001 SHA256 257685dde4c7dc78b9fbfeab5f213a94121c8bff6ae8fff99a9aae7eeaa34442 SHA512 659d36b06bf721664105bf51a1610186700004dea2af5dc43e29a8d688e903fb0c69416b1b98957de902901fc5ed04fdd252d30e23f680608608e6f633b94b17 WHIRLPOOL e258af6f138ab7b838a8886d74b73f8d44aefea981bd3e876cca41a144081ad4d199f9ba4031fda71c5d78578869fadd1b226a11b101df406fa2d85911d06e81
 AUX avahi-0.6.31-install-exec-hook.patch 507 SHA256 5411262dd719e647ab7781d2e10ff05d051ff1d7218d58e5bf3a3fbe8628a439 SHA512 c25802f78b5c2f6cc15705c6e426b6590dbcdf30d33e239bd919e9592c5e72c7fb244726e74addfeff4b81fa41cc62afb3ddb880232fea66f3cc9470bb5940b1 WHIRLPOOL 864804ca378b2ef83766ba10e08998f0524ed8c2f6c5fe491eefe88dac2184a3b20848258cd7d19af10a50bbbe8567928c3762b00896bb32b18fda6a4d117c19
 AUX avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch 1265 SHA256 24954a76f0dfdffc9a079072f8f4d50e292f8ae2a2b8e5a49f488519057c51b0 SHA512 f575e3ba1c704ec3bf92ffd8344a104f35026e6738720955caa23549f602f491c5e209188c5c00189b269e79e6120021d02cc07fbdea22a7c99ce7682f017fe7 WHIRLPOOL f0859f44face57b0eefb6858203bbfa73d6c4be2aa684911d3a152eeca93f972eb81650c4c307b96cd5764c1b12ade6624574331c944db259159bc9321092edb
@@ -18,24 +19,23 @@ EBUILD avahi-0.6.30-r3.ebuild 5804 SHA256 e4fd4ef76c2e6ba2803086500ce095cfd1760f
 EBUILD avahi-0.6.31-r2.ebuild 5173 SHA256 008708915ea5073e8bb58301efc2c3df85cc7327860320d130f3849ca88baecb SHA512 01b5ae7a03e3d0d8e4079515d3adc1b05d032bd7ed6db3b20423ddca7cf54326e1441086515f7cbb7e94d300ce34d5e23d1ba0ecfe5c49eee1af84a82f6f7d42 WHIRLPOOL 2aa4d3410fce721882f28042f334d55ac8950406be5094305955237169b9f61ff8737bda4255cc8c8b70ac1aa6d4d4dcf7e719ab19a65621341b2df6b77d7497
 EBUILD avahi-0.6.31-r3.ebuild 5255 SHA256 c9da5ed88584cdc2e1ef95df1627e09379a283c1a9d2863e3a0804835a11c242 SHA512 0db2f9c94813d165a27918891492f7b48df86689249c0c4b11694d4e63a3bb7e3174f40511a65d74a539b339e22de48ddc57d88ff6c5d4ef467b144907a2b110 WHIRLPOOL 753137e4a338cf224a0de494908b8dcb5d24ca5fbf15f84b2a56601c289248074963e7fd0d8a9b60a37f7ecd27239d259650b6ba4257a2eecfd0edb5029c3764
 EBUILD avahi-0.6.31-r4.ebuild 5334 SHA256 ee5cd08397062bd8190ce172b2c97dae3f41f31659cef17636071c0d737408ad SHA512 6e27172b840f21511a2e5f5d4e5ce9246486419ae7916b8053b5f372ecf36e7f3001847df663aff9cbedac7c33e1e29141fa6cd6bf6e63e21695d5815695b186 WHIRLPOOL 2115631ca7cf538d5cb9a9a94d8cbaabde4ed81fd49c3c515f127fed16c9fdfa8a64f4922abf63f345c49fda9e167456309d31adb6d3a2a83a37de6281d6a97d
-EBUILD avahi-0.6.31-r5.ebuild 6241 SHA256 83add7cbbfd5e253e3df1e02d83b3a45c1cd76ab5eb1e9efebc75b269c114bab SHA512 d347952c6580d9771cdfcf4c12548e7e9d29e757ee389f3cfc58771df27a59b7e83c85357b36114a5a381814a7ef0f3a29f6e983cc42da0a3af2449343200a7e WHIRLPOOL 4e8dd606e0e9c7d5cf3eed0209327228187cd507e68c652ae99ba7a8e8b106c202fb5b18f4b1f72afc5b4e882344fefa2c023bd77b084982d5c0a8131ddaf110
-MISC ChangeLog 39926 SHA256 92c76674298bee81d623f4226c838dc9f4540a54158ee8ec3145d04147096b92 SHA512 012491b1fdc9cbcf77f9ab15ac5855c26dcd5ad31cd7d1bd18a19bf4466a5dba1d1401cd339eb07b9461d52181a724a049b2ea4338df6d76f15e665c33942b73 WHIRLPOOL 25a965e4b6c456ca5cb6aa452cbe1a23693451d6a544f23c50493701ef8f67e727dff98f632bdf5577e205a1da80f250776f82ee8fbdb6297d48dc36210ba3d1
+EBUILD avahi-0.6.31-r5.ebuild 6343 SHA256 946ddf3388b66ac5b24317b27a441c91e0da5151d16ef57a0084a041a5ab191f SHA512 d5142ebfb2402e2ee95d988f9775eeb3ec642ab989e99eac8ceeb36d0fd03815b72e49a3cb882b0dad82901dba92c3fba5d2cba77e3bd4672698764425596a36 WHIRLPOOL cc5d03eb4ce00f366d023c24cec79fc921c8f24fed19c622374348ab6aa9838372fb2e1592997e1be1018f41824341b0ad377b53db6b8815eb4ba51f88f37b70
+MISC ChangeLog 40073 SHA256 97fab0cec059a90c673206d05ff83336fa94439311da90c0a6a62de138ba943a SHA512 cd382818e4a2868d992e5a1d6a77f7a907d7515710ea0bb61c36720993a33b621c5615aa1c802bccb9503c0b4ae32e5c447f0aac7d91d41b8352cf603da01a91 WHIRLPOOL 5f016f8e251eea718db18abc345e9e33e02436614de33f74c5011124536bd00ee31064d98a3cae1f6fa6c95acd80a1b0ecd829167cd09fec5c255175d97ad9ee
 MISC metadata.xml 924 SHA256 f35a98d122e0ea6a5e9a491cd9327fc4fc0a752b4f5bb6bcf746c914eb0c42bb SHA512 c386ad5a44a2dc6bc8d9d62ed27381550ec9d62fa685f2cdc7857c7bbcc31baa00ec4481d3b2694eab32cb899314dd20603c917479b6deac132a5204cdae3d5a WHIRLPOOL e2893a1fc00d6649000904a8db99f50efabf8b1aecdab2fa0eec401204b593aeadf8eb13812c1ada324315a7f0d9b617a9b1c3174e7f7d07f2c94374c7034276
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
-Comment: GPGTools - https://gpgtools.org
 
-iQIcBAEBCAAGBQJT3nVBAAoJED/EDWHtqUmqdIIP/2LPULRAJweAi7nPDmdG7iLw
-YzGFspe1k8eJMii2SXqQiY7dGuAxJtq+sRSioM0M86hKAdnJqLsmUHXPAX+Ck88F
-/qqMFKVBp6aIzaAgXQ7M8lr5s9CzgGvXiArmINrKPCtK5Ik8EoouTdIwFhcJ9bBz
-DW/ULlH3E9w4Cnx2BiFWo3otWAVJjpNAw863EB4k6dcrE3MTwNgsc/4SflAu+lGs
-Qak+FdnB8JJWcO953UBpclDsTTeZAjp7Hw+Zl0eB0jdKpC04hNPtgvgXQumj9V8j
-9y9ICt5jriAmNfR4fVkRAvW9Q++527bT6VjmUHHvW0Eh5L1hhJohpji4VP+xKRVp
-lUO4eMeXYuO7jn6Q9iFklsm5O2WFuh3OPOp91nO9iMEi1EH2qKTcRJjchVzK60o1
-+dJL1D1IOUGXOk85Xb6iDxcrLlclfvtrKNi02nfsotrzt6WxfypFBOaHUvtnd6JJ
-6w2XvJsvajjFXYjI03eSo+Ws6gE9zTBqNa5ZeZ0L3wU9SjBGfpl7W6MRKLOKrn+T
-Qvezh1QwwC4n2TWiCk+D0WphTXk5uAe3l/8js0YUEixha3cHwK/nSZim4mLg6zvj
-aeqtp/CdrH/spw/WqMzMobmqkNkYNZaM5MItfMpiAfm5wemSY4F0bnzG6XKtQik6
-w8PF6+Ugn3dQwtBMPFoa
-=72Rv
+iQIcBAEBCAAGBQJT9NlkAAoJEJOE+m71LUu6ZUAP/2vGOmoSq9+hBgI6uc0d8w8N
+kpnqhoF37Kxqg/7PsM0vSjdmLRg+aV3cals4UAVS8xhDzE0aOwpWpzWVAA44FvWy
+JqrWs2xPv7bhSDwqG9EeglJxiTgIQLXvj4mGmayIe7TcQeSWk4Xl2wpQEqGP+rIi
++f+d19488l15a51ow9gIdKCyFi8OFxEZeOc4yZN2lpm9wPy7jIHJcQWVibTJCqAG
+2Ca88i1zALv9iUw8upaXXQ8h3SfcKfaLxD4EB7ctQygXKAmtCvXji+bDqM5Qt0QX
+HB0YO0D/xGY7vqw1qduPW+R0i1FcV/FuEueVH4BK4boB7tbcwNU9KM0wpEygsiGm
+Qwr9jcGeBosc42nzc4NDCqn+fvKGjSVOlI8IXmQ5+jQRIApnlwwAhiojaLNCr4O6
+9mMj52whUrjCdVekunZ61KNehQNPOfls8fC8QVlwiBScQTouL4m59xFbKPTfa8d1
+RafUHvG4BGZ3JPt/t26w0xKLK9Zp+0diOeONMs8KCsdM83YulmL9DsTIyhAWGYgZ
+n5Re8p4vJqog4Cguw82Osai6AG4qTT0u5KGDtukwQi/HQPJhnJCewZI6gPGSgLhZ
+l3jAXPmurWq6jzBCGOMlEkTp3Qy7cfvjOmM8K13QEK0sSqsHSDucBjPUEtIItfhK
+1EYyJrE9FGI+ltofec0a
+=NUP9
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.31-r5.ebuild b/net-dns/avahi/avahi-0.6.31-r5.ebuild
index 75f7e368d7a1..0f407d09a7eb 100644
--- a/net-dns/avahi/avahi-0.6.31-r5.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r5.ebuild
@@ -1,6 +1,6 @@
 # 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-r5.ebuild,v 1.5 2014/08/03 17:45:35 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r5.ebuild,v 1.6 2014/08/20 17:20:13 blueness Exp $
 
 EAPI="5"
 
@@ -123,6 +123,9 @@ src_prepare() {
 	# allow building client without the daemon
 	epatch "${FILESDIR}"/${P}-build-client-without-daemon.patch
 
+	# Fix build under various locales, bug #501664
+	epatch "${FILESDIR}"/${P}-fix-locale-build.patch
+
 	# Drop DEPRECATED flags, bug #384743
 	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
 
diff --git a/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch b/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch
new file mode 100644
index 000000000000..f3ae58807405
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch
@@ -0,0 +1,22 @@
+avahi-gobject fails to build under et_EE and possibly other locales.
+
+The regex for a sed in avahi-gobject/Makefile fails under various locales.
+Forcing LANG=C fixes the issue.
+
+Patch-by: Rafał Mużyło <galtgendo@o2.pl>
+
+X-Gentoo-Bug: 501664
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/501664
+
+diff -Naur avahi-0.6.31.orig/avahi-gobject/Makefile.in avahi-0.6.31/avahi-gobject/Makefile.in
+--- avahi-0.6.31.orig/avahi-gobject/Makefile.in	2014-08-20 13:10:02.914432590 -0400
++++ avahi-0.6.31/avahi-gobject/Makefile.in	2014-08-20 13:12:09.024436983 -0400
+@@ -992,7 +992,7 @@
+ 
+ @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@signals-marshal.list: $(CORE_SOURCES) Makefile.am
+ @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@	$(AM_V_GEN)( cd $(srcdir) && \
+-@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@	sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
++@HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@	LANG=C sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
+ @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@		$(CORE_SOURCES) ) \
+ @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@		| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp && \
+ @HAVE_DBUS_TRUE@@HAVE_GOBJECT_TRUE@	if cmp -s $@.tmp $@; then \