Fix FreeBSD-EN-15:09.xlocale & FreeBSD-EN-15:10.iconv. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/163 by nigoro.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 30 insertions, 19 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index ad11ed18d9d6..eb9fc716883d 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.212 2015/06/14 18:05:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.213 2015/07/09 06:49:12 mgorny Exp $
+
+*freebsd-lib-10.1-r1 (09 Jul 2015)
+
+  09 Jul 2015; Michał Górny <mgorny@gentoo.org> +freebsd-lib-10.1-r1.ebuild,
+  -freebsd-lib-10.1.ebuild:
+  Fix FreeBSD-EN-15:09.xlocale & FreeBSD-EN-15:10.iconv.
+  https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/163 by nigoro.
 
   14 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-lib-10.1.ebuild,
   freebsd-lib-9.1-r11.ebuild:
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index e3914db7d4af..82169272c85b 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -46,6 +46,8 @@ DIST freebsd-include-8.2.tar.bz2 138992 SHA256 fade90621a8e4880c9583c1ee49965400
 DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe148f0e2b768b3fca152f8426f44a2942f SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 WHIRLPOOL e16ba45d380591ba007ca59579d45f61ffc1aa1a4c08fc11ed2794979b0a189a346c81b4f70a44ee199d50a72024930f28587ad62a9cd6854fc937eb466ec115
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
+DIST freebsd-lib-EN-1509-xlocale.patch 1711 SHA256 41f723413cd28b95bd5512d118e81a5ee9297cfd5e87eb1e7e32c845a108e35c SHA512 e4c3299725d0f306ef8fad3d289c777d600f9db02dd0c73c93e4c77d5d3c3ff3345733a341e5a000495588316ee5f67ade144e35323868177681b8bcbfa01fc2 WHIRLPOOL f1e2b48444035751bd927d785842dc237367aefa3f77d0b9dccaeec4408b7d7d3967d4e786a5aa600fc2749b7333434dd81ac712bae52f9ed4144710a326341f
+DIST freebsd-lib-EN-1510-iconv.patch 3000 SHA256 adcf65f7263c0d981d93e301070abbbb0cac1330f1c012f1fba7f361daf3fe98 SHA512 0634e552a14603888bb2f1f4b981ae6b1413508a495c44917321846b232988fdb2e8e5c169d61f91c7f9b8c515bedf0e6b5092c5c4e90164469fe75468c6cf77 WHIRLPOOL f6c1cf09482cb691015b5b50c36c58d69ec6e97fccf1c45f068559ec818db7a9fcae402d559b081e7a06865f774ffd8eaec3ae0041103c077a44ab47eeffd756
 DIST freebsd-lib-SA-1427-stdio.patch 605 SHA256 f8e3556e82a9d256bd42be796dd1a8672b84259087369087ecf8fb2ddcdbdbd7 SHA512 9462e5e4a8a04999b0d434e47bd6891e638281d13f2aba1ff7e2fd6f2b3a698f1339aac2b257404eb52498b14bcdb7b512b82ea203b176a0cb42891da292e691 WHIRLPOOL 942287e5fe27452d1c5c046d00d1e33cf57052ad3429a81ef5da2b4eb93d96aad734d31f0e1c196278a9ab232ec6efc4217c2ff28b271ed63878c6677f4753dc
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
@@ -54,28 +56,28 @@ DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
 DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603 SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 WHIRLPOOL 20f5278e2a1dd387a75b44f10507958d6c0e84a2faa1bddbf808c14ab86d8dd14a956192911bbc1880f5f5f7bd05972dcbb4aec85d241f0dcf91bf4246883f0a
 DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
