Disable sha256.h on *BSD, bug #545714. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/139 by nigoro.

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

4 files changed, 33 insertions, 22 deletions

diff --git a/app-arch/xz-utils/ChangeLog b/app-arch/xz-utils/ChangeLog
index 50494400275a..67e7da0d4be6 100644
--- a/app-arch/xz-utils/ChangeLog
+++ b/app-arch/xz-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/xz-utils
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.95 2015/04/04 22:34:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.96 2015/06/03 02:34:55 mgorny Exp $
+
+*xz-utils-5.2.1-r1 (03 Jun 2015)
+
+  03 Jun 2015; Michał Górny <mgorny@gentoo.org> +xz-utils-5.2.1-r1.ebuild,
+  -xz-utils-5.2.1.ebuild, xz-utils-9999.ebuild:
+  Disable sha256.h on *BSD, bug #545714. https://github.com/gentoo/gentoo-
+  portage-rsync-mirror/pull/139 by nigoro.
 
   04 Apr 2015; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.8.ebuild:
   Mark arm64/m68k/s390/sh stable.
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 9dcf85e4abca..2c5b063a79fd 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -10,24 +10,26 @@ EBUILD xz-utils-5.0.5-r1.ebuild 2225 SHA256 2f7efe22ae832e69793b70e7bb3f8ee588a0
 EBUILD xz-utils-5.0.7.ebuild 2240 SHA256 53e958f3900a7611cad407533ef56a52f2412f20a3cbbe49197fa89322b9e1f2 SHA512 28048b5fdcd5ba20c82567c3c7b1e26af9dada5ac88dec844e806be5a15b65b11209f62ee0134f1ebd7c5ea5b30afaeb018f29af6a54e0218a64213078db23b6 WHIRLPOOL 7aa6d4cafecb85a28f84c07c104b29f95550dd533b3d663c66fb21357c3218d2d8997ff50055063661dcb9bd465fb46bc025e416da204c150ea383c8c906fc35
 EBUILD xz-utils-5.0.8.ebuild 2222 SHA256 60b2e32f141ba228564e027def69da81af2f5b04ad994512a291f38db5f88853 SHA512 54d6b898dd56747656d9cdc8643bd6da13736631e013f913b173c40abd01c521d6e5219b0ed0beac43bed98dcc077f7c43012956e7496546dc804a910e1660ff WHIRLPOOL df8d42971669524da1460491cbaf926e5bad1131613f48d82213508df57cfe673b7f80d2cacf049ba1a8eddb6d485a11d5864d693e419b4a312421b4c89af2a0
 EBUILD xz-utils-5.2.0.ebuild 2235 SHA256 727c60f669c7cdffb13010320a1713e525bc5747024bcbda7662d459990e54ad SHA512 d6cbd6d8025ae600ebbcef69d3dbbb87566641f45ac012de9d63ddfc51b1dfbe08781dfb4967dfad3e71b37ddc0ec05b5bb407a3e5ae2bd22bdba8ce788ceee3 WHIRLPOOL c7c19972b68501835e3105a47523afdbead2e980180408e1d7b786e46ad7e39f595fea61815dce0393a7a08df890cbcddf3a7f12a49d9659fd1f1297bdc57730
