Apply a upstream patch to fix non POSIX test construction. #500996

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

4 files changed, 48 insertions, 7 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 91f371a7c45d..d417c17f0bf3 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.591 2014/02/22 14:37:00 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.592 2014/03/04 16:45:38 naota Exp $
+
+  04 Mar 2014; Naohiro Aota <naota@gentoo.org>
+  +files/glib-2.38.2-configure.patch, glib-2.38.2.ebuild:
+  Apply a upstream patch to fix non POSIX test construction. #500996
 
   22 Feb 2014; Akinori Hattori <hattya@gentoo.org> glib-2.36.4-r1.ebuild:
   ia64 stable wrt bug #494132
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index df019434e5f0..b7887c66c821 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -17,6 +17,7 @@ AUX glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch 1764 SHA256 361845ce7dc980
 AUX glib-2.35.x-external-gdbus-codegen.patch 4567 SHA256 b8b699317836af2673a428b39bf4077ee9c99ee81bcda4d06a05f608b474b11c SHA512 ad1bf670e8fa25c18cd94a9add7b1ae0bf4a3d696bfdc89708d1a1edb8ba923b702bd98be9eb2b439ca1efbe9f2d123f18119b859c8080a6638d61a8f16525de WHIRLPOOL c2faa0d89d5bfb2372865cfe1d43679d7721b55091aa680dea9a686e40d006522d37d66ce3b7a4214af2940c012d6bd4ec3644508ed88887ec06bb85abcde893
 AUX glib-2.36.4-znodelete.patch 2199 SHA256 4195ca98519b842520d9b11d7cd01f1f6f6ed1843735e2fb50c217fc6c33fe43 SHA512 77284716ff8f4f7482765cc5724e325169fd49b205e19cad19e755a4cceeb57037bdd78fcde6265586770b95fd9481afc69d797a4a521401a2704f4eab644d47 WHIRLPOOL 9941b5aa7f1fdb1fa6cdf39f4f94a52bfd6093f55f31a6466ecc0996eaa22901ac26cff42fdd64af9dac13004fe47d054991cc27e6450ab4b6810e0f421157f4
 AUX glib-2.37.x-external-gdbus-codegen.patch 4573 SHA256 7094ff73cef6add5bf1727f2d01f6f45ac6ae82d725a47b83d0280064d006ee2 SHA512 dc8e0460c549a5d65cc9ba575d0f1eb2bd7a487d382970922e454ceb4efe46a096da82abfe5ba50bf37f56e1c24570ed391a5474f22f9f97d678baad003893ed WHIRLPOOL 86f0da69db6c0c9c8f22869155ce679c75db755c78bd7add7401e7e73c454fd9704dcb0a050b67d99a4bbbb161c26325ff120ef0bb7d76341ebc528015169b20
+AUX glib-2.38.2-configure.patch 985 SHA256 4a3d9bf2b84f966ad2792ed7a356cf9e4f23e95efbe950bd6d5df544d45fff97 SHA512 ebdcc5775b4ada3f464a791ac0bffe0cd7a4441c9f21af327c9a99638157bbb8d72bb01aa70190c4e757481c5832763a0b569b7de6f452b4a2d05ea5b4a3e63d WHIRLPOOL 99d02f68ad97dbeb9de6dfdef5a76b19b94da9ff66ace3657bd772fdc181067c19225926ff5bd0bc7006a4abc5b4ed3a5523769fb8e488bed74b1cacbeab9448
 DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341
 DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
 DIST glib-2.32.4-AS_IF-patches.tar.xz 8584 SHA256 c61a87bbed8b09148f70f2651696430ab262d8ee905ebe2e0e963bb9038c5545 SHA512 cea825c379ea9014014f8a6f3a9fcf228e6b4245c649df4d86f6d86d1d655fd927ef1115fd66521cc48b2929d8cd504a284c7a8fb5ff38dc2b83ac4140655049 WHIRLPOOL e778094ad8ebe6fdc236942c21ee8ce2266712a08672b521f931159dd81d3452fcb8b6556c98c82b60548b1d9703a3ff332d02970a01565b6f5c4bcd02e74b46
