gentoo resync : 14.08.2021

17 files changed, 57 insertions, 26 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 28baf96c2117..55e881c8edcd 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 2c5cfa1aad5d..d35008c2f433 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -8,5 +8,5 @@ DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e392662421852
 DIST gsl-2.7.tar.gz 7508761 BLAKE2B a9da4df40ea57374880026a0586f2f218dbb0c9154cc661b3e7f5cd414311b95300e60faa2d7f4d3c6cdae5cfdf77cb8052075b56f51564aec2649cc4ad5f7f9 SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5
 EBUILD gsl-1.16.ebuild 3069 BLAKE2B 3cb68ede8761db13a1e17b0e0aff1f165e20f38946dd5b70a92b597c38faa4581bd0c9b96d16257f7fbccfa765513e4a0319686f4ffd959e7a0d2e084cacab75 SHA512 03a6b20f6d6cf125d120841aea9b2170e9bb77bbc64346e82f3a03fc5e78c19ae75bf8e01c19e6371f21658c3bcc168f0f13a04ebb500715629c45306b5af713
 EBUILD gsl-2.5-r1.ebuild 1428 BLAKE2B 199410861db77b4e73bba3647790efd91fe675185c55cb1730e6e06221753f34048cff8033e07c1846104801c994da0b9fe0c2da3a6661e3899d67b0345892fc SHA512 bc175e93a0ab179b397d97efe24a9b66a1787c28dcd5c38e6cec359246790fb01fb43764567dd1031ace02acc99928d1518a59f6c4e98b8c674c7f8f1f7c09bf
-EBUILD gsl-2.7.ebuild 1459 BLAKE2B de1eafceae45af3c5a051be50cbb54afdc34fe2610f18b08c7eedc92c8d7d3aeb43016d2531cbb99649d00f47157a3ec3569ee4b81360aad2db99720a0095c10 SHA512 788fca8c7a6768938c1c6b3bea5f48f16194b49fbbf992489e0250d205ab19160ac6000fbf7dc93355e456339515b225aa15d8af788de7ddd2850760f72f6c5b
+EBUILD gsl-2.7.ebuild 1458 BLAKE2B 5eb807b11c79db186302341a8877ba9e35b9d144e26ea2087340fac45dc6131382bb4c0e67d219926ff2550714edeefc718e4818411a80ebbe3c691f2a1ce39b SHA512 c77d9bda24cafc6c9bd612c5d5727ac2e2ef2df30d6718cdcadfa6c63f5a04428ff586224c81a632a35eee1aba86c7dbe2210ecd733ef7bc68c78046635cd3fe
 MISC metadata.xml 1190 BLAKE2B b9015dc09464b327144a546a0e9dae6e1c5eaf3ce118a24b7ad1853f09af1952284f754aada2436d7e1a1df82638720492445d8f015ccb1cec05c78dd718fc26 SHA512 f56ec87aeb8f257480a631748db79c78193797e1ecd586dbbd78f31a01fbbd3341fa67ffd3244e5dba352478ee552184d6a1d9b5ef5d54d67b038215090eca00
