Merge updates from master

33 files changed, 210 insertions, 66 deletions

diff --git a/dev-lang/R/R-4.0.5-r1.ebuild b/dev-lang/R/R-4.0.5-r1.ebuild
index e8bfafd7f0a7..ea1e78006a93 100644
--- a/dev-lang/R/R-4.0.5-r1.ebuild
+++ b/dev-lang/R/R-4.0.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~hppa ~ia64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs test tiff tk X"
 
 # One test required profiling in v4.0.2, check the upstream bug:
diff --git a/dev-ros/genpy/Manifest b/dev-ros/genpy/Manifest
index bf53a0c05714..9affe2bd75af 100644
--- a/dev-ros/genpy/Manifest
+++ b/dev-ros/genpy/Manifest
@@ -1,2 +1 @@
-DIST genpy-0.6.11.tar.gz 53128 BLAKE2B c0c6d9aa8d713e873a5cbceda8763c23e4b6259f5708be1575c4eae600b3f96bd8f05cda281711c799a0a4e00d69623ed0ddcb7812b4894d7c45717121f51c00 SHA512 267391cce6119085ae974f00fa4a33767b2b62a5d61bd290b3d2164cee275ce88b21d124b2da9ca9d85ac6a3a030ceddef766be34fba9c0d57ba26d6e1e41186
-DIST genpy-0.6.14.tar.gz 53964 BLAKE2B ff1503a56fdb07a5165d2891589450e3b40e85f68d541990828959b8d7f0e440091d77fd0bb4ac70fa0e39114b366c061e8d03979482539d2e5ca6cc3ff15b8c SHA512 5ce357ef41d2c06025ca2a06ca4111baf0d3b92dbdf877ea0ce5515d516d9e0fa46171057293ba96d5b55c5fa32b7c24ef28cfcd45be8bf9c3d73302feec6957
+DIST genpy-0.6.16.tar.gz 55296 BLAKE2B 061b7c761a8a8892ffbd27073812ffd375bbeabe1606efdd5d43082f693968cad1fbbdf87ec87b0f4ddc6cef81c22c6e562455885a4b8b82519f544bd5d1c672 SHA512 e87a368d6d966ca681d8abfa0fb16ce1f827aaa9cc0649ffd88ccb849fd3c479db0a36f7a82e16e386e83d471e2a75c38afebe33975a1cf6d42b98804ec7a1bd
diff --git a/dev-ros/genpy/genpy-0.6.14.ebuild b/dev-ros/genpy/genpy-0.6.14.ebuild
deleted file mode 100644
index a5796a02b2e9..000000000000
--- a/dev-ros/genpy/genpy-0.6.14.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/genpy"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="https://wiki.ros.org/genpy"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)
-"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/genpy/genpy-0.6.11.ebuild b/dev-ros/genpy/genpy-0.6.16.ebuild
index a5796a02b2e9..e8cda9d3e500 100644
--- a/dev-ros/genpy/genpy-0.6.11.ebuild
+++ b/dev-ros/genpy/genpy-0.6.16.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
diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest
index ef9f3f5f91eb..a69b16ee2fb5 100644
--- a/dev-ros/geometric_shapes/Manifest
+++ b/dev-ros/geometric_shapes/Manifest
@@ -1 +1 @@
-DIST geometric_shapes-0.7.2.tar.gz 84443 BLAKE2B bcfcfeb08cbd60c889a2a801855eddd85a3ac42752991c0721ea0aee19a5650493e390d80a8ed99610a40efb5ca1fe0c1a49329471368b335483f8ceb193ca8a SHA512 5c1a05c0166c32c0d5ac9d22dd6feb784845342d7cde8d642731a08aafa54ed0b1545864f42b7de7641031bf7f0e353a632404799051770d55c7855b57d78027
+DIST geometric_shapes-0.7.3.tar.gz 85830 BLAKE2B 2e5475a55e389ccd0cf2819c268efdf6e8764daadc7adae48d89d636b8155c49b892ec7204f2ecedc2e01948f6fa31fcaa88a14709d2ab63f850aee9352f5b1b SHA512 bd35a3aa23243d1bf85e7c9cc8b2263cbc1e5af626ae80950fd0867222bd5aaa29ac7fed6c1d5e28943916314ab941b182ba343114452b98c6f18b33a570123c
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.7.2.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.7.3.ebuild
index 4e9add6e0660..d7890463d7db 100644
--- a/dev-ros/geometric_shapes/geometric_shapes-0.7.2.ebuild
+++ b/dev-ros/geometric_shapes/geometric_shapes-0.7.3.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
diff --git a/dev-ros/laser_geometry/Manifest b/dev-ros/laser_geometry/Manifest
index 6331949b13cd..77a79d723ad8 100644
--- a/dev-ros/laser_geometry/Manifest
+++ b/dev-ros/laser_geometry/Manifest
@@ -1 +1 @@
-DIST laser_geometry-1.6.6.tar.gz 19050 BLAKE2B 852dc42b9ff3a6e262cac74441999de030f3cd35c0536859ebe253f270065a10a11f855299d81b1319949ff4ec775aa377d34894a1a889b4a0f9c0d8afe8eecf SHA512 4ffef2467c0bd6cfca6022308e97a766ab544705395d13863a1a5d924eda728a7473a58a57492db4ae8d503c0aef38d6747fefad8624a6f4b1b2b1e709919781
+DIST laser_geometry-1.6.7.tar.gz 19095 BLAKE2B 9ac9b1d24f26386e1e23e3ab75e1af18ae306670b5a86af2f547918327cd3fc9ec9140a3479c600ea799158617a9e4ce350f45f71db688aa2446edfaf04a5912 SHA512 7f6f887c3f8c4212adef90812fa877904e1e3fcf679df15cadca34a4ad451135be5086506eafee16682441c70df0d1c89fa90d2b365f5eed4f349ed741974c01
diff --git a/dev-ros/laser_geometry/laser_geometry-1.6.6-r1.ebuild b/dev-ros/laser_geometry/laser_geometry-1.6.7.ebuild
index e1b93a17bd7e..e1b93a17bd7e 100644
--- a/dev-ros/laser_geometry/laser_geometry-1.6.6-r1.ebuild
+++ b/dev-ros/laser_geometry/laser_geometry-1.6.7.ebuild
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
index 24677433e024..4f32ba0a9b13 100644
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@@ -1,3 +1,4 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
 DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
+DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
diff --git a/dev-ros/libmavconn/libmavconn-1.8.0.ebuild b/dev-ros/libmavconn/libmavconn-1.8.0.ebuild
new file mode 100644
index 000000000000..8f7b83354449
--- /dev/null
+++ b/dev-ros/libmavconn/libmavconn-1.8.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/mavlink-gbp-release-2016.7.7
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest
index 7242310703b5..abc9529cfad8 100644
--- a/dev-ros/mavlink-gbp-release/Manifest
+++ b/dev-ros/mavlink-gbp-release/Manifest
@@ -1,2 +1 @@
-DIST mavlink-gbp-release-2020.9.10.tar.gz 4134330 BLAKE2B a8b2ad07ebf67bf19b37d6fefd6e41a5d6c95e9eaac413785943bd88e63f1a8acf4a4ea7d7ecd680e5ff306d46235a8cf0239af724d01d960c96cd8623818a22 SHA512 9c3429b16b0bcd364d89db3817cab76545f799407095cd6d7af5fff552aa4a4314645b6db517389bcdb511e009b4bfce5d62ae6b4aec7b0542bdc892cdf1ebb9
-DIST mavlink-gbp-release-2021.2.2.tar.gz 4266346 BLAKE2B 6f70c9ee4b4140f7478210ba8a31739316a89f890d1412e5d9480d83ca1a186a12855d9b33f254222aa5156333fc74dd5f00988ffe904fad96ef5eaccea6a793 SHA512 1e857093d91c154b0780c530f1ad741120cee31e9ba3373cc047644990e7d58b2b703716d39509c753c41cbaf95a9e330bbc15ed6c970af2ab4d6bbc66de23eb
+DIST mavlink-gbp-release-2021.7.7.tar.gz 4280663 BLAKE2B 36fe1f224178ec954866b07c470cebf50fb779eb004911092b24fc380492c6b89b5509fc3b823ab5b355a0957ab113ea4915c94d499667b1e27ee964867e1063 SHA512 b3e7b196ff0e58c3cccfd2ea21f8804732ffbf62bf0288f2c8e0f518e387629fb0260ce9c7cffd94d83b21e8203f2077176d568aa9de4818f2bd6badae9f6a0c
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.9.10.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.9.10.ebuild
deleted file mode 100644
index 86036c60a87e..000000000000
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.9.10.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
-EGIT_BRANCH="release/noetic/mavlink"
-VER_PREFIX="${EGIT_BRANCH}/"
-VER_SUFFIX=-${PV#*_p}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="MAVLink message marshaling library"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="$(python_gen_cond_dep "dev-python/future[\${PYTHON_USEDEP}]")"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.2.2.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.7.7.ebuild
index 2b6b1f3ec934..2b6b1f3ec934 100644
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.2.2.ebuild
+++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2021.7.7.ebuild
diff --git a/dev-ros/mavros/Manifest b/dev-ros/mavros/Manifest
index b223444fdf93..720e19da7479 100644
--- a/dev-ros/mavros/Manifest
+++ b/dev-ros/mavros/Manifest
@@ -1 +1,2 @@
 DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
+DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
diff --git a/dev-ros/mavros/mavros-1.8.0.ebuild b/dev-ros/mavros/mavros-1.8.0.ebuild
new file mode 100644
index 000000000000..b2927fcf9bd2
--- /dev/null
+++ b/dev-ros/mavros/mavros-1.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink extendable communication node for ROS"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/angles
+	dev-ros/libmavconn
+	dev-ros/rosconsole_bridge
+	dev-libs/boost:=
+	dev-ros/eigen_conversions
+	sci-geosciences/GeographicLib
+	>=dev-ros/mavlink-gbp-release-2020.9.10
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/mavros_msgs-${PV}[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest
index 24677433e024..4f32ba0a9b13 100644
--- a/dev-ros/mavros_extras/Manifest
+++ b/dev-ros/mavros_extras/Manifest
@@ -1,3 +1,4 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
 DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
+DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
diff --git a/dev-ros/mavros_extras/mavros_extras-1.8.0.ebuild b/dev-ros/mavros_extras/mavros_extras-1.8.0.ebuild
new file mode 100644
index 000000000000..4a27f7707f48
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-1.8.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/cv_bridge
+	dev-ros/mavros
+	dev-ros/roscpp
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/urdf
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/mavros_msgs/Manifest b/dev-ros/mavros_msgs/Manifest
index 24677433e024..4f32ba0a9b13 100644
--- a/dev-ros/mavros_msgs/Manifest
+++ b/dev-ros/mavros_msgs/Manifest
@@ -1,3 +1,4 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
 DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
 DIST mavros-1.5.2.tar.gz 319006 BLAKE2B 7ae349460f6edd44c716776dacb1014248f2d03fe0aad0a79e832091311f6e553cea714588099e70f3e1b0d8f4ba6a415e7e2554d5a8dedaae537a1955037cb4 SHA512 67aed9c6ef55c486008e1ee7125367f4ec1a6536cc7f28548c3434617a8a7429dd56a4f17af7dbe4678a8499ef69b57d72d4453fd5a2e54d9600b945314d1316
+DIST mavros-1.8.0.tar.gz 330619 BLAKE2B 54b1e925148370a85dc0efdc53447a6443ff5b291e656514df8046ca60b8aa7658ca77dc7731718f5e818fbbcf4631067cb03371d85e8bab95a907ca857a85ee SHA512 e9a0a51480ca45112da98d51e16b2ccc2825acab8a34074ba456d7e760cb2fe6bfd9a37e33fc1dfc6c1b072865fd180aff8e7918788ded95c7776a465cda4da2
diff --git a/dev-ros/mavros_msgs/mavros_msgs-1.8.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-1.8.0.ebuild
new file mode 100644
index 000000000000..11b0de2bd004
--- /dev/null
+++ b/dev-ros/mavros_msgs/mavros_msgs-1.8.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geographic_msgs dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/moveit_msgs/Manifest b/dev-ros/moveit_msgs/Manifest
index 1036c4781989..2f94990f78ba 100644
--- a/dev-ros/moveit_msgs/Manifest
+++ b/dev-ros/moveit_msgs/Manifest
@@ -1 +1 @@
-DIST moveit_msgs-0.11.1.tar.gz 20617 BLAKE2B 12b6f6f606d5f3ecaee8bafc5703526020ef60b421e452bb603390236caede4e7fb0d1310d0fc5c38dd63676085a083a76721f97a3548022375b3b2a8b72596c SHA512 b9f99bbae3d13040368ab8fb649682becd194ff91279c7c5a3060104789df91a4d61334a369a46e9d161f9f7386d42b97a189451c2ac0b5f124fb17df92ca680
+DIST moveit_msgs-0.11.2.tar.gz 21764 BLAKE2B 9994ae4468e6913a811103d7f107868eac60970016f2dacaf666fadc0c236db583001631a7378e18d97be9ddbe9823dae95ff984f91a3b28b1833412ef905326 SHA512 4b401c47b6d2a5c61c9e69807c4aec7f0aa20ff27de952ea91b2b8e339a5e5f18138f36b9e679601b7471aa0aa78d8d5763af12c44685a201bc4dbc67602857f
diff --git a/dev-ros/moveit_msgs/moveit_msgs-0.11.1.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.11.2.ebuild
index 6490a10393ef..16c7d7fd966b 100644
--- a/dev-ros/moveit_msgs/moveit_msgs-0.11.1.ebuild
+++ b/dev-ros/moveit_msgs/moveit_msgs-0.11.2.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
diff --git a/dev-ros/openni2_camera/Manifest b/dev-ros/openni2_camera/Manifest
index 82343ad74f87..bb3305b40c53 100644
--- a/dev-ros/openni2_camera/Manifest
+++ b/dev-ros/openni2_camera/Manifest
@@ -1 +1 @@
-DIST openni2_camera-1.4.2.tar.gz 39789 BLAKE2B e20fe380e4832c7c38ed945e3472867ea7546c675677a89eda216bbaa448538b73a7b546e7182dc493520c9cb60b9cbdd9fb1bd1cd82ac75bf4ba3320a1521aa SHA512 b6dde7b55349e4d3a2f06f07e944208c90ab37f9e0b5366d8eefadda37a96f970de81784fa107ba8eb6a9e6636881279f3a2b3e7d60a9ac64eab4b0c9efccdb3
+DIST openni2_camera-1.5.1.tar.gz 40518 BLAKE2B 10cee624b9eda0a3d8f45df1fa6ba720a6e1c7f1a36dd0f0b933266854904f3a16f2292a5a51ed5f7e3d6f4ba5b9aaaf5260d7d2f6f012dbba060b5f3e3445f6 SHA512 59ab19bf60f6bd4196374138b68e64dc8aa44a8c451c3e7d5893f1501e83ab1c9034ddea2cbc1eedf12b2b2a13a9ecc4bbf2b87a71ab7fa38cde4c0d6ccc04cc
diff --git a/dev-ros/openni2_camera/openni2_camera-1.4.2-r1.ebuild b/dev-ros/openni2_camera/openni2_camera-1.5.1.ebuild
index ee182d23620f..ee182d23620f 100644
--- a/dev-ros/openni2_camera/openni2_camera-1.4.2-r1.ebuild
+++ b/dev-ros/openni2_camera/openni2_camera-1.5.1.ebuild
diff --git a/dev-ros/openni2_launch/Manifest b/dev-ros/openni2_launch/Manifest
index 82343ad74f87..bb3305b40c53 100644
--- a/dev-ros/openni2_launch/Manifest
+++ b/dev-ros/openni2_launch/Manifest
@@ -1 +1 @@
-DIST openni2_camera-1.4.2.tar.gz 39789 BLAKE2B e20fe380e4832c7c38ed945e3472867ea7546c675677a89eda216bbaa448538b73a7b546e7182dc493520c9cb60b9cbdd9fb1bd1cd82ac75bf4ba3320a1521aa SHA512 b6dde7b55349e4d3a2f06f07e944208c90ab37f9e0b5366d8eefadda37a96f970de81784fa107ba8eb6a9e6636881279f3a2b3e7d60a9ac64eab4b0c9efccdb3
+DIST openni2_camera-1.5.1.tar.gz 40518 BLAKE2B 10cee624b9eda0a3d8f45df1fa6ba720a6e1c7f1a36dd0f0b933266854904f3a16f2292a5a51ed5f7e3d6f4ba5b9aaaf5260d7d2f6f012dbba060b5f3e3445f6 SHA512 59ab19bf60f6bd4196374138b68e64dc8aa44a8c451c3e7d5893f1501e83ab1c9034ddea2cbc1eedf12b2b2a13a9ecc4bbf2b87a71ab7fa38cde4c0d6ccc04cc
diff --git a/dev-ros/openni2_launch/openni2_launch-1.4.2.ebuild b/dev-ros/openni2_launch/openni2_launch-1.5.1.ebuild
index 227a922039f1..230a0150b089 100644
--- a/dev-ros/openni2_launch/openni2_launch-1.4.2.ebuild
+++ b/dev-ros/openni2_launch/openni2_launch-1.5.1.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
diff --git a/dev-ruby/builder/builder-3.2.4.ebuild b/dev-ruby/builder/builder-3.2.4.ebuild
index 91aea1759f66..c1f1c4381a4e 100644
--- a/dev-ruby/builder/builder-3.2.4.ebuild
+++ b/dev-ruby/builder/builder-3.2.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://onestepback.org/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/racc/racc-1.4.16-r1.ebuild b/dev-ruby/racc/racc-1.4.16-r1.ebuild
index 4512d7c965e9..991d3f4dd44f 100644
--- a/dev-ruby/racc/racc-1.4.16-r1.ebuild
+++ b/dev-ruby/racc/racc-1.4.16-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/mail-mta/courier/courier-1.1.5.ebuild b/mail-mta/courier/courier-1.1.5.ebuild
index b1797f644897..e40973330fad 100644
--- a/mail-mta/courier/courier-1.1.5.ebuild
+++ b/mail-mta/courier/courier-1.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail gnutls"
 
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 6634b73cacda..6afc430598b2 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,2 +1,3 @@
 DIST fldigi-4.1.18.tar.gz 4847091 BLAKE2B 5b5ab773a78370b3c6ea86d63af7631bea97b16c3eacdb3d3b4e1b18dbbe70c727afa2ddf04c1ca7934f483503b2373d5d94bf4fcd896ad52a843c723a7c5cd2 SHA512 4d7fef4d464fcedf075d226bae7fd7134cd7436d737e17b7e21607e5120c957a909d1775900dbfea608c68629409c04eaa70a399bef6cba27b6e12b255696633
 DIST fldigi-4.1.19.tar.gz 4900636 BLAKE2B 1fa8689bc3c0a8fff24514bd306c70815039b8610673e1834f6c2b567ef0c6e9170750ef208efd58c62fc2f872865ae30e64651c57eaeb14abc96896d73d0417 SHA512 68eaeb4879e58f648827d129fad7ccb799062ad220429f29afc6c75fd50794393bf31e130ba03628e409a2703d52598d2a04dfba8780960d32b132306cc177b4
+DIST fldigi-4.1.20.tar.gz 4906451 BLAKE2B ed12be269828a1c8a9b1eeab470981ca95d47a330a9eec098c6ce241e36a18bfaf5d36eecb480542aff128c7b7f6b06d85af1a37f30a9b721ed1712cf90a4df3 SHA512 97c4ae9d0721a3d264af55483e9e3e6dd22e33c879d60f7818489c2e8eb0f0615f8698c67c39fa066b05baccd75c06e1988d9f7ea3dc180158da77ed604a0d0f
diff --git a/media-radio/fldigi/fldigi-4.1.20.ebuild b/media-radio/fldigi/fldigi-4.1.20.ebuild
new file mode 100644
index 000000000000..6c51b6e0442f
--- /dev/null
+++ b/media-radio/fldigi/fldigi-4.1.20.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls pulseaudio"
+IUSE_CPU_FLAGS=" sse sse2 sse3"
+IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
+
+RDEPEND="x11-libs/fltk:1[threads,xft]
+	media-libs/libsamplerate
+	media-libs/libpng:0
+	x11-misc/xdg-utils
+	dev-perl/RPC-XML
+	dev-perl/Term-ReadLine-Perl
+	|| (
+		media-libs/portaudio[oss]
+		media-libs/portaudio[alsa]
+	)
+	hamlib? ( media-libs/hamlib:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	>=media-libs/libsndfile-1.0.10"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	append-cxxflags $(test-flags-CXX -std=c++14)
+	local myconf=""
+
+	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
+	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
+	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
+
+	econf ${myconf} \
+		--with-sndfile \
+		$(use_with hamlib) \
+		$(use_enable nls) \
+		$(use_with pulseaudio) \
+		--without-asciidoc
+}
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.3.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.3.ebuild
index 8246a09277cf..b1eec0de7563 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.3.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.courier-mta.org/authlib/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
 
 RESTRICT="!berkdb? ( test )"
diff --git a/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild b/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
index b8afe562a901..77383ff1484b 100644
--- a/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 src_configure() {
diff --git a/ros-meta/mavros/mavros-1.8.0.ebuild b/ros-meta/mavros/mavros-1.8.0.ebuild
new file mode 100644
index 000000000000..f6781e007847
--- /dev/null
+++ b/ros-meta/mavros/mavros-1.8.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Metapackage for mavros packages"
+LICENSE="metapackage"
+SLOT="0"
+IUSE=""
+HOMEPAGE="https://wiki.ros.org/mavros"
+
+RDEPEND="
+	dev-ros/mavros_msgs
+	dev-ros/libmavconn
+	dev-ros/mavros
+	dev-ros/mavros_extras
+"
+DEPEND="${RDEPEND}"
+[ "${PV}" = "9999" ] || KEYWORDS="~amd64 ~arm"