-EBUILD freebsd-lib-10.1.ebuild 19082 SHA256 a0593eb13b1dae64d5aaf3e45d016911b86b543fd6ee27c7e74eb13055f6aed2 SHA512 f212ea4fa3e4732400dfe5bc8d18c2f2bafc8ea707cd8fd0c8da8a257d823cf1604196e1bf43ab2f73733df753b88d121a5aba4865402e37a25a746d93395484 WHIRLPOOL f5adb7b95a25bda14e5a693c2df145c36b872e497bf1f46bf4abda1007e427bd43d112f7609d7abd4771a817ea015841bb9bf279a58841e48fb828de46c83bfb
+EBUILD freebsd-lib-10.1-r1.ebuild 19135 SHA256 edd767abc1a0361e7ce6afbe295f2c0a1e12af771c3cd8f096cfeabbb3704ff9 SHA512 cee8a6451c285831fe26fee502fced67c867c8e108808605cd9620fc1e00ef2f5f7c129df2a20268e1bc254286ec243d3c6e24b35445fe6b2dd246e8d9391ea1 WHIRLPOOL 1fdca4685ad8fe04e211c2be940928ecb2940b282d3c91f148daf0cfe8f53b3bbfbde790537f5c8036c42f46c8239fdbefdd3aec6a56ea0e1983da0e5edd5c7a
 EBUILD freebsd-lib-8.2-r1.ebuild 15803 SHA256 6ed08aaa4950f1c5f92736e403f27eaaa7e4059f6d8c0d3cb416d5ec3859dd96 SHA512 32abfc388bdfe628634d46a686437cbfbe01d0fb99c85a75a3ccc67869a19ace1c3341b2ca468643a1c0d544ef8ad0b041cd1c882767cab57337813b8b3d8b63 WHIRLPOOL 250d59a4bee40b369d1d683e26e70ac15c02044af13c604c885c41a0463470555ba92124bc58adea34fdd922fbc79406e4c376f9cef08ca6569c7cf432c6a2a8
 EBUILD freebsd-lib-9.1-r10.ebuild 18625 SHA256 9bad00d447b28f362910eaf85782a1caac4da475d4e83cfb6de583456891b3c5 SHA512 1b67821daa1ca31220542d404f8a9268a35462eb0a86bc76882a9e31159af87e62f06dd6d64192b123ea2c019581829cd3da8e9b6bb443279b55d5e3ed4c1d63 WHIRLPOOL 6fc1ec14acc67d2fa6ccf55ddc77aa89bafab102e5fc12dea833dcc2eb0628b5e87e7ae4cdab679e5fecbd688395d794550f1761cc688dcfe8786d0d1c6ad6ba
 EBUILD freebsd-lib-9.1-r11.ebuild 18956 SHA256 c245b470444b753a7b24191307c30f7d0999531f2c5a382ac8cc0d691fa927ae SHA512 9d54327d1974aa6f0bbc25709db3a1f91554f0dd9ef3ef3d75719f4910ab82ff52bacd864b6f7caad392054e04ea5edc14a8dd0fa6e18361b437d4f1ddf5b028 WHIRLPOOL fe8ccb79b62767bcf648f2d3130c0c80dc54faa7bfe3c8b90544489b525af29f99ad95beae70ecbd3970448b57b66991d5c6baf007c1c322b6c9b56d8ac57439
-MISC ChangeLog 43359 SHA256 6b844f64258fd363a2cfd42ff91cb1c167f8fa116ec89f9aa4df3f6876cb2308 SHA512 0cb65d46e51caea8ac006264813e0ff935e21bcc0d34123e8d6a4dd928f918787ccd4e08e2e9cf3da01a74f385daac5bc8d01334c24e9e4db1ac8fd6400f2a34 WHIRLPOOL 3aa029595f11406c12dd65fcdb47b13575ae7ca31e77432228bd55f0a805c5c9850f15d0c988e5c21aff2c78f82c87e762972d6b88f106f01b8fa5c3b4fbb18d
+MISC ChangeLog 43636 SHA256 4b2a4210a8d2481a95500fe185baa3308c46691ec87e045a1767725e4ddd81c4 SHA512 6941a261fc0350dc78f402bb2dc8e0685c20aa3b80eca81dcf3fdfe5b20e05eb78806bdb79282dc15025594674e4d27606e2beba0d4cbba48029b0f5b954e117 WHIRLPOOL 89fe5175adcc0849537ee7501ec0a74a33c1ae518066f08fafcbd97a2277f8e1fe7078af05f9da75db06dd8e774876507ddf971b284f9f1d1f04e1bda66c6adf
 MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVfcJ7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVnhlpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObtwQAJQK4cpehG8bnbMEktRF/nsK
