gentoo resync : 28.04.2021

4 files changed, 25 insertions, 18 deletions

diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 3b43c6b00334..8c4159dd2752 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -4,8 +4,8 @@ AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86
 AUX libnl-99999999-2to3.patch 1082 BLAKE2B d3749aa9cf5fd7a2e255ebf6e7ab6c59c81da86fe419ef36b58a9fb14173a9944e7252e64c1a72ccbf9ca9a42f558642548e5247f900344df1bf2f2d54ebac86 SHA512 75796506b16e0953d7fb22d600b747eb48c900badacda665740302002ce112e1cbebd44061158e0557e829c3c16a06917d2acfdb2f450211834de14643112a66
 DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
-EBUILD libnl-1.1.4-r1.ebuild 1144 BLAKE2B 4e83cca3689722cce4ad101f36db5923b0fd4771f2d49113f512f7f742370c8ae019b39925b9b29e4597f15d4011c85a54aeb1ecd6fec28a8216282f59d71e02 SHA512 cd7685ae97104765e5f432371572e7bf1a6b1bd984e62dabf87563fcd3fedfbde975972ed84d5c485c45cb2a71dbd7a141b54b237b9525d2b5abef50d3b636d5
-EBUILD libnl-1.1.9999.ebuild 1056 BLAKE2B d8a6610330b2720caa2089e9365c913c7e7822097fb744e57ee5f5edb0c70217ce758928f3953e529d2052a6d5f309f57e22bdc92e77d6a80e46fdc706fab106 SHA512 0bd08b49ab67f6702737ce1fad08467b8b7fe522bcdcaabfd4eaa04d2b78f85d7afab72b5440b7bd9b41dec994f8f6fd5a64621552ef575dcb6c6a540e56c856
-EBUILD libnl-3.5.0.ebuild 2380 BLAKE2B 4d6de097ee0a7872659872a0560e3080f388a8db1d1b3447d5db0d2769ac5754e1f9b722098352f05d1354ba8dbd9da46e86683054c12dfb162510849b557d1b SHA512 7fdb26d018634fe77c0a5aa38e53217e5d1a997ed7da6615e73c726c8af3d57d065492209fed1482f1ccc60a9320c63b3e5d17376a9dd1a53a0fd03237a6143f
+EBUILD libnl-1.1.4-r1.ebuild 1163 BLAKE2B 765d47612b1adcfbea4b8d0ac71d5d8cc3d7e198fc225138da70f3f96dc6925b24cd83775c74b6404d98496e1624a4b76cdc33f18e9d8352cd6084505cdc48fb SHA512 2c902a544a77e6ab768589d4125658eeaa6983fac474e1e5703486fa574fcc9d3c5f1ca5225a6433b42b6614757b6a9bd4261e42135ff095a4d0a4ee2e97d763
+EBUILD libnl-1.1.9999.ebuild 1064 BLAKE2B 318f89cd93c4c3d342fded3d5d399c8560e5e1977057248fcd1ae3ae7da3d03bea0a02125e4d5d8c8e1017c3ea1add6cb02babcec3305ffc45b1d7b9da55ecc1 SHA512 2e8e94e598c956e51fbc835b7cff45c0c3783686038cb01bc47acd20f877884c8453fa8b932125e204cab027f546dfe4cca0b24a1482061fbca8e7192f66b056
+EBUILD libnl-3.5.0.ebuild 2381 BLAKE2B 40d00f5217a2171ea39df48d27715f5a3beb7dc8be5c6adee13be66cceb373b76ff1be9bcd7b5e0c696a86d486474a7798a17bce76d9d35469b2317ee5193739 SHA512 ccf215de0ba3d60d9c8fad9be370824e80b23cfe856fd8c3b7a757841ff3afc009b50acbe5b5919650a56c36cf4e2a6d5504946a25acb9fb00c159507b44bd6b
 EBUILD libnl-99999999.ebuild 2425 BLAKE2B e1e0af93008411e8e8857b2dda0fee2c2fa8a9f707df10601e95ff3ce003787dbc1cb035aedb7a1210e4339e2764eb890cd38fe125ded76be2e52e47533ff262 SHA512 c891cceb93025e2456efddb03c69485b6e2ded0db86f46734b00698e9736d1f7d6c095eb20b6108e040a8430b01d317857b72c4728407f29c3345b61c9db9888
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
index 40141bb55b71..8f3ad2437d6f 100644
--- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild
+++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
@@ -2,18 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit multilib toolchain-funcs
+
+inherit toolchain-funcs
 
 DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
 HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
 SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
 DOCS=( ChangeLog )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
 	"${FILESDIR}"/${PN}-1.1-flags.patch
@@ -34,14 +37,14 @@ src_prepare() {
 		sed -i lib/Makefile -e '/OUT_AR/d' || die
 	fi
 
-	rm -f lib/libnl.a
+	rm -f lib/libnl.a || die
 }
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 
 	if use doc ; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		emake gendoc
 	fi
 }
@@ -50,7 +53,8 @@ src_install() {
 	default
 
 	if use doc ; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
+
 		docinto html
 		dodoc -r html/*
 	fi
diff --git a/dev-libs/libnl/libnl-1.1.9999.ebuild b/dev-libs/libnl/libnl-1.1.9999.ebuild
index 30fa4a923c0f..14a4835802c4 100644
--- a/dev-libs/libnl/libnl-1.1.9999.ebuild
+++ b/dev-libs/libnl/libnl-1.1.9999.ebuild
@@ -2,18 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 multilib toolchain-funcs
+
+inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
 HOMEPAGE="https://www.infradead.org/~tgr/libnl/"
 EGIT_REPO_URI="https://github.com/tgraf/libnl-1.1-stable"
+
 LICENSE="LGPL-2.1"
 SLOT="1.1"
-KEYWORDS=""
 IUSE="doc static-libs"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
+
 DOCS=( ChangeLog )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
 	"${FILESDIR}"/${PN}-1.1-flags.patch
@@ -30,18 +33,18 @@ src_prepare() {
 		-e 's|-g ||g' \
 		Makefile.opts.in || die
 
-	if ! use static-libs; then
+	if ! use static-libs ; then
 		sed -i lib/Makefile -e '/OUT_AR/d' || die
 	fi
 
-	rm -f lib/libnl.a
+	rm -f lib/libnl.a || die
 }
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 
 	if use doc ; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		emake gendoc
 	fi
 }
@@ -50,7 +53,7 @@ src_install() {
 	default
 
 	if use doc ; then
-		cd "${S}/doc"
+		cd "${S}/doc" || die
 		docinto html
 		dodoc -r html/*
 	fi
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index 2c8d76055e42..ea0332a4ef97 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${LIBNL_P}"
 
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+debug static-libs python +threads utils"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"