gentoo resync : 23.03.2018

4 files changed, 45 insertions, 4 deletions

diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 7a9820cab1e9..89206da8ebfb 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,7 +1,8 @@
+AUX libbsd-0.8.6-sparc.patch 832 BLAKE2B d02e16c7d338239ab56c6a1ce88cbf0e0c6736208ac40bf2272fbae5ddf16f10f89701515c69d81d541286012b3b9ce8fe0322197331f9c9b6293aa8454e53c1 SHA512 5b476340a35a02a15706ab7704f4e78b5f78f87e471a0749624ad4f37f9459e2d90c35fbe7984a226f247f26a4809c6a79d1c792e6c1ed64d2a9b4b984513055
 DIST libbsd-0.8.3.tar.xz 356772 BLAKE2B 7f45f0300e170f02a0c7d4d0e8d3b56b10035af5a0c5749695978fff549c11ae2d13fa8c85e07b059dc30f458d6b0f7fe36129c934070a77ae185f8be0a4e0c3 SHA512 155b895d6bd62b180718d65a2cda7484946c492d52735a57b51005705dfe4528b6a72e8745acea47b01fe68e3bbbe3c036c5e9998a8d06fc79efe2b96a04767f
 DIST libbsd-0.8.6.tar.xz 371112 BLAKE2B adab6c17267e0cff128351efccf5c1225b7dd85dc61dd8168bf212ba5aff8d726fa5be687c041821af9a427ddad9dfcd3630cac9134b9e81c86ab2599e43aef9 SHA512 ece01ced324f840c2cee6321c7dcf97ff123d55ea9f203c1ce35e1b46643dc7b34ef6dc6c8d128252b36848624850b40823411cc96b99a66a401eb1e9d8cea6b
 DIST libbsd-0.8.7.tar.xz 371772 BLAKE2B aa4aa1c19872edf9e7e6ed270275199366345531a48ee28c25e209f17c5403a22269b91ab1c806cb1b54ba33a8464f4b035fe7ee2bc5dddd0a4fda09c540b058 SHA512 605a14eb5d33c0e45c3bd29e585ebc15832e2ed1efa9356291a0562622168da96db1a20766e9dae8910ea0c1516429f43905edc8d4f2a40a5a341a689d08fcc3
 EBUILD libbsd-0.8.3.ebuild 1156 BLAKE2B f217031f7319057cc0a9b3ef7b8940812f9e149f58fd9484a1e6271b13f3b6514a33c0045a0523562038bcfee8b944061e039e299847a53f3716e126888ead85 SHA512 58344f547ce2e835a9f01c44c31f364f162a1ecfbb54a5b056996e9f4b6abce777d7699b6224a5b0642d4d9b12545d269418129acc7c7b392ff03d9ea3287f40
-EBUILD libbsd-0.8.6.ebuild 1172 BLAKE2B 118b1fbc3582ad7ba47d3c6e752552eece7fd62aadad34281d9d4b9a60290b14c5e15a155e01494828780a1f964c28b906e40b316681aac5e2b0b5836aa985b5 SHA512 54c0874720539ca96d5ea789685e9d20d1904cfaffc5ee52969d292e638b0b65ac22293cafcb551a33229cd5dfe54c229390a9ce278cd4e959c496e4325b2b9d
-EBUILD libbsd-0.8.7.ebuild 1180 BLAKE2B 485f9f85395b785633baa62ba88741c30737e36f190f9fe20ea2093d924c64963296c10f1de5852418a2a1c697f2c463baf7ae963449300130d58bacf6cb3db0 SHA512 6f44e592dcfd2d71bd65bedf7107dd71d8eb0ee76b1f0ac20a1e386fa1abc296bde0381e4757e1b7c2f981134f0b59bb30e4f96a9fada6fa74187a6bb2cef063
+EBUILD libbsd-0.8.6.ebuild 1222 BLAKE2B 35e69a9e63aa708d91771a6c61c445d7845fd2210674b9a65ad3a57ae03d25e341815cdc12ee55c35dd08946ab5ce5d047bd2bb81461485dc9e426fa931bbc71 SHA512 2749abfd46ea431b13dd18678b124d1bf8d320957ec6d757f0671c0cfb0d2811418b798bae20efca7eb86bb2cfd5adf568995657b931032a6d8cb61850729110
+EBUILD libbsd-0.8.7.ebuild 1232 BLAKE2B d30cbbad96b19726f36e83d9fb8c69d14f53702c74f0401ce9abee5b7f7cddbd0f90da75d02833535e12fc1d9f4dbf202305466d8ef712fe892c08c707b94fc3 SHA512 1967086f1067249a65c99a6c68fe0e3238b120ad15d6dc5d6a9ebed7105ae3e4cd86b6c51aa4e1bfbd2ce5b3b0597ae20cfd6326c14d6a06f38d6406e1ad30f2
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch b/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch
new file mode 100644
index 000000000000..d2c35d8dc4ed
--- /dev/null
+++ b/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch
@@ -0,0 +1,32 @@
+From 0b65d43963fc1bea195e94e3af922a7893bf6fcd Mon Sep 17 00:00:00 2001
+From: James Clarke <jrtc27@jrtc27.com>
+Date: Sun, 4 Mar 2018 23:44:52 +0100
+Subject: Add support for ELF machine EM_SPARC32PLUS
+
+32-bit SPARC on V8+ uses a different ELF machine type.
+
+Fixes: https://bugs.gentoo.org/634550
+Signed-off-by: Guillem Jover <guillem@hadrons.org>
+---
+ src/local-elf.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/local-elf.h b/src/local-elf.h
+index 1faf182..f7cbd83 100644
+--- a/src/local-elf.h
++++ b/src/local-elf.h
+@@ -186,7 +186,11 @@
+ #define ELF_TARG_MACH	EM_SPARCV9
+ #define ELF_TARG_CLASS	ELFCLASS64
+ #else
++#if defined(__sparc_v9__)
++#define ELF_TARG_MACH	EM_SPARC32PLUS
++#else
+ #define ELF_TARG_MACH	EM_SPARC
++#endif
+ #define ELF_TARG_CLASS	ELFCLASS32
+ #endif
+ #define ELF_TARG_DATA	ELFDATA2MSB
+-- 
+cgit v1.1
+
diff --git a/dev-libs/libbsd/libbsd-0.8.6.ebuild b/dev-libs/libbsd/libbsd-0.8.6.ebuild
index 6c178d59e9d6..081aa4cf8277 100644
--- a/dev-libs/libbsd/libbsd-0.8.6.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,12 +10,16 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=sys-kernel/linux-headers-3.17"
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.6-sparc.patch"
+)
+
 pkg_setup() {
 	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
 	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
diff --git a/dev-libs/libbsd/libbsd-0.8.7.ebuild b/dev-libs/libbsd/libbsd-0.8.7.ebuild
index bde7f808bf8b..8ce1c8916cbe 100644
--- a/dev-libs/libbsd/libbsd-0.8.7.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.7.ebuild
@@ -16,6 +16,10 @@ IUSE="static-libs"
 DEPEND=">=sys-kernel/linux-headers-3.17"
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.6-sparc.patch"
+)
+
 pkg_setup() {
 	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
 	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."