-gcnzlrOH5AgsGviLt7ZGy+CNb0OfbbYOA8Dusbs71dn2+953gMYaK3gt3q3DP2QF
-0PyOnmholruF9puSHUW/YbI7AoC16qI28INeuJXbKF1ExfLDrTSxJWxT1oPP2BEj
-0AmLP+QJKIvsJ77tTAhcdjWw/Kx//Hb5snB7oBxX5jxnKcGGVrzGiXcbpAlTno06
-O+IJ37xOFlZJ1lmYhIykgzjT7E/yWAVOrd9NdQYJPO6Af+32WXJbSRGhNxSGVmZu
-2I1DUo9hOVCrutGC2gokg6j48WHMPYcqa6qT3+tMWhfKDWapZG5srXm1MrciyG8B
-E8BAmmH4m/lS2jJoGSIxf+Vt70xrGFANgV5AU4NonTjI6wYgeg/hwDVFUoESElFF
-SrWWdwJWjVP/NgWqjeWR7df3IyP+u/AK6Ade/XXOgKXld4bSCT5gCfrik6fMt0RF
-yFozInuPhk93sjeb/EmvRION/0IV3mkZdqjRofKk1YEUOAh7OZMKqG/PF/P54pIw
-YwZKlsIu/8EOtEM7NqcxIyG5RW17FMPAklcgMXPmq3Al5U6AkwFo7w0a0lqsep4t
-uPRtm4LxJlWzZQOMjfjy7ADu4JnLnkGts3+/OXzVr3LFGUz0Js+2yT//Hevfh6le
-5ZgRzCWIoahg5WkST1Uu
-=hOZG
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/owP/0ulHVld0UC9VDeOEMtrt/45
+PosQwAg5xplRQ3nk/dBuCE4zoJJhwKojbgDGcwspDNMQvBWZpBt+5YHiXU75Mhbe
+AY3BL0DFLVl5NPzKNPQ752c5n/PCcqsStFnKwh1gl2OtfJ5HjU7FoB8sbNO7RC3n
+b+zG9kI3MuLc54Nxcb4GJRgGkrzSc1aMbE5UNVwQ3zFwQrPTlYEbzsFGtOhZ919A
+zcgP44hRcS6FMMjSgTIu8Ny4VUWQK+5RGDEfd3d2wQtjFjAX1IZaiv9J/c4UKUPn
+j9LGW5tQYa3FGUd6juHnDmtA1kRB+6BGoz2kMmzCSaHxF5nxrIcbQQIa/OJQriwP
+Uz9BHU0U3c/6jtSI46BxEx3o/scDGV4ZpDhRwjgbtTwTvdGTtW5TL7epRkT29mwe
+RTzzKcJxg5mZdPTxUCuEN9ASRAabbbeHeGjOoCRE40CgkyKfBoTP9X1Uf4g56KK+
+DDPv9FlT8DBNpLXfKIk0nSb/D26ySRlxaLuYwZIKD1g4o8Fyq2Nwjex9KdlDVcfP
+PjYHK2KkuGzP+ub6QWkJEHvkO3KESgAIL1dcNIJUrGRRjBmGEKi3LSWQVobt+Cny
+fS23aPJwosyTtg5zv47ahOaINbBefYgyS5cLVZS01fcYsl7mHKSo1ycwxWdqyE6d
+YFN7LVrqg8Y8RSq+MvGU
+=DOCV
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.1-r1.ebuild
index f6e32bd7861f..eb7934732bfd 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild,v 1.4 2015/06/14 18:05:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-10.1-r1.ebuild,v 1.1 2015/07/09 06:49:12 mgorny Exp $
 
 EAPI=5
 
@@ -10,7 +10,9 @@ DESCRIPTION="FreeBSD's base system libraries"
 SLOT="0"
 
 # Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "SA-14:27/stdio.patch" )
+UPSTREAM_PATCHES=( "SA-14:27/stdio.patch"
+	"EN-15:09/xlocale.patch"
+	"EN-15:10/iconv.patch" )
 
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of