-EBUILD xz-utils-5.2.1.ebuild 2234 SHA256 8a775859eb7f6ced2a3011750123efc1d64029edf7371036057eba0b3c6b1ccc SHA512 8b880fb8e03e248c39c0894f17d85715dcbf6b2af337cefab750d3743c09481aedf1d684627869da666b6d35424e7b31fe591f3341873e57684161987ca3ac2f WHIRLPOOL 7ddd5ddbabd8f4826b7760457ad731dc36d03fa835811dd0d9698e234f90f13d8c268fbd8a4023c0b67223067666ab4d839d288ea71cc435a3e0b931e4c7af23
-EBUILD xz-utils-9999.ebuild 2223 SHA256 d6b74dd0e53cf54c18b69f36e3f8444e7a03ca5e15293e87bd5c9b7d0fc1de71 SHA512 8fe2d7cee8fc4cc96451fd593df297b483183bbcc8e57c9a4e5449ce155d8639649e8e88b6361cde3c597d686266a7fc1e17b2bbc8c239e6645f2eef9033e8d2 WHIRLPOOL e034eb487b0d5675a9c7e22f5b405cd3b147b23008fd520534a97273b31d65c70fc08b2f87d8c831f6653dce0102c3ee1db180266d232a2cd7f57171515a9c6f
-MISC ChangeLog 12691 SHA256 e08777df6ac6347f6b9af6f0cd28e86a376a3b9ec87a12b1c35f86575f402bb1 SHA512 d8600ab765c12ee86f4505a3e6f56d861c890ae201f712768b09ac00af6e702fac0f96120c4188e96ebf4baf0ac27d0ff06657cabe4b93e10b70f954e02d82c5 WHIRLPOOL d3c4a191e3e26181dbad89292acd4a756dbc08bb1673fc171a6e96b0bf15527e893d0a1725060a96a297aa376a162fd53f8b131f7a1bd6d9881acdca411a4a70
+EBUILD xz-utils-5.2.1-r1.ebuild 2313 SHA256 4221c96612b54e498ae1498e808123ce9f4cbc6b886f7d44c2c5df8da192df63 SHA512 10a843a161b2c24f12a9e99502bc488be086cb8dd00e18cd5ec30ed44eeec07ce5d04a1def111ef17cae46040e5f824f756125423aa8419d33370a71fe0abe38 WHIRLPOOL 6bb7af765b2599537d46b68b5ecf201b8148cb89ab60ada6671c05214001d0783641b2a280d1df0d03b9eebe5e494b4cf36d22f201f01280c9c5de178c4a575b
+EBUILD xz-utils-9999.ebuild 2299 SHA256 25bcc364c8d4cc0d93a583f180ae7f0f92f008eee7c1bf0bf4ae33aca54e912c SHA512 9c988a942715643c77d55841f475178f17f6bcec1e39b5c4d9093e7b68e5e640bc8162df7ec338b28ad3cd41b84a04bb5da437dfbe30679e3eab697337c332b5 WHIRLPOOL 3a2e840d77cfffcd4643c88f5269f2da390cf7ceaf1243f8a0929c0cdf8ace709fc8da4f4372693d54e1feb8798a854ca3998ab7e78726ad72ec435217d78113
+MISC ChangeLog 12969 SHA256 63686500ae830d3f1e9d0b1982c440a6e9dcb429e55d039e06ef5504482a8cf1 SHA512 acfb4e9cb443c31446c0499cdb0fafe13ffcac18e3b62b24df487096310468a5f6d4d7913a2d321cb6e9d6109467241d89a565d3c85a385be06899930aa99f0d WHIRLPOOL adefa045fb20f45aaa9abe710b74887bb7aa002331664cedc61ea4a9bcf810dba09ef1da62fcbe202a06f6b3a8aadc78c1001b1acc7af95c70e880ae614687e1
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVIGbzAAoJEPGu1DbS6WIASh4P/RCX6dTosMhEyut0a2m9DK07
-FzaprNnobmBvktwp5C0l4o+JOL946jUXfpIhgaFM72AGtnTfBpjM6sRXfeiQHP4G
-z8ijmTP9GjKUtOxsJ90oM7S2KC2me0NuE3A4N9pLGNiBsyUw5b3XHUshH/O7Ltqa
-P8WJPSptTOthakztgYe0l/4SJMkonZ8/hWUQM+/zgx46DoM+JvDc5OJgeo2viQ5I
-u2MygpTYERwOQlN8JFkuc6DMB/W3MGN+ALvwW6Zhhe6t/jDYxs11Psl3cNMzIG5a
-vVwfqRFPyZKaBErCrWziS2accu+Z9rjZ1MO0YmVrQBy1/AN4XVrbGMRWmgijoZIi
-d51igajkF+3EU4Fe1uIK5e/iVdFWxR+G+YfH8nvELipriGtHBpehrbYgLfWLVaBR
-YqN8WDfkIq/qHbFZ+2yhgQSTbPRmbWwGamK5A9UxWrPS5A6JEZm4ArywYBmvg3JI
-x7A3inSw5SyaTwWHZoFLzGy2TmsZOz8m1KzVfkpBU8jditfC1Uq8TAkIWKmwNcNL
-CJ0i5xom9jxfq35O0MuD0SN/5GSBMVuQ18YjIQjE3K84v6yzLJXBE9UL+8HxGqlo
-dpIW9RJU7RmQwoA2owkNJgEQNq/kQ+5JZdXbcRZzGvHtynV2DpQNZU2kL2k3snSs
-m0SFMg2mnen6kX7nUouY
-=6swL
+iQJ8BAEBCABmBQJVbmfSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOsGkP/3YMh10qui661oROVNzhug+U
+DawtUhEiS3+A3/PmvTRYIHDRCEhgJVKY+zK7lOwu5OBG5GBkTTg1YnscEjcbFLCp
+ajiIrnYpYtnJqhlZ69HNDo7YvuAuN1jy8AHAu5KUS2OsKt9bQwrWcNhoaMYoy20H
+5AYsLI+U3xaLVfsAbemVsIjWDzl7L0cM9bDZYs8SSGfx/lxL6hxF3ZP6S2xtDT8J
+uxrNqNLiKNoL5odwyQ0u4xvkmFNO1uGok3rSs8hXI6LzfgDZRiJxLPA3kIAAPbZZ
+3i69L3BRx4dUVoRWHbTPRkL6QU2norzSX7bqAkHSlndXSeN+lXIw7gFYdkUM3RXy
+BDzyEVQ1MSblhuouRligaY6vpDicD117yFDbRDFI2p3jfulGqPFNe22Iy4igrtoy
+RuWpQoeoXHO0gmkpft0R9cndyGbT5hvQM+JqpVdHGuKHoFuFAPOk2P92acYOGsLB
+dYIprOW03l3ElRC2724zCPuJ3Z2OwVQItmj2x0THQBgMiY2qa2YdqjPMMIJWgSIq
+v/BrSakYMUzKdJqy29wIgXHeETryxf5sb1KwjhJdI4ghKYfuK8EwtbAHSrWzgIu8
++f+wLIk3grxPFQzY8qOmLEC9i+v3XW68Sneq/yzcIbnySXk/McKtjtHaqm3M6e3U
+6CNvmR+xSrJNKer0A2p1
+=gqZs
 -----END PGP SIGNATURE-----