diff --git a/sci-libs/gsl/gsl-2.7.ebuild b/sci-libs/gsl/gsl-2.7.ebuild
index 247d2fe2b638..7fe267577885 100644
--- a/sci-libs/gsl/gsl-2.7.ebuild
+++ b/sci-libs/gsl/gsl-2.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/25"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/ignition-common/Manifest b/sci-libs/ignition-common/Manifest
index a5084845da21..d7be914d30aa 100644
--- a/sci-libs/ignition-common/Manifest
+++ b/sci-libs/ignition-common/Manifest
@@ -1,3 +1,3 @@
-DIST ignition-common3_3.5.0.tar.gz 6984379 BLAKE2B decc26506544a58075583d302dbae30148bc22d750864bae3816722516a21d191dcdc5dc9376a026a103575d9489f038d3fc9e296c062c32ac076e9fea28d2ab SHA512 109161e55e51a6a37fb137f64e0cf3041c72bfc2030e3b8c09ecf9f81c57b3687a8a4d9e0142520fd9d0dfbf02cba2f123e01e9407ec046b0f134dbfdaf535f0
-EBUILD ignition-common-3.5.0.ebuild 897 BLAKE2B f0d432eb6533b2cc6e1240e0e2341bd66221cf969d7a964f1b9c8dde58c59fc1104fedabeb3d885df855af3131493b63db8b925c57d3751470b1f5ac0933f00f SHA512 d48c3ca95bfd843da3487e4c1ce4a4e94e13c1abd11e5d0a5c9d6cbf7a125a662524187d3facb03ee99622faaf577622a9a4dd5806672d5d97b567f7e4fea33e
+DIST ignition-common3_3.11.1.tar.gz 7130569 BLAKE2B c352c4750e6ec865dbe2ec08c32166235e167eaf33ed3be0ab31bd530e1f45b9449eb19733685d61a480c2d2e8b812a3a3bb72fdf184a08fd1813303bfab5947 SHA512 7521df7719163e7d2cf835857b068bb6aab62fd326ca6938c681dd3737c8391e467ad6a00ec96685310e1c8bb2fc853631346620f527bd008191ed8f8255932a
+EBUILD ignition-common-3.11.1.ebuild 925 BLAKE2B 0f02c25ed808c59a9155d7971c91c2ad338e8f78fb66018ac574df05fdd01a407dda2f0e64081db1dc2b04df66acd8a5cd52c5edfb2a9429b238155b0904cc74 SHA512 328b18f874536b2c71567ea2f4a76ad11b3e88a571d456b910188bc6979fef9ca430042b4b1c53bcd3902099e0e676b94d62170d87655dffdf68b9b3cff49bfd
 MISC metadata.xml 341 BLAKE2B a6b491b34a9e4da8c1bd10f5b3b6664285ed1b932794ea90bc64af8e3f9f33854bafadc9bd2e57ed5e2316f83955560db69a6f7563e2bb3ca779819e4bf0b787 SHA512 ca5f742e0946bc1186d91f90e723976cbf0b3fd23c1837b96d6dcc52420337dcb83529b311d7a21a22f2ac1593bd4f2e28d240f113bdafb5150e9c379156e0a8
diff --git a/sci-libs/ignition-common/ignition-common-3.5.0.ebuild b/sci-libs/ignition-common/ignition-common-3.11.1.ebuild
index c2bbe8a822a9..5cdee005071d 100644
--- a/sci-libs/ignition-common/ignition-common-3.5.0.ebuild
+++ b/sci-libs/ignition-common/ignition-common-3.11.1.ebuild
@@ -1,21 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
-inherit cmake-utils
+inherit cmake
 
 IGN_MAJOR=3
 
 DESCRIPTION="Set of libraries designed to rapidly develop robot applications"
-HOMEPAGE="https://ignitionrobotics.org/libs/common https://github.com/ignitionrobotics/ign-common"
+HOMEPAGE="https://github.com/ignitionrobotics/ign-common"
 SRC_URI="https://github.com/ignitionrobotics/ign-common/archive/${PN}${IGN_MAJOR}_${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="${IGN_MAJOR}"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
+#RESTRICT="!test? ( test )"
+# tests dont even build
+RESTRICT="test"
 
 RDEPEND="
 	dev-libs/tinyxml2:=
