media-gfx/optipng: et_EE locale fix (bug #522446)

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

4 files changed, 49 insertions, 8 deletions

diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index dedd58345f07..7580bf315136 100644
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/optipng
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.92 2014/05/29 16:14:56 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.93 2014/09/16 01:04:21 sping Exp $
+
+  16 Sep 2014; Sebastian Pipping <sping@gentoo.org> optipng-0.7.5.ebuild,
+  +files/optipng-0.7.5-estonian.patch:
+  Fix compilation for et_EE locale (bug #522446)
 
 *optipng-0.7.5 (29 May 2014)
 
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index d2c02d1ad466..7da998cf8acf 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX optipng-0.7.5-estonian.patch 1014 SHA256 b0794fda40086c1e0443351477c487f04103f7c571c082d93130b398cbcae014 SHA512 535e869c42df6181f0bd30287adb9175c18e8a9730c997a6466e64870b968d9575e6952889353be5ac4232b2087b004cde953e151da4c75b8048b3cdccb8f27d WHIRLPOOL b69f09ddecc477eeef4eeeef82bc2c825bf8950b155c55a0836de2e532ff3d0a7ab148d7e7283091cfb55cb3af3b41b5a8a9b54b8a5c2e36371dfefa6be7afa0
 DIST optipng-0.7.3.tar.gz 1613868 SHA256 e07079fbf4cd7f11e756ca042f5285dd7a1f1784bb398fe6bbb63e5324368491 SHA512 2e15f88e9c1d1ed447c9236485bf6a0560678e11ea51e53a967b66ad6205f2cd000d0dccdeb2dd8f4ee3496891da112b37451ddeef80f31700542a69b9749eb4 WHIRLPOOL 87e397962019885ac1e4f9a36f1a707c325b4e8030add9f56bbf11841c2a5eab95ec472737a954bf96fbd8be0e06b08911f8786416758efd02ce3c4479c0fd83
 DIST optipng-0.7.4.tar.gz 1613916 SHA256 520b5d5a9405dbdc5c905dd0cff87211e69c4ed2059744037510e613fe8237ff SHA512 53db8f528cded99aded4db85424e38890ebdc26043e0497a575d0f3b81fe575638355dab1ca0d46c24ebbbe8a6657ac8e0c4216eee0d02f41d7365e3e168e40f WHIRLPOOL 9ad5b0d5097c9de72780f22a501438c57606d03b8f522b258d43d148f2239518eaccd1ec4e3c40eb99da571db1debf739f5722405c9988345a0d55debf7fcfd5
 DIST optipng-0.7.5.tar.gz 2141943 SHA256 74e54b798b012dff8993fb8d90185ca83f18cfa4935f4a93b0bcfc33c849619d SHA512 6f319965739235387e99244dda5f52533e22b7040301cf680180e383f24361819f66cb3adf1a90923e9509ed08d55bbe442ec363310c385fcf70f551febfbb6f WHIRLPOOL e632f2c018d132280fb73ec80587b1d8e4b8e857663175a3c47933054369cec4bf8a93d34c4627e00513a804fe1500c6ea2c2c62d908f295cab743c2f0e92cbe
 EBUILD optipng-0.7.3-r1.ebuild 1371 SHA256 d94a7dbc39d877366a7d84f35a1f03945cfa9b9c11e6c2a73d69c4fcbae29772 SHA512 3c780235f80bb9032d18da7007d3e510119286c27712383f1bbabfb351213078cb447298136b290ad6bbfbe539df870df32f51cf23b97fd62e820ea69c208dc8 WHIRLPOOL 56ce63f75ac25c657d24277c8cb24e2c8e0a9989a20a36b6d42430a7b5aa006218d1f135bda0bf48cc7f93c459311cdf4a02d797fa3656c5ae32204585334285
 EBUILD optipng-0.7.3.ebuild 1439 SHA256 2ae078caca1084c8c1e042f49b9edd434f284c96cc238eda5e4ca7890a92c029 SHA512 5ed85b3a03175200ed44932835f40853569e80dbf53f82f386a1f429b12c1fb951bfab17af8049a8a0674835b611cb8b4efe6d0707f5dfa5909c777920706c9b WHIRLPOOL 028c9c04687a4801f12afc3d54604f5ccf333be6e633a97a5c776fc3149a909ea173fba9947cf8bee7dfef761aa3621554710a10132662d05568f8ccaff32937
 EBUILD optipng-0.7.4.ebuild 1332 SHA256 db087c23ab7a2565d1861e6378b34554c801155c51c8357f631de5031b17ccb4 SHA512 5a2cb4195348b71a5ea215f49fb9a776d9fcbe2d860a420d3c8330e7cfc7c9a91bf251433dd6a20152187231a756e25caaf0428ac3f9a1b0d1ee81140d4ac74e WHIRLPOOL f656f4b9722e77ad289a10bdac70f2e60441f1700296859767e61cf98eda38bc4831cc4deca7f8ebd48c07c8373eba5961ad4df66b1a03c3834bc1d72e16df3a
-EBUILD optipng-0.7.5.ebuild 1330 SHA256 967a644b44b4373a725027c3b05569ce9247fa6daa5c59835efcdd29a1abc4d3 SHA512 73f3e76bdb8f15440e6387e29025488a9b96da5d78ce0e2f8ba6da8438516694e0bd02cfd211d8ac789d0c55fd403f9ffa9d99916e70829dc7a3e7ab6a7711a4 WHIRLPOOL bd6f99ff8f7ff618941546e7b852acc1096dbf19481cd4f9c0b8b6fbe4e5713d7c2af3e1d49b9a65806f1b115b03dbc6b8a55c45e7bd5eb3a037c222f7d3ea39
-MISC ChangeLog 11695 SHA256 3fc70257a2ba4f83ac0adfc17c6879ca5cf14e15e1cd1b8915861f5d3f458f84 SHA512 b4c088030938124cf49955e8f3505cb588a8cd2fc944c4ea9ad4563726dfdbc445517b2ed0aaf3eefa0a661f9f372ddddf6697ca7a257578c84972c3d5b5ee81 WHIRLPOOL e7ccca5db46da3bd79e388f3a4311f1a9de492a1abfd76e559deaf45d6dd487a8d40a44d6140e0b5e4ddc459421595ef1b3fe8bafb9db3cc1f86983453542208
+EBUILD optipng-0.7.5.ebuild 1373 SHA256 7cfe0ecc953123b1bce827606a5a393bb67b4c492b0776c2df7e9d36519121e5 SHA512 332c400954f1734b0f157648de821692d03a555f297f697f7670e25ee0b0fedfdee91fd8ab2b6ea1ea3f879b7cac3d01d112cbdfb57f742e5100096b25f97cdc WHIRLPOOL 598a54e50486bdf7e3dc06dce775eb6bd13558e87dc070e114e3f4a5634617aabcf555ef5cb5abe0dcd92f707764013b14a04e37073cb949d5cc648f08878db7
+MISC ChangeLog 11858 SHA256 b66893e52b6cab2a88692b801cc5922e70a996964ea984f104a9043d0908a0ad SHA512 4582d5944c12335dd3b92668c83cb5f7694d4086ecd01d72ab4198cadca8765fe6486cf7bda067915ba906220370faf948ea9ef052cae3884c796145a3f02b1e WHIRLPOOL e3296ea4f32499ac91ac6b6b8fd3fcf7f1ab0208aae2150c3f1114e07f7db0a9c97cc59b7b1c4ae806835a1499e6e33891f148f8e68b44427d3ecd870602a1fa
 MISC metadata.xml 330 SHA256 7ee69b202d4997694342d75efe34c5324118ab575dace4a445e16c59ef3d8052 SHA512 09e5cb1bb63f918ea274a2f3102cf7c13ddf704ee0aa6981ddf4eb59bab33deffc8ebd4b9895210728709c4ab0d357dcf16db6c17a276a41635e8623e7b2a615 WHIRLPOOL 87aa2e89bad2848a43dece6f322fd9a6fe2db5fb40b408fd4cf776f0999c323d02d278e065cad7261bff906f1d5b64440475d9ef94008571fc8bd9a32cc8e0e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOHXQUACgkQsAvGakAaFgAerACgr5MGkUUuM/BVnvhtI5wHzHyZ
-jdYAoI0H68cAQU+yPBQncpW6zbUG2CWa
-=nHxo
+iEYEAREIAAYFAlQXjJkACgkQsAvGakAaFgBXSQCfXF7Pug0FxJLg82GnR5qVfTBX
+CO0AoMMP80/WcvqPzzMtvZze9yLv8vsz
+=o0lz
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/optipng/files/optipng-0.7.5-estonian.patch b/media-gfx/optipng/files/optipng-0.7.5-estonian.patch
new file mode 100644
index 000000000000..37a2ca3ec688
--- /dev/null
+++ b/media-gfx/optipng/files/optipng-0.7.5-estonian.patch
@@ -0,0 +1,34 @@
+From 2cf0d7cb7928aac9ec0e21ceaaf09053434a4947 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 16 Sep 2014 02:58:45 +0200
+Subject: [PATCH] Fix for Estonian locale support (bug #522446)
+
+---
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 6d2a507..17d4bc1 100755
+--- a/configure
++++ b/configure
+@@ -256,7 +256,7 @@ then
+                 $sed_preconfig_libpng
+                 s|^AR *=.*|AR = $AR|
+                 s|^ARFLAGS *=.*|ARFLAGS = $ARFLAGS|
+-                s|^AR_\([A-Z]*\) *=.*|AR_\1 = $AR $ARFLAGS|
++                s|^AR_\([[:upper:]]*\) *=.*|AR_\1 = $AR $ARFLAGS|
+             "
+         fi
+         if test "$RANLIB"
+@@ -408,7 +408,7 @@ sed_config="
+     s|@LIBPNG_DISTCLEAN_XCMD@|${LIBPNG_DISTCLEAN_XCMD-true}|g
+     s|@ZLIB_MK@|${ZLIB_MK-Makefile}|g
+     s|@ZLIB_DISTCLEAN@|${ZLIB_DISTCLEAN-distclean}|g
+-    s|@[A-Z]*_MK@|Makefile|g
++    s|@[[:upper:]]*_MK@|Makefile|g
+     s| *\$||
+ "
+ 
+-- 
+2.1.0
+
diff --git a/media-gfx/optipng/optipng-0.7.5.ebuild b/media-gfx/optipng/optipng-0.7.5.ebuild
index ffbc9002dbc2..7ea7b2280062 100644
--- a/media-gfx/optipng/optipng-0.7.5.ebuild
+++ b/media-gfx/optipng/optipng-0.7.5.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/media-gfx/optipng/optipng-0.7.5.ebuild,v 1.1 2014/05/29 16:14:56 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.7.5.ebuild,v 1.2 2014/09/16 01:04:21 sping Exp $
 
 EAPI=4
 
@@ -21,6 +21,8 @@ DEPEND="${RDEPEND}
 	sys-apps/findutils"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-estonian.patch
+
 	rm -R src/{libpng,zlib} || die
 	find . -type d -name build -exec rm -R {} + || die