gentoo resync : 31.05.2021

3 files changed, 35 insertions, 2 deletions

diff --git a/sys-libs/librtas/Manifest b/sys-libs/librtas/Manifest
index 611f0a58f2a9..b9b1ae0b3298 100644
--- a/sys-libs/librtas/Manifest
+++ b/sys-libs/librtas/Manifest
@@ -1,3 +1,4 @@
+AUX librtas-2.0.2-musl.patch 1073 BLAKE2B 51c0ff8a61aa16409f43abb4171b790308565baef19f9d74596f2c3bb0feab5538cbbc60133e95706b116dc68c957b69dc280fa3a75396812f09f227d032328e SHA512 d461f8f9fc11ea81c4b9847f4fd36fe1498d90df414a3e31daa7a385435267edee5ff851382a7c8c1c575ff1ec09c3612ee59bd882196ce270f8c41ddd3ee629
 DIST librtas-2.0.2.tar.gz 91627 BLAKE2B 1455af1af4a932fb81815ba67d1d1d8eeb0866bcf49fdcced622c1982121b5bb3ddeaf78f121a6540ec6c60d641991a87342713478a5be5232128db35d272059 SHA512 112d355bc486657289a186d9f1b8c576af55422f1527259a0cd680c07d6fa787aef2dc0cb6322721dc4aa1c5bd1de669f5c4d05e6a07de65262e9e3d4d0283c7
-EBUILD librtas-2.0.2-r1.ebuild 685 BLAKE2B fb11be8aba1ed03a3339f86a3a08b2f5a6605323bb0db6f32db88cd26949138aba4f1bb92b7f3648d57d25cbcc05ef11a70f82118cde63691593aa024247bf86 SHA512 3ef8d2c1e45c0f8894aed073ee3097ce7043fdf72e99aaea760363f943f3c9d3136ad330f680683f45767126fa40a44d348f7c43a4b017e864020cb7dad8108f
+EBUILD librtas-2.0.2-r1.ebuild 728 BLAKE2B ebc8a29955fbd67f30c4c9a2bb2f367185e752f0271f7b3fcabaec1fe99fdb499d4400209809c5840ae005d545a3bd17c2aaba384b4b6c69441f3aac531e3089 SHA512 035abe76ed04cf1dd43974e29f936f63bd3969ff8585fb066b9a09edea113667706a51a46d3e8744766fe4e37ff72e310dfd101c6aae0ee15ee307af573b83fa
 MISC metadata.xml 340 BLAKE2B d84ae6cde9ffd7cc2476c3ef90d6125e65946795711e4c5a422e244a2369ac059fc0f22e038c687c5e871370e4384694b5d464abcb76097ab065149de35ef17e SHA512 54fcb0b54320053eb1f68f11107e8027a618351a78d539de2dffaad678aabe9b20972700af6ac2ba4bfa589c91e1cd2d91df517ab745ad365b1ad1ba7a4b0f3e
diff --git a/sys-libs/librtas/files/librtas-2.0.2-musl.patch b/sys-libs/librtas/files/librtas-2.0.2-musl.patch
new file mode 100644
index 000000000000..a0e92f17fcb1
--- /dev/null
+++ b/sys-libs/librtas/files/librtas-2.0.2-musl.patch
@@ -0,0 +1,30 @@
+From caa55523aca6997d55fc9c68ed121c2c2bccc569 Mon Sep 17 00:00:00 2001
+From: Fabian Groffen <grobian@gentoo.org>
+Date: Mon, 24 May 2021 10:06:54 +0200
+Subject: [PATCH] librtasevent: include endian.h for beXXtoh macros
+
+In particular using musl libc, without this include, the calls to
+be16toh/be32toh result in a compiler warning about an undefined symbol.
+Since in musl these are actually implemented by macros, the symbols
+remain undefined in the final shared library, making the library
+unusable.
+
+Issue: https://github.com/ibm-power-utilities/librtas/issues/10
+Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+---
+ librtasevent_src/rtas_event.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/librtasevent_src/rtas_event.h b/librtasevent_src/rtas_event.h
+index ece6f1d..b38cd7a 100644
+--- a/librtasevent_src/rtas_event.h
++++ b/librtasevent_src/rtas_event.h
+@@ -23,6 +23,8 @@
+ #ifndef _H_RTAS_EVENT
+ #define _H_RTAS_EVENT
+ 
++#include <endian.h>
++
+ #define PRNT_FMT        "%-20s%08x"
+ #define PRNT_FMT_L      PRNT_FMT"    "
+ #define PRNT_FMT_R      PRNT_FMT"\n"
diff --git a/sys-libs/librtas/librtas-2.0.2-r1.ebuild b/sys-libs/librtas/librtas-2.0.2-r1.ebuild
index ec20aa395889..61863ff24d39 100644
--- a/sys-libs/librtas/librtas-2.0.2-r1.ebuild
+++ b/sys-libs/librtas/librtas-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="ppc ppc64 ~ppc64-linux"
 IUSE="static-libs"
 
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+
 src_prepare() {
 	default
 	eautoreconf