@@ -34,7 +37,7 @@ S="${WORKDIR}/ign-common-${PN}${IGN_MAJOR}_${PV}"
 
 src_configure() {
 	local mycmakeargs=(
-		"-DBUILD_TESTING=OFF"
+		"-DBUILD_TESTING=$(usex test)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/sci-libs/ignition-fuel-tools/Manifest b/sci-libs/ignition-fuel-tools/Manifest
index aa52505d4deb..2698b488480b 100644
--- a/sci-libs/ignition-fuel-tools/Manifest
+++ b/sci-libs/ignition-fuel-tools/Manifest
@@ -1,3 +1,3 @@
-DIST ignition-fuel-tools4_4.1.0.tar.gz 451260 BLAKE2B aef6b1ca08e0d0c2099593c5d13842c5f73b6f041aea23aae57cc563ec624139331c45012f044212a53dfe82bfab6316caa51896785dd7e905c0950b3b91ca93 SHA512 7116460749870968508a0368435edfcc28f54128b2def0d93fa48e6f6ac961d27e0f0ff52ff70979ee4e626ee4cc0d5b421180487c1973ed844a1b16479466d3
-EBUILD ignition-fuel-tools-4.1.0-r1.ebuild 988 BLAKE2B a0f7386e513c37ebbfaad0ba7116c700ec9f06a22575cecd3fb8d87434728fca1f7e302f18755680632a09483caf3951b7dd5eaaf713bb9eca5528fc371ab553 SHA512 c0c47b3a1dab0a4a5fea1f91ece7460b220881dff3d1391671f3397b08be52ccb1b74fce7d4dd0796019dbee6eb60e61c082b634387c2295fc6ea22d462799f3
+DIST ignition-fuel-tools4_4.4.0.tar.gz 403685 BLAKE2B d363eb6e0287024883322b39eaf92ab29e6b253f85b59c65a5196d3a9ad3327728d00fdbeda3bebee7ae7871684ad85ab13a973fc9bdddf9d0e2a5333c8f8e4f SHA512 975c0f77167d6d05e3eb90cb9747e0575e7b0c7b7adfb17a72e68244cf1e656a08f52b3101cfa203435d6ad44ba1483fa20ab66a597c1a1678bf1fdd08599cb6
+EBUILD ignition-fuel-tools-4.4.0.ebuild 938 BLAKE2B ae9120b9810c7a3a8a455c8699fc11517d4c372ecd8ad49f39ac0c4f12a143440bd6092ffe0e86e1b8e5a69b9843e04bbf1866a66dda6cb4ec6cbaba7a1c8b8e SHA512 f9bdd7690ab2800d793d531a879d709762270114ab774adaeb72a9ed91d7a24f50a17f9735bc89b30b6ec69002805d4e203d76e0b59691343714e8133e37ebd5
 MISC metadata.xml 345 BLAKE2B 4d36d3550c362906a0ac3c9c3a982af9225f67c9302d960ceec5f7e22ab7171759ca30f9316b3382ba0393a2ea815dbc55dbf1c2e6f088e24daa0b2e1d18c669 SHA512 24462ba3a87e46b012bf22476afc5f130ffa1c89394d905fa104a26d51f8f7cb7a7fd5ac065d5ad2207bc6d8e2a885d87ac5cfeb13a538018a43dcc5eefb608d
diff --git a/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0-r1.ebuild b/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.4.0.ebuild
index 1441ea0a5dad..366864363d53 100644
--- a/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0-r1.ebuild
+++ b/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.4.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_BUILD_TYPE=RelWithDebInfo
-inherit cmake-utils
+inherit cmake
 
 IGN_MAJOR=4
 
 DESCRIPTION="Classes and tools for interacting with Ignition Fuel"
-HOMEPAGE="https://ignitionrobotics.org/libs/fuel_tools https://ignitionrobotics.org/libs/fuel_tools"
+HOMEPAGE="https://github.com/ignitionrobotics/ign-fuel-tools/"
 SRC_URI="https://github.com/ignitionrobotics/ign-fuel-tools/archive/${PN}${IGN_MAJOR}_${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -40,5 +40,5 @@ src_configure() {
 	local mycmakeargs=(
 		"-DBUILD_TESTING=$(usex test)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest
index 9a403ce85ae2..8c931f914d80 100644
--- a/sci-libs/ignition-math/Manifest
+++ b/sci-libs/ignition-math/Manifest
@@ -1,4 +1,4 @@
 AUX includes.patch 361 BLAKE2B 08417f2e2e3a39f03d714952fc1a5aa7eb73e42783d5d2db631d6406e1644d74e99c3f42eb0424d96dfea808e25c3902b5fb5f31a5c3108860ead1434fe82de5 SHA512 497ca00f1250b4d8dcbf5031ddfdd3c82c8bb6e8ab8c2735c3f32233b8840cdc1195a41be1fc5c5dff4a5d2b385c01f6f31302b8c8edb44e9ef50f3c2a0ea566
-DIST ignition-math6_6.5.0.tar.gz 539313 BLAKE2B 0ec7b5a4e8eac4161fd2df607c18f905bbfb12923373e2c74e435da8cd98926feac7e6b5434f7a335888a273757786872cc7cc3d0dd4f1e342a5ce488f07420d SHA512 ea8702339ffa1a76bb8aded17c83a620568edec472bf0722997a7f907ed07ead0d2e89356055835f9ee6dcc462066bdbc67cf07c01e0efe4e1b8fb3e4d2407fa
-EBUILD ignition-math-6.5.0.ebuild 640 BLAKE2B 1354647fd977e8a4c20c3edbdcb37ca6a95c79ab7810c6faeaea9b20bf502bb6fc820f694f4d3c9d9f222121abe57fc3daddae05241994022e7f675027110571 SHA512 c487f37df1701f960377ba8513f56312cc8334552ec7323006c59fcd5e109ae4d865bd379728f872ebbba764c2aab3266a52ee5acae477890170d313dc74e19f
+DIST ignition-math6_6.8.0.tar.gz 550137 BLAKE2B 3d4375aa3afc9de7061d01ac7bdee72285576ddfb373450f0b4b82e00b381e93ab6f9b44055069b504e30f3340ac6a7672577dc85f436d1cfa2218ab12336757 SHA512 a8d6ae93176b443f0187e9c6f7ae87b3112fdf1b9eaf77c727749530dd33da5001b6b0bf74cefa7a2fe16bafaed185c31d21a4ab727e2d7e55698445b0589b71
+EBUILD ignition-math-6.8.0.ebuild 641 BLAKE2B 558cc09b68ae3d0b1e99d9078fb49f6604727f7c9294369b9ee56f2c415431da68726ad6ed14118a67fcab12994ce70d20a757e62816d7d058cc541895e3e95e SHA512 87fc556853395b59f3616d64ac62a92096698280585b130b7b0a59e00218ca6e9f78870eddbd19b9ae693a3f3c87a6ae9b4d93ecdf952b6770ebdf2ae82407bc
 MISC metadata.xml 342 BLAKE2B 6b306ac4d7ec4a09c238f7b8c048589b7937b8a1e1e0573658ece2217054cb8a47da6e77d75439472dce378a4f4b1390ce8517352aa486db323a594f2a576131 SHA512 8969e6c2df55cfae7cc21640498871d7049499d146d06b13057701e742e9ef6f2c5124acd144b9e7f0974ea39032e89402252e32192242697555c64d90eb4b4a
diff --git a/sci-libs/ignition-math/ignition-math-6.5.0.ebuild b/sci-libs/ignition-math/ignition-math-6.8.0.ebuild
index ab724f9e7b7c..fc7acfaa88c1 100644
--- a/sci-libs/ignition-math/ignition-math-6.5.0.ebuild
+++ b/sci-libs/ignition-math/ignition-math-6.8.0.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
@@ -7,7 +7,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 inherit cmake vcs-snapshot
 
 DESCRIPTION="A small, fast, and high performance math library for robot applications"
-HOMEPAGE="https://ignitionrobotics.org/libraries/math"
+HOMEPAGE="https://github.com/ignitionrobotics/ign-math"
 SRC_URI="https://github.com/ignitionrobotics/ign-math/archive/${PN}6_${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index 75c8d4845b32..a76f3433a5ea 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -1,3 +1,3 @@
 DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
-EBUILD libcerf-1.5.ebuild 800 BLAKE2B 24c55a5b3fd777422f1f24fc790ac6f3fd5d3dc0c098c5e9f500a6e5d8635161118d29196a331586cc6d3850691c6f4ff6f6e0fd146e2ad09bc52d3b2a392eec SHA512 c4e8b09eda5d680d8788cd28556e23434e9938d557dbc41af3e897934002071f383a3b13ebbf05fa4587993814de37e0699734d61270a70e70a22c3c7434fbd1
+EBUILD libcerf-1.5.ebuild 807 BLAKE2B d400f8e36e9d0d147138d6e86185fe6ee6af76474712e96cc6cfaaf8362173e1f457250d0f5205d8c9a5ba5294cfb81130ab56ae51bc72d7f1c7065b10258ba7 SHA512 c45542dc5f1b2e7bb0a31c138e64545846bbecc9fa715ca3fc5df99c320d16319f80fa558f0dd51d3a3284b97f17b46e15022347654d0b3eec42872deea8931b
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index 67e76bff0cb4..0dd2c43b2e15 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libspatialindex/Manifest b/sci-libs/libspatialindex/Manifest
index f5304d8e80a1..c1f052be8c5f 100644
--- a/sci-libs/libspatialindex/Manifest
+++ b/sci-libs/libspatialindex/Manifest
@@ -1,5 +1,5 @@
 AUX libspatialindex-1.9.3-respect-compiler-flags.patch 526 BLAKE2B 25ab85c15666fce87c42513c22eab503f2e6617fb45484a7beef69690e4affac2607506f3ffad87878e6791004717aefc43468d50263dfd21a16a176ad008045 SHA512 bbc71df1e53f35415ce8e88c3003a88920f526f96113da2dfa99eda3a3a49b0913d839aae3d95cf7a51d2e93332e49410b214494d7467f3d07025c7fb5551b87
 AUX libspatialindex-1.9.3-use-system-gtest.patch 382 BLAKE2B 113e93e5d5f1524929c07f483f9df53d7b2b7b44bb104ae10564da0a9570be28b0da50ba12c8ed8879be782ff1df9124c85ff3884a4a683f098ebf7db83490dc SHA512 2eeb7f48e7adda39da8338d370d7278b9294f402ccd5506db22c94a5ab561e09429ef0f14df0d1befe9423d18413223814f86122810deb23b7b5e06459841e60
 DIST spatialindex-src-1.9.3.tar.bz2 520817 BLAKE2B 89bbb4ef76f620042cbaa2822daad1459bb8a3801fcdedaa73fdc666efcae0e5329e15e79607e3a31ef9a651fbbf9d3657f5bada19b229eaf37fe232935b8dae SHA512 7922807a2f7026542a014d3d7943da5410429b291cf469267ffea5b8075eab2a94e68b6c013425615d221b930fd319c403f3bf43404c9b1d2c92d0e2baae3066
-EBUILD libspatialindex-1.9.3-r1.ebuild 793 BLAKE2B 372706dc09eaeaf808626a085b80b3efabd2887fd0cb6d5087d4b20db1863688e5397513b90a6be7e4071204031d5464c361cfc007856ee7593e743b745ecf63 SHA512 5b3637159c5c1aade1d409afe82d55a41b0d2bf6a1ca4f6e0fb71dce5befcf706fa5d3aab6f0bf7f5a039c424578e82950cfad0b06fbb134108ce96193992a17
+EBUILD libspatialindex-1.9.3-r1.ebuild 800 BLAKE2B 4a3f7f77b3993d4913db13b18449da3d38c3fbacd1bfcd7180ad45fb5cd04e60dd00b4022351fd67efdcfafdad36d99c9c2a9f09c9027a57e6cf42951ee79ab5 SHA512 ca164e70402d34334bfde52a671dc67e1189c224a63e15b4682d8b8e661ab45126d7e77884f54fd4452dd91fe76d467a74e1cf17b9912660bb268137602df7b5
 MISC metadata.xml 508 BLAKE2B 4e8acedee7f5bb2118b52544713de9d97559fd6a622d4bdb95ac95fa4028fb0bb880c5a0ebf8c8969bf6b1cc68f4c6186b840017cad59c625eec9995145228c4 SHA512 5542e14bc46471e81273c7a79e074db945a488b65937ccad106980b0826d30d930b02046f1247cb8eeab542e42561738b5dc2f00225b611b4148df1acd747dc2
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
index 7e8ad2fbf9dd..149451954374 100644
--- a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
+++ b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P
 
 LICENSE="MIT"
 SLOT="0/6"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 3a54a8235e24..a4439d381810 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,4 +1,5 @@
+AUX yamlcpp.patch 675 BLAKE2B 269eb1d6f0e276cc6863d4ae8e8a3c73c6264b681a76f9bc32db185ed0c7b3a115b0fd1871569ff0ddb34dfd10c5aaafe658a620f70e4964bf196fd6ad57780c SHA512 fa8aabe06b75c2fdd3be222c4c51de6c5bc9ca9f2444c4e97cb63c910bf572f616cf0ac6381d4bf0a5f5fe07cb520eb6f748a4fcd19cf7cdd89f76a52da6a5bc
 DIST rtabmap-0.20.13.tar.gz 21501493 BLAKE2B eddec6e4812cea231f88263ce136eb535bc099939a482d6fb6de0e6ab3a302c395eb5f6c824d04da8d48a7f7ad9d63b8fa313ae3c21dcada74ec89c7e8130af5 SHA512 4014ec3b7bc2edbd7f361026d5a4be9222b094e398fde68512aab37b3edcb01d47256e4931de6ea1b3bcada9ac81405946e85e774220b9cf43d14a2db6c91118
-EBUILD rtabmap-0.20.13.ebuild 1456 BLAKE2B 18d465856ee04f6f645346c3236915a9a176e90f4b1e0d8388b5283e27b1c3e9ac163d0b135f88ccbd3071b2c21e910becf19aee5225c27c89a58c4f644faa20 SHA512 8879a04f0ad734d780f9a8f54b7d78101eab47406364f5e1125e74b5d2655e948dd6003b8285e28a79cbd0ca4495e64d6c19b9d55d7ea3a8ed70ea4e936a7304
-EBUILD rtabmap-9999.ebuild 1456 BLAKE2B 18d465856ee04f6f645346c3236915a9a176e90f4b1e0d8388b5283e27b1c3e9ac163d0b135f88ccbd3071b2c21e910becf19aee5225c27c89a58c4f644faa20 SHA512 8879a04f0ad734d780f9a8f54b7d78101eab47406364f5e1125e74b5d2655e948dd6003b8285e28a79cbd0ca4495e64d6c19b9d55d7ea3a8ed70ea4e936a7304
+EBUILD rtabmap-0.20.13-r1.ebuild 1517 BLAKE2B f6f415f78c97b509432c136a7f94880d66225fa046efc34461fa5041ccdcf2c69ca681498b7cf4465b3df525af9fd6076d1f8b09ab1425bcd63f85584aad28e5 SHA512 47a8781ad4605bed3ef323d870287ac654d393794e261e6e4a5e40f382bb4b7fd7678824a1dd5a4b17943f746c55b15c1959f3d822a15936d002c6e10f21ea99
+EBUILD rtabmap-9999.ebuild 1517 BLAKE2B f6f415f78c97b509432c136a7f94880d66225fa046efc34461fa5041ccdcf2c69ca681498b7cf4465b3df525af9fd6076d1f8b09ab1425bcd63f85584aad28e5 SHA512 47a8781ad4605bed3ef323d870287ac654d393794e261e6e4a5e40f382bb4b7fd7678824a1dd5a4b17943f746c55b15c1959f3d822a15936d002c6e10f21ea99
 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81
diff --git a/sci-libs/rtabmap/files/yamlcpp.patch b/sci-libs/rtabmap/files/yamlcpp.patch
new file mode 100644
index 000000000000..e6a3b74f5e04
--- /dev/null
+++ b/sci-libs/rtabmap/files/yamlcpp.patch
@@ -0,0 +1,21 @@
+Index: rtabmap-0.20.13-rolling/tools/EurocDataset/CMakeLists.txt
+===================================================================
+--- rtabmap-0.20.13-rolling.orig/tools/EurocDataset/CMakeLists.txt
++++ rtabmap-0.20.13-rolling/tools/EurocDataset/CMakeLists.txt
+@@ -1,8 +1,5 @@
+ cmake_minimum_required(VERSION 2.8)
+ 
+-FIND_PACKAGE(yaml-cpp QUIET)
+-
+-IF(NOT yaml-cpp_FOUND)
+    find_package(PkgConfig QUIET)
+    IF(PKG_CONFIG_FOUND)
+       pkg_check_modules(yaml_cpp QUIET yaml-cpp)
+@@ -12,7 +9,6 @@ IF(NOT yaml-cpp_FOUND)
+          SET(yaml-cpp_FOUND ${yaml_cpp_FOUND})
+ 	  ENDIF(yaml_cpp_FOUND)
+    ENDIF(PKG_CONFIG_FOUND)
+-ENDIF(NOT yaml-cpp_FOUND)
+ 
+ IF(yaml-cpp_FOUND)
+ 
diff --git a/sci-libs/rtabmap/rtabmap-0.20.13.ebuild b/sci-libs/rtabmap/rtabmap-0.20.13-r1.ebuild
index 906a00d0ba74..86bb221427fb 100644
--- a/sci-libs/rtabmap/rtabmap-0.20.13.ebuild
+++ b/sci-libs/rtabmap/rtabmap-0.20.13-r1.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	sys-libs/zlib
 	sci-libs/octomap:=
 	dev-libs/boost:=
+	dev-cpp/yaml-cpp:=
 	ieee1394? ( media-libs/libdc1394:2= )
 	openni2? ( dev-libs/OpenNI2 )
 	qt5? (
@@ -46,6 +47,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		"-DWITH_QT=$(usex qt5 ON OFF)"
diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
index 906a00d0ba74..86bb221427fb 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	sys-libs/zlib
 	sci-libs/octomap:=
 	dev-libs/boost:=
+	dev-cpp/yaml-cpp:=
 	ieee1394? ( media-libs/libdc1394:2= )
 	openni2? ( dev-libs/OpenNI2 )
 	qt5? (
@@ -46,6 +47,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		"-DWITH_QT=$(usex qt5 ON OFF)"