@@ -30,13 +31,23 @@ EBUILD glib-1.2.10-r5.ebuild 1802 SHA256 b8561be2cdbe967604c39b6316bee46016e6213
 EBUILD glib-2.32.4-r1.ebuild 8355 SHA256 2c7bed6e3df8f29a6fc03d3c627ac6ddedb62d5624be324063ef3494186d45f4 SHA512 bee7e53b3ad42e5dcc36f75c9a30b7c7bb6e09803064a953982a07d88852ee414987964abfd1acab27dc8b08946c769dc12f8167cbcbf934cc9b66e009286793 WHIRLPOOL cd9bd78ae8d8ed4cb0fbeadc7d1a91937ed056d68b90e4a321412c812ba27edca6c753a87b3fbe8a4d75d4ddd88e66fa8312ca16d88843242ad0365287a6aed6
 EBUILD glib-2.34.3-r1.ebuild 8398 SHA256 17c312a7ec9a61ed1720ae5bfc5bbd77e285a3f35c4555ec30780b95390a66ed SHA512 43fe5cf6a579939be32d31fecb3389813bdd3cf2773e414c1d8f368c130ede4da9558cec40051fafb31eea514359267f0182db0211ca91fa55db4c1aa9905162 WHIRLPOOL 68f54986ce2328c599ad298364c0af710cab188854ffce68b3a01f9a0087049e208437a33c2f254488df0f7a3b03f4e5266f45af970ee5aab2783617549cf000
 EBUILD glib-2.36.4-r1.ebuild 9867 SHA256 4127b4d88348932a795d17429db6f9de0d361a9ab19cf1bc54f67162b79bd379 SHA512 63f46a199e0c394729027ffd2fa00e0febd22ad69471a36a4fe4eae9e2457b3da13827e73a315ff406e59ad6051e1d48becd94b66c3d291fc11196feb678fe7c WHIRLPOOL 04d8112891f9f5836b606f32ece3c9b3e799a1a87b770e821527d957efe031c9b55c16b41f48a8ad3f939693a188ceedc3323292d7bcf0b6e22a151820d7d4a4
-EBUILD glib-2.38.2.ebuild 9729 SHA256 9e648b6fdd94a87e7d42db40d6a0cab59adf3110a28fdc9ea6a7939fee1e2408 SHA512 0daeae9b63a215f3c6577239d4693d44446769f4697fbc5973209b003d22b2d077ab1ffface63307caafd635997cdbef72581f6ac09694341b1e10e374343fb0 WHIRLPOOL 49246eb743ae86bd5e019f4434b5c16cbf40f31b9a0ce7907ed3c1e4c35a2c06d702fd36cc7e0b58330d03d83f4e0b2ee6cde52e4ed983279ec478e7baec9302
-MISC ChangeLog 83106 SHA256 117c9ebb663dde4e98062f4982c369df1b253e8ea5f0c8ecae655273ce07bc92 SHA512 787a2f7df9a13b840a70bed0c6a9be93a32d436bcb8fc7581348e2ae0b97665c41c214787e4211a607740e69890992c4f435379b85d4a4f814c5b8d1eca7fc4f WHIRLPOOL 97c92393127f182e3c32c94455da78da8d61e27862d4b977983233625ec72f16febf25a6b99677a662eece5f69d7c6e978275fee7fc3d6737f1ab31d8d6c123d
+EBUILD glib-2.38.2.ebuild 9780 SHA256 d8f1ab19f898f11df0d59d13ec69c01aa42bdf70e5a75811ed2896466d5efaec SHA512 9e5ca7b6817a6787c3e60b284675cdd56b56ce90eff46202ca5059b0e570e95333f19e8d099909fe12e25cdd778c6de9a11d8edc8b3a4dde75ef8174e3bb420b WHIRLPOOL ae91c9b3e1cd3e780fdea1e1e41aa5056f617fded03039f58489d2844b77e6da87bb64fcf123fa6e2105877448642f9ba01f1a5e89864ca44a3718b26fb4e36a
+MISC ChangeLog 83280 SHA256 b0dbcde16caf7ed6e3f386c732f544248112ebe5ea33cd1da9c5d4c656c34722 SHA512 b20d7011345241dba9352b681a4c85c765e1faa142d836f87e69cb03c2e6df01921a9aeb8e1a5f26e9bf939b38e2a73f6e4f33c665327646161c3035f16a60e0 WHIRLPOOL 038a5c8dcf56439d860491905a7eacd787cab5441c4c71b19b9153651b1a8073aba9705872f575989a52ee4bd668ee4d0b5164139a100a0a72043b418bbd0273
 MISC metadata.xml 479 SHA256 1a41cb4f56511674a423efd444f7c6999b5d316f9058d2eb67a032a522738ffb SHA512 f30f9e937d43dd4fb148dc7ab1554b5c58ddf4211bc06cfc65e92ff9843a84f0b05fa130fcd130744ad6e3579fb5b82a7f31950dd8ccc317f58388023cb6fe50 WHIRLPOOL 92888cd8e3a839860cb20c60ad1ee2871ea9efdf54d5751d6b5f677faf10e721333c3d68b1b5c4af212854f9ecd9e31970832eaa05f30276987bcadacaf5f637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMIthQACgkQL46suuyRem0ifgCgmXrBc5eGiqacROY5XYgLOWYX