diff --git a/app-arch/xz-utils/xz-utils-5.2.1.ebuild b/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild
index 1a58f851782b..f3abdbf45b58 100644
--- a/app-arch/xz-utils/xz-utils-5.2.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.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/app-arch/xz-utils/xz-utils-5.2.1.ebuild,v 1.1 2015/02/26 17:44:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild,v 1.1 2015/06/03 02:34:55 mgorny Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
@@ -28,7 +28,7 @@ HOMEPAGE="http://tukaani.org/xz/"
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="nls static-libs +threads"
+IUSE="elibc_FreeBSD nls static-libs +threads"
 
 RDEPEND="!<app-arch/lzma-4.63
 	!app-arch/lzma-utils
@@ -46,6 +46,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable nls) \
 		$(use_enable threads) \
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 748e01f97b26..cd1079970451 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.20 2014/04/28 17:19:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.21 2015/06/03 02:34:55 mgorny Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
@@ -28,7 +28,7 @@ HOMEPAGE="http://tukaani.org/xz/"
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="nls static-libs +threads"
+IUSE="elibc_FreeBSD nls static-libs +threads"
 
 RDEPEND="!<app-arch/lzma-4.63
 	!app-arch/lzma-utils
@@ -46,6 +46,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
 	ECONF_SOURCE="${S}" econf \
 		$(use_enable nls) \
 		$(use_enable threads) \