-5ocAnRiCCzZNtOLuDikj2CnK2BRhks9K
-=ub9d
+iQIcBAEBCAAGBQJTFgM0AAoJEDYO1FT4VRUUt5gP/joJXYUaJG7dbSZNam170MsQ
+GRd6Dlkxg0e7Xt0cBZQAN+7UA/cT7W+dflVa4+KRIc305iGfDYEmZFPAvjZhNKUo
+MfU5kHOLJaGwuHGqu3uTx2u1eC2EjDchPTnC7Djj5bnrLIpWxKpXVDt7QUnn339C
+5IeBJICMXv24EGwPWw24sCpdZYS5yanbcyhiA1DiDAitPlZAwV3yf851DN+kV/r4
+D3xcuxd+Vpzjcp4t/9X7uXMBY7wpiqdDYrJ6RQscTN61J/sIaMFjExBKDYgSIEly
+40fh8lEyg7t/n/beH9VD1WMOjDmcadOPbfQnyGVRThNRMZuag73nVpzKMD3LO8Gn
+RsLXRvtSK8GZfMSAhFRzho94RFCVZNabVpLQgO+O4ulJmCwRAgzqwsyZfSKjQdmz
+OYUAm81OKU+9NnTpTSOtAzMYd3d/fJGq3JyqYT163QZXySkFOouar+ihcqD46YIN
+yDg3oUY1Tf8qwAQovBKFf8pT7fZxIaZmnhl+VWZUNRuzAHm1OzfweKhU2h1Mkr6B
+VOlUjauI1QetyRdvSdg63bshbzfApiBv35fsWlY6GZnUNVpsuSUpMYJhW8SZCiXc
+TlExjBmlx7RC/zbV1f58Ym9GZCAtbEFIXCaDTT6xWqA41nsOsmHRWkTm2DHy2q94
+P1lIjYNrlm2WECZf226k
+=pBE1
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/files/glib-2.38.2-configure.patch b/dev-libs/glib/files/glib-2.38.2-configure.patch
new file mode 100644
index 000000000000..8f08ca0fafe3
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.38.2-configure.patch
@@ -0,0 +1,24 @@
+From 838b49ead77c35d94fa16d48a6d7271bab082a71 Mon Sep 17 00:00:00 2001
+From: Patrick Welche <prlw1@cam.ac.uk>
+Date: Thu, 07 Nov 2013 10:58:46 +0000
+Subject: configure: test(1) uses = to test for string equality
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711600
+---
+(limited to 'm4macros/glibtests.m4')
+
+diff --git a/m4macros/glibtests.m4 b/m4macros/glibtests.m4
+index 27e9024..7d5920a 100644
+--- a/m4macros/glibtests.m4
++++ b/m4macros/glibtests.m4
+@@ -21,7 +21,7 @@ AC_DEFUN([GLIB_TESTS],
+                   *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
+                  esac])
+   AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
+-  if test "$ENABLE_INSTALLED_TESTS" == "1"; then
++  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
+     AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
+     AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
+   fi
+--
+cgit v0.9.2
diff --git a/dev-libs/glib/glib-2.38.2.ebuild b/dev-libs/glib/glib-2.38.2.ebuild
index 1a492d50f7bd..7bb5d2b138d4 100644
--- a/dev-libs/glib/glib-2.38.2.ebuild
+++ b/dev-libs/glib/glib-2.38.2.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/dev-libs/glib/glib-2.38.2.ebuild,v 1.2 2014/01/18 04:44:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2.ebuild,v 1.3 2014/03/04 16:45:38 naota Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -150,6 +150,8 @@ src_prepare() {
 	# Support compilation in clang until upstream solves this, upstream bug #691608
 	append-flags -Wno-format-nonliteral
 
+	epatch "${FILESDIR}"/${P}-configure.patch #500996
+
 	epatch_user
 
 	# Needed for the punt-python-check patch, disabling timeout test